Fix review feedback

Author: ericholscher

readthedocs/doc_builder/environments.py

@@ -421,9 +421,9 @@ def update_build(self, state=None):
                 self.build['error'] = str(self.failure)
             else:
                 self.build['error'] = ugettext_noop(
-                    "A failure in our code has occured. "
-                    "Please report this to us with your build id ({}).".format(
-                        self.build['pk']
+                    "There was a problem with Read the Docs while building your documentation. "
+                    "Please report this to us with your build id ({build_id}).".format(
+                        build_id=self.build['pk']
                     )
                 )
 

readthedocs/projects/tasks.py

@@ -136,22 +136,19 @@ def run(self, pk, version_pk=None, build_pk=None, record=True,
         # **Always** report build status.
         # This can still fail if the API Is totally down, but should catch more failures
         result = {}
-        error = 'Unknown error. Please include the build id ({}) in any bug reports.'.format(
-            build_pk
-        )
+        error = _('Unknown error encountered. '
+                  'Please include the build id ({build_id}) in any bug reports.'.format(
+                      build_id=build_pk
+                  ))
+        build_updates = {'state': BUILD_STATE_FINISHED}
+        build_data = {}
         if hasattr(self, 'build'):
-            self.build['state'] = BUILD_STATE_FINISHED
-            if failure:
-                self.build['error'] = error
-                self.build['success'] = False
-            result = api_v2.build(build_pk).patch(self.build)
-        else:
-            build_updates = {
-                'state': BUILD_STATE_FINISHED,
-                'success': False,
-                'error': error,
-            }
-            result = api_v2.build(build_pk).patch(build_updates)
+            build_data.update(self.build)
+        if failure:
+            build_updates['success'] = False
+            build_updates['error'] = error
+        build_data.update(build_updates)
+        result = api_v2.build(build_pk).patch(build_updates)
         return result
 
     def run_setup(self, record=True):