Lint

3 files changed, 107 insertions, 28 deletions

diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index 1563e471a..270dff30b 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -149,7 +149,8 @@ export default @observer class Login extends Component {
               <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p>
               { window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' && (
                 <p className="error-message center">
-                    {intl.formatMessage(messages.customServerQuestion)}{' '}
+                    {intl.formatMessage(messages.customServerQuestion)}
+                  {' '}
                   <Link
                     to={`${window.ferdi.stores.settings.all.app.server.replace('v1', '')}/import`}
                     target="_blank"
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 2e73fef1b..5958b4835 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -264,55 +264,81 @@
         }
       },
       {
-        "defaultMessage": "!!!Your session expired, please login again.",
+        "defaultMessage": "!!!Using a custom Ferdi server?",
         "end": {
           "column": 3,
           "line": 40
         },
         "file": "src/components/auth/Login.js",
+        "id": "login.customServerQuestion",
+        "start": {
+          "column": 24,
+          "line": 37
+        }
+      },
+      {
+        "defaultMessage": "!!!Try importing your Franz account",
+        "end": {
+          "column": 3,
+          "line": 44
+        },
+        "file": "src/components/auth/Login.js",
+        "id": "login.customServerSuggestion",
+        "start": {
+          "column": 26,
+          "line": 41
+        }
+      },
+      {
+        "defaultMessage": "!!!Your session expired, please login again.",
+        "end": {
+          "column": 3,
+          "line": 48
+        },
+        "file": "src/components/auth/Login.js",
         "id": "login.tokenExpired",
         "start": {
           "column": 16,
-          "line": 37
+          "line": 45
         }
       },
       {
         "defaultMessage": "!!!Your session expired, please login again.",
         "end": {
           "column": 3,
-          "line": 44
+          "line": 52
         },
         "file": "src/components/auth/Login.js",
         "id": "login.serverLogout",
         "start": {
           "column": 16,
-          "line": 41
+          "line": 49
         }
       },
       {
         "defaultMessage": "!!!Create a free account",
         "end": {
           "column": 3,
-          "line": 48
+          "line": 56
         },
         "file": "src/components/auth/Login.js",
         "id": "login.link.signup",
         "start": {
           "column": 14,
-          "line": 45
+          "line": 53
         }
       },
       {
         "defaultMessage": "!!!Forgot password",
         "end": {
           "column": 3,
-          "line": 52
+          "line": 60
         },
         "file": "src/components/auth/Login.js",
         "id": "login.link.password",
         "start": {
           "column": 16,
-          "line": 49
+          "line": 57
         }
       }
     ],
@@ -703,6 +729,19 @@
           "column": 26,
           "line": 33
         }
+      },
+      {
+        "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+        "end": {
+          "column": 3,
+          "line": 40
+        },
+        "file": "src/components/layout/AppLayout.js",
+        "id": "infobar.authRequestFailed",
+        "start": {
+          "column": 21,
+          "line": 37
+        }
       }
     ],
     "path": "src/components/layout/AppLayout.json"
@@ -918,6 +957,32 @@
           "column": 14,
           "line": 15
         }
+      },
+      {
+        "defaultMessage": "!!!Please login to use Ferdi.",
+        "end": {
+          "column": 3,
+          "line": 22
+        },
+        "file": "src/components/services/content/Services.js",
+        "id": "services.login",
+        "start": {
+          "column": 9,
+          "line": 19
+        }
+      },
+      {
+        "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+        "end": {
+          "column": 3,
+          "line": 26
+        },
+        "file": "src/components/services/content/Services.js",
+        "id": "services.serverInfo",
+        "start": {
+          "column": 14,
+          "line": 23
+        }
       }
     ],
     "path": "src/components/services/content/Services.json"
@@ -2991,94 +3056,107 @@
         }
       },
       {
-        "defaultMessage": "!!!Language",
+        "defaultMessage": "!!!Server",
         "end": {
           "column": 3,
           "line": 47
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
+        "id": "settings.app.form.server",
+        "start": {
+          "column": 10,
+          "line": 44
+        }
+      },
+      {
+        "defaultMessage": "!!!Language",
+        "end": {
+          "column": 3,
+          "line": 51
+        },
+        "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.language",
         "start": {
           "column": 12,
-          "line": 44
+          "line": 48
         }
       },
       {
         "defaultMessage": "!!!Dark Mode",
         "end": {
           "column": 3,
-          "line": 51
+          "line": 55
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.darkMode",
         "start": {
           "column": 12,
-          "line": 48
+          "line": 52
         }
       },
       {
         "defaultMessage": "!!!Display disabled services tabs",
         "end": {
           "column": 3,
-          "line": 55
+          "line": 59
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showDisabledServices",
         "start": {
           "column": 24,
-          "line": 52
+          "line": 56
         }
       },
       {
         "defaultMessage": "!!!Show unread message badge when notifications are disabled",
         "end": {
           "column": 3,
-          "line": 59
+          "line": 63
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.showMessagesBadgesWhenMuted",
         "start": {
           "column": 29,
-          "line": 56
+          "line": 60
         }
       },
       {
         "defaultMessage": "!!!Enable spell checking",
         "end": {
           "column": 3,
-          "line": 63
+          "line": 67
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableSpellchecking",
         "start": {
           "column": 23,
-          "line": 60
+          "line": 64
         }
       },
       {
         "defaultMessage": "!!!Enable GPU Acceleration",
         "end": {
           "column": 3,
-          "line": 67
+          "line": 71
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.enableGPUAcceleration",
         "start": {
           "column": 25,
-          "line": 64
+          "line": 68
         }
       },
       {
         "defaultMessage": "!!!Include beta versions",
         "end": {
           "column": 3,
-          "line": 71
+          "line": 75
         },
         "file": "src/containers/settings/EditSettingsScreen.js",
         "id": "settings.app.form.beta",
         "start": {
           "column": 8,
-          "line": 68
+          "line": 72
         }
       }
     ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 440002823..348b8e497 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -22,11 +22,11 @@
   "import.notSupportedHeadline": "Services not yet supported in Ferdi 5",
   "import.skip.label": "I want to add services manually",
   "import.submit.label": "Import services",
+  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
   "infobar.buttonChangelog": "What is new?",
   "infobar.buttonInstallUpdate": "Restart & install update",
   "infobar.buttonReloadServices": "Reload services",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
-  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
   "infobar.servicesUpdated": "Your services have been updated.",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "invite.email.label": "Email address",
@@ -35,11 +35,11 @@
   "invite.skip.label": "I want to do this later",
   "invite.submit.label": "Send invites",
   "invite.successInfo": "Invitations sent successfully",
+  "login.customServerQuestion": "Using a custom Ferdi server?",
+  "login.customServerSuggestion": "Try importing your Franz account",
   "login.email.label": "Email address",
   "login.headline": "Sign in",
   "login.invalidCredentials": "Email or password not valid",
-  "login.customServerQuestion": "Using a custom Ferdi server?",
-  "login.customServerSuggestion": "Try importing your Franz account",
   "login.link.password": "Reset password",
   "login.link.signup": "Create a free account",
   "login.password.label": "Password",
@@ -126,9 +126,9 @@
   "service.errorHandler.text": "{name} has failed to load.",
   "service.webviewLoader.loading": "Loading",
   "services.getStarted": "Get started",
-  "services.welcome": "Welcome to Ferdi",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+  "services.welcome": "Welcome to Ferdi",
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
@@ -164,8 +164,8 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.language": "Language",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
-  "settings.app.form.server": "Server",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
+  "settings.app.form.server": "Server",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
   "settings.app.headline": "Settings",