3195 fix messages on password screen

src/languages/en.js

@@ -253,6 +253,15 @@ export default {
         forgot: 'Forgot?',
         twoFactorCode: 'Two Factor Code',
         requiredWhen2FAEnabled: 'Required when 2FA is enabled',
+        error: {
+            incorrectLoginOrPassword: 'Incorrect login or password. Please try again.',
+            twoFactorAuthenticationEnabled: 'You have 2FA enabled on this account. Please sign in using your email or phone number.',
+            invalidLoginOrPassword: 'Invalid login or password. Please try again or reset your password.',
+            unableToResetPassword: 'We were unable to change your password. This is likely due to an expired password reset link in an old password reset email. We have emailed you a new link so you can try again. Check your Inbox and your Spam folder; it should arrive in just a few minutes.',
+            noAccess: 'You do not have access to this application. Please add your GitHub username for access.',
+            accountLocked: 'Your account has been locked after too many unsuccessful attempts. Please try again after 1 hour.',
+            fallback: 'Something went wrong. Please try again later.',
+        },
     },
     loginForm: {
         pleaseEnterEmailOrPhoneNumber: 'Please enter an email or phone number',
@@ -412,7 +421,7 @@ export default {
         },
     },
     session: {
-        offlineMessage: 'Looks like you\'re not connected to internet. Can you check your connection and try again?',
+        offlineMessage: 'Looks like you\'re offline. Please check your connection and try again.',
     },
     workspace: {
         common: {

src/languages/es.js

@@ -249,6 +249,15 @@ export default {
         forgot: '¿Te has olvidado?',
         twoFactorCode: 'Autenticación de 2 factores',
         requiredWhen2FAEnabled: 'Obligatorio cuando A2F está habilitado',
+        error: {
+            incorrectLoginOrPassword: 'Usuario o clave incorrectos. Por favor inténtalo de nuevo',
+            twoFactorAuthenticationEnabled: 'Tienes autenticación de 2 factores activada en esta cuenta. Por favor conéctate usando su email o número de teléfono',
+            invalidLoginOrPassword: 'Usuario o clave incorrectos. Por favor inténtalo de nuevo o resetea tu clave',
+            unableToResetPassword: 'No pudimos cambiar tu clave. Probablemente porque el enlace para resetear la clave ha expirado. Te hemos enviado un nuevo enlace. Chequea tu bandeja de entrada y tu carpeta de Spam',
+            noAccess: 'No tienes acceso a esta aplicación. Por favor agrega tu usuario de GitHub para acceder',
+            accountLocked: 'Tu cuenta ha sido bloqueada tras varios intentos fallidos. Por favor inténtalo otra vez dentro de 1 hora',
+            fallback: 'Ha ocurrido un error. Por favor inténtalo mas tarde',
+        },
     },
     loginForm: {
         pleaseEnterEmailOrPhoneNumber: 'Por favor escribe un email o número de teléfono',
@@ -343,7 +352,7 @@ export default {
         },
     },
     session: {
-        offlineMessage: 'Parece que no estás conectado a internet. Comprueba tu conexión e inténtalo de nuevo.',
+        offlineMessage: 'Parece que estás desconectado. Por favor chequea tu conexión e inténtalo otra vez',
     },
     workspace: {
         common: {

src/libs/API.js

@@ -220,23 +220,19 @@ function Authenticate(parameters) {
             if (response.jsonCode !== 200) {
                 switch (response.jsonCode) {
                     case 401:
-                        throw new Error('Incorrect login or password. Please try again.');
+                        throw new Error('passwordForm.error.incorrectLoginOrPassword');
                     case 402:
-                        // eslint-disable-next-line max-len
-                        throw new Error('You have 2FA enabled on this account. Please sign in using your email or phone number.');
+                        throw new Error('passwordForm.error.twoFactorAuthenticationEnabled');
                     case 403:
-                        throw new Error('Invalid login or password. Please try again or reset your password.');
+                        throw new Error('passwordForm.error.invalidLoginOrPassword');
                     case 404:
-                        // eslint-disable-next-line max-len
-                        throw new Error('We were unable to change your password. This is likely due to an expired password reset link in an old password reset email. We have emailed you a new link so you can try again. Check your Inbox and your Spam folder; it should arrive in just a few minutes.');
+                        throw new Error('passwordForm.error.unableToResetPassword');
                     case 405:
-                        // eslint-disable-next-line max-len
-                        throw new Error('You do not have access to this application. Please add your GitHub username for access.');
+                        throw new Error('passwordForm.error.noAccess');
                     case 413:
-                        // eslint-disable-next-line max-len
-                        throw new Error('Your account has been locked after too many unsuccessful attempts. Please try again after 1 hour.');
+                        throw new Error('passwordForm.error.accountLocked');
                     default:
-                        throw new Error('Something went wrong. Please try again later.');
+                        throw new Error('passwordForm.error.fallback');
                 }
             }
             return response;

src/libs/actions/Session.js

@@ -8,7 +8,7 @@ import CONFIG from '../../CONFIG';
 import PushNotification from '../Notification/PushNotification';
 import Timing from './Timing';
 import CONST from '../../CONST';
-import {translate} from '../translate';
+import {translateLocal} from '../translate';
 
 let credentials = {};
 Onyx.connect({
@@ -130,7 +130,7 @@ function fetchAccountDetails(login) {
             Onyx.merge(ONYXKEYS.ACCOUNT, {error: response.message});
         })
         .catch(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {error: translate('', 'session.offlineMessage')});
+            Onyx.merge(ONYXKEYS.ACCOUNT, {error: translateLocal('session.offlineMessage')});
         })
         .finally(() => {
             Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
@@ -216,7 +216,7 @@ function signIn(password, twoFactorAuthCode) {
             createTemporaryLogin(authToken, encryptedAuthToken, email);
         })
         .catch((error) => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {error: error.message, loading: false});
+            Onyx.merge(ONYXKEYS.ACCOUNT, {error: translateLocal(error.message), loading: false});
         });
 }