From 7e2ec8a6cc6f5058a740e97829167d056da7cbe9 Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Wed, 4 Oct 2023 14:00:42 -0700 Subject: [PATCH 1/2] fixing unit test --- app/mobile/src/constants/Strings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mobile/src/constants/Strings.js b/app/mobile/src/constants/Strings.js index 5db00286..78b7349b 100644 --- a/app/mobile/src/constants/Strings.js +++ b/app/mobile/src/constants/Strings.js @@ -900,9 +900,9 @@ const Strings = [ ]; export function getLanguageStrings() { - const locale = Platform.OS === 'ios' ? NativeModules.SettingsManager.settings.AppleLocale || NativeModules.SettingsManager.settings.AppleLanguages[0] : NativeModules.I18nManager.localeIdentifier; + const locale = Platform.OS === 'ios' ? NativeModules.SettingsManager?.settings.AppleLocale || NativeModules.SettingsManager?.settings.AppleLanguages[0] : NativeModules.I18nManager?.localeIdentifier; - const lang = locale.slice(0, 2) || ''; + const lang = locale?.slice(0, 2) || ''; if (lang === 'en') { return Strings[0]; From 9c3c50c0b732e8eb19703aa79881406cfd270dbf Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Wed, 4 Oct 2023 14:22:17 -0700 Subject: [PATCH 2/2] translating access screens --- app/mobile/src/access/admin/Admin.jsx | 27 ++++---- app/mobile/src/access/create/Create.jsx | 70 +++++++++++--------- app/mobile/src/access/login/Login.jsx | 2 +- app/mobile/src/access/reset/Reset.jsx | 28 ++++---- app/mobile/src/access/reset/useReset.hook.js | 2 +- app/mobile/src/constants/Strings.js | 21 ++---- 6 files changed, 72 insertions(+), 78 deletions(-) diff --git a/app/mobile/src/access/admin/Admin.jsx b/app/mobile/src/access/admin/Admin.jsx index 09fef349..5430a67d 100644 --- a/app/mobile/src/access/admin/Admin.jsx +++ b/app/mobile/src/access/admin/Admin.jsx @@ -16,8 +16,8 @@ export function Admin() { } catch (err) { Alert.alert( - "Access Failed", - "Please check your server and token.", + state.strings.error, + state.strings.tryAgain, ); } } @@ -32,20 +32,21 @@ export function Admin() { Databag - Admin Acess + { state.strings.adminAccess } + autoCorrect={false} autoCapitalize="none" placeholder={state.strings.server} + placeholderTextColor={Colors.inputPlaceholder} /> + secureTextEntry={!state.plainText} autoCapitalize="none" placeholder={state.strings.token} + placeholderTextColor={Colors.inputPlaceholder} /> { state.plainText && ( @@ -59,7 +60,7 @@ export function Admin() { { Platform.OS !== 'ios' && ( - View Terms of Service + { state.strings.terms } actions.agree(!state.agree)}> { state.agree && ( @@ -68,7 +69,7 @@ export function Admin() { { !state.agree && ( )} - I agree to Terms of Service + { state.strings.agree } )} @@ -85,7 +86,7 @@ export function Admin() { )} { (!state.enabled || (Platform.OS !== 'ios' && !state.agree)) && ( - Access + { state.strings.access } )} @@ -93,7 +94,7 @@ export function Admin() { v{ state.version } - - Terms of Use and User Policy - { tos.message } + { state.strings.policy } + { tos[state.strings.languageCode] } - Done + { state.strings.close } diff --git a/app/mobile/src/access/create/Create.jsx b/app/mobile/src/access/create/Create.jsx index 75110d5d..4d34d9aa 100644 --- a/app/mobile/src/access/create/Create.jsx +++ b/app/mobile/src/access/create/Create.jsx @@ -16,8 +16,8 @@ export function Create() { } catch (err) { Alert.alert( - "Create Failed", - "Please check your server and token.", + state.strings.error, + state.strings.tryAgain, ); } } @@ -36,13 +36,14 @@ export function Create() { Databag - Create Account + { state.strings.createAccount } - + + autoCorrect={false} autoCapitalize="none" placeholder={state.strings.server} + placeholderTextColor={Colors.inputPlaceholder} /> { (!state.server || !state.serverChecked) && ( @@ -58,9 +59,10 @@ export function Create() { { state.tokenRequired && ( - + + autoCorrect={false} autoCapitalize="none" placeholder={state.strings.token} + placeholderTextColor={Colors.inputPlaceholder} /> { (!validServer || !state.token || !state.tokenChecked) && ( @@ -76,14 +78,15 @@ export function Create() { )} { !state.tokenRequired && state.server === 'databag.coredb.org' && ( - The default public server is to test out the system. Use a private server otherwise. + {state.strings.defaultPublic} )} - + + autoCorrect={false} autoCapitalize="none" placeholder={state.strings.username} + placeholderTextColor={Colors.inputPlaceholder} /> { (!validServer || !validToken || !state.username || !state.usernameChecked) && ( )} @@ -96,44 +99,45 @@ export function Create() { { state.showPassword && ( - + + autoCorrect={false} autoCapitalize="none" placeholder={state.strings.password} + placeholderTextColor={Colors.inputPlaceholder} /> - + )} { !state.showPassword && ( - + + autoCorrect={false} secureTextEntry={true} autoCapitalize="none" placeholder={state.strings.password} + placeholderTextColor={Colors.inputPlaceholder} /> - + )} { state.showConfirm && ( - + + autoCorrect={false} autoCapitalize="none" placeholder={state.strings.confirmPassword} + placeholderTextColor={Colors.inputPlaceholder} /> - + )} { !state.showConfirm && ( - + + autoCorrect={false} secureTextEntry={true} autoCapitalize="none" placeholder={state.strings.confirmPassword} + placeholderTextColor={Colors.inputPlaceholder} /> - + )} @@ -141,7 +145,7 @@ export function Create() { { Platform.OS !== 'ios' && ( - View Terms of Service + { state.strings.terms } actions.agree(!state.agree)}> { state.agree && ( @@ -150,7 +154,7 @@ export function Create() { { !state.agree && ( )} - I agree to Terms of Service + { state.strings.agree } )} @@ -162,17 +166,17 @@ export function Create() { )} { !state.busy && ( - Create Account + { state.strings.create } )} )} { (!state.enabled || (Platform.OS !== 'ios' && !state.agree)) && ( - Create Account + { state.strings.create } )} - Account Login + { state.strings.accountLogin } @@ -186,11 +190,11 @@ export function Create() { > - Terms of Use and User Policy - { tos.message } + { state.strings.policy } + { tos[state.strings.languageCode] } - Done + { state.strings.close } diff --git a/app/mobile/src/access/login/Login.jsx b/app/mobile/src/access/login/Login.jsx index 02cbbd35..3cdcacc0 100644 --- a/app/mobile/src/access/login/Login.jsx +++ b/app/mobile/src/access/login/Login.jsx @@ -120,7 +120,7 @@ export function Login() { { tos[state.strings.languageCode] } - { state.strings.done } + { state.strings.close } diff --git a/app/mobile/src/access/reset/Reset.jsx b/app/mobile/src/access/reset/Reset.jsx index 26d029a8..70edded1 100644 --- a/app/mobile/src/access/reset/Reset.jsx +++ b/app/mobile/src/access/reset/Reset.jsx @@ -16,8 +16,8 @@ export function Reset() { } catch (err) { Alert.alert( - "Access Failed", - "Please check your server and token.", + state.strings.error, + state.strings.tryAgain, ); } } @@ -32,26 +32,26 @@ export function Reset() { Databag - Access Account + { state.strings.accessAccount } + autoCapitalize="none" placeholder={state.strings.server} placeholderTextColor={Colors.inputPlaceholder} /> + autoCapitalize="none" placeholder={state.strings.token} placeholderTextColor={Colors.inputPlaceholder} /> { Platform.OS !== 'ios' && ( - View Terms of Service + { state.strings.terms } actions.agree(!state.agree)}> { state.agree && ( @@ -60,7 +60,7 @@ export function Reset() { { !state.agree && ( )} - I agree to Terms of Service + {state.string.agree} )} @@ -71,17 +71,17 @@ export function Reset() { )} { !state.busy && ( - Access + { state.strings.access } )} )} { (!state.enabled || (Platform.OS !== 'ios' && !state.agree)) && ( - Access + { state.strings.access } )} - Account Login + { state.strings.accountLogin } @@ -94,11 +94,11 @@ export function Reset() { > - Terms of Use and User Policy - { tos.message } + { state.strings.policy } + { tos[state.strings.languageCode] } - - Done + + { state.strings.done } diff --git a/app/mobile/src/access/reset/useReset.hook.js b/app/mobile/src/access/reset/useReset.hook.js index 08f120d2..3ecf3c92 100644 --- a/app/mobile/src/access/reset/useReset.hook.js +++ b/app/mobile/src/access/reset/useReset.hook.js @@ -10,7 +10,7 @@ export function useReset() { const app = useContext(AppContext); const [state, setState] = useState({ - stirngs: getLanguageStrings(), + strings: getLanguageStrings(), busy: false, enabled: false, server: null, diff --git a/app/mobile/src/constants/Strings.js b/app/mobile/src/constants/Strings.js index 78b7349b..79e5e6b7 100644 --- a/app/mobile/src/constants/Strings.js +++ b/app/mobile/src/constants/Strings.js @@ -176,7 +176,7 @@ const Strings = [ adminAccess: 'Admin Access', server: 'Server', access: 'Access', - defaultPublish: 'The default public server is to test out the system. Use a private server otherwise.', + defaultPublic: 'The default public server is to test out the system. Use a private server otherwise.', confirmPassword: 'Confirm Password', accountLogin: 'Account Login', accessAccount: 'Access Account', @@ -349,24 +349,13 @@ const Strings = [ fontColor: 'Couleur du Texte', selectedColor: 'Couleur Sélectionnée', - login: 'Login', - createAccount: 'Create Account', - forgotPassword: 'Forgot Password', - adminAccess: 'Admin Access', - server: 'Server', - access: 'Access', - defaultPublish: 'The default public server is to test out the system. Use a private server otherwise.', - confirmPassword: 'Confirm Password', - accountLogin: 'Account Login', - accessAccount: 'Access Account', - login: 'Connexion', createAccount: 'Créer un Compte', forgotPassword: 'Mot de Passe Oublié', adminAccess: 'Accès Administrateur', server: 'Serveur', access: 'Accès', - defaultPublish: 'Le serveur public par défaut est destiné à tester le système. Utilisez un serveur privé sinon.', + defaultPublic: 'Le serveur public par défaut est destiné à tester le système. Utilisez un serveur privé sinon.', confirmPassword: 'Confirmer le Mot de Passe', accountLogin: 'Connexion au Compte', accessAccount: 'Accéder au Compte', @@ -545,7 +534,7 @@ const Strings = [ adminAccess: 'Acceso de administrador', server: 'Servidor', access: 'Acceso', - defaultPublish: 'El servidor público predeterminado es para probar el sistema. Utilice un servidor privado en caso contrario.', + defaultPublic: 'El servidor público predeterminado es para probar el sistema. Utilice un servidor privado en caso contrario.', confirmPassword: 'Confirmar contraseña', accountLogin: 'Iniciar sesión en la cuenta', accessAccount: 'Acceder a la cuenta', @@ -724,7 +713,7 @@ const Strings = [ adminAccess: 'Administratorzugang', server: 'Server', access: 'Zugang', - defaultPublish: 'Der Standard-Public-Server dient dazu, das System zu testen. Verwenden Sie andernfalls einen privaten Server.', + defaultPublic: 'Der Standard-Public-Server dient dazu, das System zu testen. Verwenden Sie andernfalls einen privaten Server.', confirmPassword: 'Passwort bestätigen', accountLogin: 'Kontoanmeldung', accessAccount: 'Zugang zum Konto', @@ -889,7 +878,7 @@ const Strings = [ adminAccess: 'Acesso de Administrador', server: 'Servidor', access: 'Acesso', - defaultPublish: 'O servidor público padrão serve para testar o sistema. Use um servidor privado, caso contrário.', + defaultPublic: 'O servidor público padrão serve para testar o sistema. Use um servidor privado, caso contrário.', confirmPassword: 'Confirmar Senha', accountLogin: 'Login da Conta', accessAccount: 'Acessar Conta',