i18n custom Ferdi strings

3 files changed, 25 insertions, 6 deletions

diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index f8caebd7e..1563e471a 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -34,6 +34,14 @@ const messages = defineMessages({
     id: 'login.invalidCredentials',
     defaultMessage: '!!!Email or password not valid',
   },
+  customServerQuestion: {
+    id: 'login.customServerQuestion',
+    defaultMessage: '!!!Using a custom Ferdi server?',
+  },
+  customServerSuggestion: {
+    id: 'login.customServerSuggestion',
+    defaultMessage: '!!!Try importing your Franz account',
+  },
   tokenExpired: {
     id: 'login.tokenExpired',
     defaultMessage: '!!!Your session expired, please login again.',
@@ -141,14 +149,13 @@ 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">
-                    Using a custom Ferdi server? Try
-                  {' '}
+                    {intl.formatMessage(messages.customServerQuestion)}{' '}
                   <Link
                     to={`${window.ferdi.stores.settings.all.app.server.replace('v1', '')}/import`}
                     target="_blank"
                     style={{ cursor: 'pointer', textDecoration: 'underline' }}
                   >
-importing your Franz account
+                    {intl.formatMessage(messages.customServerSuggestion)}
                   </Link>
                 </p>
               )}
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 02550c87f..5c3d301e0 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -34,6 +34,10 @@ const messages = defineMessages({
     id: 'infobar.requiredRequestsFailed',
     defaultMessage: '!!!Could not load services and user information',
   },
+  authRequestFailed: {
+    id: 'infobar.authRequestFailed',
+    defaultMessage: '!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.',
+  },
 });
 
 const styles = theme => ({
@@ -154,7 +158,7 @@ class AppLayout extends Component {
                   onClick={retryRequiredRequests}
                 >
                   <span className="mdi mdi-flash" />
-                  There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.
+                  {intl.formatMessage(messages.authRequestFailed)}
                 </InfoBar>
               )}
               {showServicesUpdatedInfoBar && (
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index 9fe737529..5fad070f0 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -16,6 +16,14 @@ const messages = defineMessages({
     id: 'services.getStarted',
     defaultMessage: '!!!Get started',
   },
+  login: {
+    id: 'services.login',
+    defaultMessage: '!!!Please login to use Ferdi.',
+  },
+  serverInfo: {
+    id: 'services.serverInfo',
+    defaultMessage: '!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.',
+  },
 });
 
 export default @observer class Services extends Component {
@@ -64,8 +72,8 @@ export default @observer class Services extends Component {
               <h1>{intl.formatMessage(messages.welcome)}</h1>
               { !isLoggedIn && (
                 <>
-                  <p>Please login to use Ferdi.</p>
-                  <p>Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.</p>
+                  <p>{intl.formatMessage(messages.login)}</p>
+                  <p>{intl.formatMessage(messages.serverInfo)}</p>
                 </>
               ) }
               <Appear