Merge pull request #3435 from eVoloshchak/eVoloshchak-localizedString…

…sFix Apply localization to all hard coded text in the Expensify.cash app
Expensify · Jun 9, 2021 · a25a01b · a25a01b
2 parents 7745c8a + 6adbb0f
commit a25a01b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/components/AttachmentPicker/index.native.js b/src/components/AttachmentPicker/index.native.js
@@ -80,7 +80,7 @@ class AttachmentPicker extends Component {
             {
                 icon: Paperclip,
                 text: this.props.translate('attachmentPicker.chooseDocument'),
-                pickAttachment: this.showDocumentPicker,
+                pickAttachment: () => this.showDocumentPicker(),
             },
         ];
 
@@ -145,8 +145,7 @@ class AttachmentPicker extends Component {
                             this.showGeneralAlert(response.error);
                             break;
                     }
-                    const errorDescription = this.props.translate('attachmentPicker.errorDuringAttachmentSelection');
-                    reject(new Error(`${errorDescription}: ${response.error}`));
+                    reject(new Error(`Error during attachment selection: ${response.error}`));
                 }
 
                 resolve(response);

diff --git a/src/languages/en.js b/src/languages/en.js
@@ -31,14 +31,14 @@ export default {
         contacts: 'Contacts',
         recents: 'Recents',
         close: 'Close',
+        settings: 'Settings',
     },
     attachmentPicker: {
         cameraPermissionRequired: 'Camera Permission Required',
         expensifyDoesntHaveAccessToCamera: 'Expensify.cash does not have access to your camera, please enable the permission and try again.',
         attachmentError: 'Attachment Error',
         errorWhileSelectingAttachment: 'An error occurred while selecting an attachment, please try again',
         errorWhileSelectingCorruptedImage: 'An error occurred while selecting a corrupted attachment, please try another file',
-        errorDuringAttachmentSelection: 'Error during attachment selection',
         takePhoto: 'Take Photo',
         chooseFromGallery: 'Choose from Gallery',
         chooseDocument: 'Choose Document',
@@ -156,7 +156,6 @@ export default {
         sendValidation: 'Send Validation',
     },
     initialSettingsPage: {
-        settings: 'Settings',
         about: 'About',
         aboutPage: {
             description: 'Expensify.cash is built by a community of open source developers from around the world. Come help us build the next generation of Expensify.',

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -29,14 +29,14 @@ export default {
         delete: 'Eliminar',
         contacts: 'Contactos',
         recents: 'Recientes',
+        settings: 'Configuración',
     },
     attachmentPicker: {
         cameraPermissionRequired: 'Se necesita permiso para usar la cámara',
         expensifyDoesntHaveAccessToCamera: 'Expensify.cash no tiene acceso a tu cámara, por favor activa el permiso y vuelve a intentarlo.',
         attachmentError: 'Error al adjuntar archivo',
         errorWhileSelectingAttachment: 'Ha ocurrido un error al seleccionar un adjunto, por favor inténtalo de nuevo',
         errorWhileSelectingCorruptedImage: 'Ha ocurrido un error al seleccionar un adjunto corrupto, por favor intentalo con otro archivo',
-        errorDuringAttachmentSelection: 'Error al seleccionar un archivo adjunto',
         takePhoto: 'Hacer una Foto',
         chooseFromGallery: 'Elegir de la galería',
         chooseDocument: 'Elegir Documento',
@@ -153,7 +153,6 @@ export default {
         sendValidation: 'Enviar validación',
     },
     initialSettingsPage: {
-        settings: 'Configuración',
         about: 'Acerca de',
         aboutPage: {
             description: 'Expensify.cash está desarrollado por una comunidad de desarrolladores open source de todo el mundo. Ayúdanos a construir la próxima generación de Expensify.',

diff --git a/src/pages/settings/InitialPage.js b/src/pages/settings/InitialPage.js
@@ -106,7 +106,7 @@ const InitialSettingsPage = ({
     return (
         <ScreenWrapper>
             <HeaderWithCloseButton
-                title={translate('initialSettingsPage.settings')}
+                title={translate('common.settings')}
                 onCloseButtonPress={() => Navigation.dismissModal(true)}
             />
             <ScrollView style={[styles.settingsPageBackground]} bounces={false}>