From a70688fe4430409fef147ef8ea7e946748d7f8be Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Mon, 8 Oct 2018 12:26:12 -0300 Subject: [PATCH] Missing translations on login screen (#2227) --- app/screens/login/login.js | 8 ++++++++ assets/base/i18n/en.json | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/app/screens/login/login.js b/app/screens/login/login.js index 6537604ca..1171c686d 100644 --- a/app/screens/login/login.js +++ b/app/screens/login/login.js @@ -143,6 +143,14 @@ export default class Login extends PureComponent { Keyboard.dismiss(); InteractionManager.runAfterInteractions(async () => { if (!this.props.loginId) { + t('login.noEmail'); + t('login.noEmailLdapUsername'); + t('login.noEmailUsername'); + t('login.noEmailUsernameLdapUsername'); + t('login.noLdapUsername'); + t('login.noUsername'); + t('login.noUsernameLdapUsername'); + // it's slightly weird to be constructing the message ID, but it's a bit nicer than triply nested if statements let msgId = 'login.no'; if (this.props.config.EnableSignInWithEmail === 'true') { diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json index af4c34c3b..76571b2b8 100644 --- a/assets/base/i18n/en.json +++ b/assets/base/i18n/en.json @@ -97,7 +97,14 @@ "login.invalidPassword": "Your password is incorrect.", "login.ldapUsername": "AD/LDAP Username", "login.ldapUsernameLower": "AD/LDAP username", + "login.noEmail": "Please enter your email", + "login.noEmailLdapUsername": "Please enter your email or {ldapUsername}", + "login.noEmailUsername": "Please enter your email or username", + "login.noEmailUsernameLdapUsername": "Please enter your email, username or {ldapUsername}", + "login.noLdapUsername": "Please enter your {ldapUsername}", "login.noPassword": "Please enter your password", + "login.noUsername": "Please enter your username", + "login.noUsernameLdapUsername": "Please enter your username or {ldapUsername}", "login.or": "or", "login.password": "Password", "login.signIn": "Sign in",