Apply suggestions from code review

Co-authored-by: Anthony <[email protected]>

Author: humitos

readthedocs/config/notifications.py

@@ -32,7 +32,7 @@
     ),
     Message(
         id=ConfigError.CONFIG_PATH_NOT_FOUND,
-        header=_("Config file not found"),
+        header=_("Configuration file not found"),
         body=_(
             """
             Configuration file not found in <code>{directory}</code>.

readthedocs/notifications/messages.py

@@ -37,20 +37,18 @@ def get_display_icon_classes(self):
         # Default classes that apply to all the notifications
         classes = [
             "fas",
-            "fa-user-group",
-            "fa-swap-opacity",
         ]
 
         if self.type == ERROR:
-            classes.append("fa-exclamation")
+            classes.append("fa-circle-xmark")
         if self.type == WARNING:
-            classes.append("fa-triangle-exclamation")
+            classes.append("fa-circle-exclamation")
         if self.type == INFO:
-            classes.append("fa-????")
+            classes.append("fa-circle-info")
         if self.type == NOTE:
-            classes.append("fa-????")
+            classes.append("fa-circle-info")
         if self.type == TIP:
-            classes.append("fa-????")
+            classes.append("fa-circle-info")
 
         return " ".join(classes)
 
@@ -111,7 +109,7 @@ def get_rendered_body(self):
         header=_("Build cancelled manually."),
         body=_(
             """
-                The user has cancel this build.
+                The user has cancelled this build.
                 """
         ),
         type=INFO,
@@ -121,8 +119,8 @@ def get_rendered_body(self):
         header=_("Build skipped manually."),
         body=_(
             """
-                One of the commands exited with code 183
-                and the build was skipped.
+                This build was skipped because
+                one of the commands exited with code 183
                 """
         ),
         type=INFO,
@@ -132,7 +130,7 @@ def get_rendered_body(self):
         header=_("Builds are temporary disabled for this project."),
         body=_(
             """
-                This is due to an excess usage of our resources.
+                This is due to excessive usage of our resources.
                 Please, contact our support team if you think this is a mistake
                 and builds should be re-enabled.
                 """
@@ -144,8 +142,8 @@ def get_rendered_body(self):
         header=_("Concurrency limit reached"),
         body=_(
             """
-                Your project/organization/user is currently building the maximum concurrency builds allowed ({limit}).
-                It will automatically retried in 5 minutes.
+                Your project, organization, or user is currently building the maximum concurrency builds allowed ({limit}).
+                It will automatically retry in 5 minutes.
                 """
         ),
         type=WARNING,
@@ -253,11 +251,11 @@ def get_rendered_body(self):
     ),
     Message(
         id=BuildUserError.FILE_TOO_LARGE,
-        header=_("There is at least one file size that exceeds the limits"),
+        header=_("There is at least one file that exceeds the size limit"),
         body=_(
             """
                 A file from your build process is too large to be processed by Read the Docs.
-                Please ensure no files generated are larger than 1GB.
+                Please ensure no generated files are larger than 1GB.
                 """
         ),
         type=ERROR,

readthedocs/oauth/notifications.py

@@ -12,7 +12,7 @@
 messages = [
     Message(
         id=MESSAGE_OAUTH_WEBHOOK_NO_ACCOUNT,
-        header=_("Webhook not attached to this project"),
+        header=_("Unable to attach webhook to this project"),
         body=_(
             """
             Could not add webhook for {instance.name}.
@@ -23,7 +23,7 @@
     ),
     Message(
         id=MESSAGE_OAUTH_WEBHOOK_NO_PERMISSIONS,
-        header=_("Webhook not attached to this project"),
+        header=_("Unable to attach webhook to this project"),
         body=_(
             """
             Could not add webhook for {instance.name}.
@@ -34,7 +34,7 @@
     ),
     Message(
         id=MESSAGE_OAUTH_WEBHOOK_INVALID,
-        header=_("The project doesn't have a valid webhook setup"),
+        header=_("The project doesn't have a valid webhook set up"),
         body=_(
             """
         The project {instance.name} doesn't have a valid webhook set up,

readthedocs/oauth/tasks.py

@@ -227,7 +227,7 @@ def attach_webhook(project_pk, user_pk, integration=None):
             attached_to=project,
             format_values={
                 "provider_name": provider.name,
-                "url_docs_webhook": "http://docs.readthedocs.io/en/latest/webhooks.html",
+                "url_docs_webhook": "https://docs.readthedocs.io/page/webhooks.html",
             },
         )
     else:

readthedocs/projects/notifications.py

@@ -26,7 +26,7 @@
     ),
     Message(
         id=RepositoryError.GENERIC,
-        header=_("Error when cloning the repository"),
+        header=_("Error while cloning the repository"),
         body=_(
             """
             There was a problem cloning your repository.
@@ -48,7 +48,7 @@
     ),
     Message(
         id=RepositoryError.FAILED_TO_CHECKOUT,
-        header=_("Error when checking out the repository"),
+        header=_("Error while checking out the repository"),
         body=_(
             """
             Failed to checkout revision: <code>{revision}</code>
@@ -58,7 +58,7 @@
     ),
     Message(
         id=RepositoryError.CLONE_ERROR_WITH_PRIVATE_REPO_ALLOWED,
-        header=_("Error when cloning the repository"),
+        header=_("Error while cloning the repository"),
         body=_(
             """
             There was a problem connecting to your repository,
@@ -69,7 +69,7 @@
     ),
     Message(
         id=RepositoryError.CLONE_ERROR_WITH_PRIVATE_REPO_NOT_ALLOWED,
-        header=_("Error when cloning the repository"),
+        header=_("Error while cloning the repository"),
         body=_(
             """
             There was a problem connecting to your repository,
@@ -81,7 +81,7 @@
     ),
     Message(
         id=ProjectConfigurationError.NOT_FOUND,
-        header=_("Sphinx's configuration file missing"),
+        header=_("Sphinx configuration file is missing"),
         body=_(
             """
             A configuration file was not found.
@@ -92,7 +92,7 @@
     ),
     Message(
         id=ProjectConfigurationError.MULTIPLE_CONF_FILES,
-        header=_("Multiple Sphinx's configuration file found"),
+        header=_("Multiple Sphinx configuration files found"),
         body=_(
             """
             We found more than one <code>conf.py</code> and are not sure which one to use.