From b04040b78bdc5b56ef9caf93b1baf3848c548d6d Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Thu, 15 Jul 2021 14:32:37 -0600 Subject: [PATCH 01/10] Update copy to refer to new URL --- desktop/main.js | 8 ++++---- src/CONFIG.js | 2 +- src/languages/en.js | 8 ++++---- src/languages/es.js | 14 +++++++------- src/libs/Navigation/AppNavigator/AuthScreens.js | 4 ++-- .../LocalNotification/BrowserNotifications.js | 2 +- src/libs/actions/BankAccounts.js | 2 +- src/styles/roundToNearestMultipleOfFour.js | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/desktop/main.js b/desktop/main.js index 4f8892472fe09..a468ac192c88d 100644 --- a/desktop/main.js +++ b/desktop/main.js @@ -86,7 +86,7 @@ const quitAndInstallWithUpdate = () => { // Defines the system-level menu item for manually triggering an update after const updateAppMenuItem = new MenuItem({ - label: 'Update Expensify.cash', + label: 'Update new.expensify.com', enabled: false, click: quitAndInstallWithUpdate, }); @@ -120,7 +120,7 @@ const mainWindow = (() => { // Prod and staging set the icon in the electron-builder config, so only update it here for dev if (isDev) { app.dock.setIcon(`${__dirname}/icon-dev.png`); - app.setName('Expensify.cash'); + app.setName('new.expensify.com'); } return app.whenReady() @@ -137,7 +137,7 @@ const mainWindow = (() => { // Prod and staging overwrite the app name in the electron-builder config, so only update it here for dev if (isDev) { - browserWindow.setTitle('Expensify.cash'); + browserWindow.setTitle('new.expensify.com'); } // List the Expensify Chat instance under the Window menu, even when it's hidden @@ -172,7 +172,7 @@ const mainWindow = (() => { const windowMenu = systemMenu.items.find(item => item.role === 'windowmenu'); windowMenu.submenu.append(new MenuItem({type: 'separator'})); windowMenu.submenu.append(new MenuItem({ - label: 'Expensify.cash', + label: 'new.expensify.com', accelerator: 'CmdOrCtrl+1', click: () => browserWindow.show(), })); diff --git a/src/CONFIG.js b/src/CONFIG.js index b7e4f52d1b692..714e3ca39dd17 100644 --- a/src/CONFIG.js +++ b/src/CONFIG.js @@ -55,7 +55,7 @@ export default { APP_KEY: lodashGet(Config, 'PUSHER_APP_KEY', '268df511a204fbb60884'), CLUSTER: 'mt1', }, - SITE_TITLE: 'Expensify.cash', + SITE_TITLE: 'new.expensify.com', FAVICON: { DEFAULT: '/favicon.png', UNREAD: '/favicon-unread.png', diff --git a/src/languages/en.js b/src/languages/en.js index 2c13b708c4045..9c2e87e69b321 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -61,7 +61,7 @@ export default { }, attachmentPicker: { cameraPermissionRequired: 'Camera Permission Required', - expensifyDoesntHaveAccessToCamera: 'Expensify.cash does not have access to your camera, please enable the permission and try again.', + expensifyDoesntHaveAccessToCamera: 'new.expensify.com 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', @@ -75,7 +75,7 @@ export default { }, baseUpdateAppModal: { updateApp: 'Update App', - updatePrompt: 'A new version of Expensify.cash is available.\nUpdate now or restart the app at a later time to download the latest changes.', + updatePrompt: 'A new version of new.expensify.com is available.\nUpdate now or restart the app at a later time to download the latest changes.', }, iOUConfirmationList: { whoPaid: 'WHO PAID?', @@ -226,7 +226,7 @@ export default { }, passwordPage: { changePassword: 'Change Password', - changingYourPasswordPrompt: 'Changing your password will update your password for both your Expensify.com\nand Expensify.cash accounts.', + changingYourPasswordPrompt: 'Changing your password will update your password for both your Expensify.com\nand new.expensify.com accounts.', currentPassword: 'Current Password', newPassword: 'New Password', newPasswordPrompt: 'New password must be different than your old password, have at least 8 characters,\n1 capital letter, 1 lowercase letter, 1 number.', @@ -258,7 +258,7 @@ export default { }, }, signInPage: { - expensifyDotCash: 'Expensify.cash', + expensifyDotCash: 'new.expensify.com', expensifyIsOpenSource: 'The New Expensify is open source', theCode: 'the code', openJobs: 'open jobs', diff --git a/src/languages/es.js b/src/languages/es.js index de5b415a1fdf3..a4a451f3d23e5 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -57,7 +57,7 @@ export default { }, 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.', + expensifyDoesntHaveAccessToCamera: 'new.expensify.com 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', @@ -71,7 +71,7 @@ export default { }, baseUpdateAppModal: { updateApp: 'Actualizar App', - updatePrompt: 'Existe una nueva versión de Expensify.cash.\nActualiza ahora or reinicia la aplicación más tarde para recibir la última versión.', + updatePrompt: 'Existe una nueva versión de new.expensify.com.\nActualiza ahora or reinicia la aplicación más tarde para recibir la última versión.', }, iOUConfirmationList: { whoPaid: '¿QUIÉN PAGO?', @@ -92,7 +92,7 @@ export default { hello: 'Hola', phoneCountryCode: '34', welcomeText: { - phrase1: 'Con Expensify.cash, chat y pagos son lo mismo.', + phrase1: 'Con new.expensify.com, chat y pagos son lo mismo.', phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.', phrase3: 'Tus pagos llegan tan rápido como tus mensajes.', }, @@ -219,7 +219,7 @@ export default { }, passwordPage: { changePassword: 'Cambiar Contraseña', - changingYourPasswordPrompt: 'El cambio de contraseña va a afectar tanto a la cuenta de Expensify.com\ncomo la de Expensify.cash.', + changingYourPasswordPrompt: 'El cambio de contraseña va a afectar tanto a la cuenta de Expensify.com\ncomo la de new.expensify.com.', currentPassword: 'Contraseña Actual', newPassword: 'Nueva contraseña', newPasswordPrompt: 'La nueva contraseña tiene que ser diferente de la antigua, tener al menos 8 letras,\n1 letra mayúscula, 1 letra minúscula y 1 número.', @@ -250,13 +250,13 @@ export default { }, }, signInPage: { - expensifyDotCash: 'Expensify.cash', - expensifyIsOpenSource: 'Expensify.cash es open source', + expensifyDotCash: 'new.expensify.com', + expensifyIsOpenSource: 'new.expensify.com es open source', theCode: 'el código', openJobs: 'trabajos disponibles', }, termsOfUse: { - phrase1: 'Al usar Expensify.cash, estás aceptando los', + phrase1: 'Al usar new.expensify.com, estás aceptando los', phrase2: 'términos de servicio', phrase3: 'y', phrase4: 'política de privacidad', diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js index ff370c7ef42e8..af019669c23b7 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.js +++ b/src/libs/Navigation/AppNavigator/AuthScreens.js @@ -260,7 +260,7 @@ class AuthScreens extends React.Component { name={SCREENS.HOME} options={{ headerShown: false, - title: 'Expensify.cash', + title: 'new.expensify.com', // prevent unnecessary scrolling cardStyle: { @@ -273,7 +273,7 @@ class AuthScreens extends React.Component { name="ValidateLogin" options={{ headerShown: false, - title: 'Expensify.cash', + title: 'new.expensify.com', }} component={ValidateLoginPage} /> diff --git a/src/libs/Notification/LocalNotification/BrowserNotifications.js b/src/libs/Notification/LocalNotification/BrowserNotifications.js index f5e128d3eec1c..740f361b3aaa0 100644 --- a/src/libs/Notification/LocalNotification/BrowserNotifications.js +++ b/src/libs/Notification/LocalNotification/BrowserNotifications.js @@ -126,7 +126,7 @@ export default { pushUpdateAvailableNotification() { push({ title: 'Update available', - body: 'A new version of Expensify.cash is available!', + body: 'A new version of new.expensify.com is available!', delay: 0, onClick: () => { Onyx.merge(ONYXKEYS.UPDATE_AVAILABLE, true); diff --git a/src/libs/actions/BankAccounts.js b/src/libs/actions/BankAccounts.js index b8187d55a6e5f..182a4885856c7 100644 --- a/src/libs/actions/BankAccounts.js +++ b/src/libs/actions/BankAccounts.js @@ -450,7 +450,7 @@ function fetchFreePlanVerifiedBankAccount(stepToOpen) { ? CONST.BANK_ACCOUNT.STEP.VALIDATION : CONST.BANK_ACCOUNT.STEP.COMPANY; achData.bankAccountInReview = hasTriedToUpgrade; } else { - // In Expensify.cash we do not show a specific view for the EnableStep since we + // We do not show a specific view for the EnableStep since we // will enable the Expensify card automatically. However, we will still handle // that step and show the Validate view. currentStep = CONST.BANK_ACCOUNT.STEP.ENABLE; diff --git a/src/styles/roundToNearestMultipleOfFour.js b/src/styles/roundToNearestMultipleOfFour.js index 1f42b008f3ae0..a00f799e9d355 100644 --- a/src/styles/roundToNearestMultipleOfFour.js +++ b/src/styles/roundToNearestMultipleOfFour.js @@ -1,5 +1,5 @@ /** - * The Expensify.cash repo is very consistent about doing spacing in multiples of 4. + * This repo is very consistent about doing spacing in multiples of 4. * In an effort to maintain that consistency, we'll make sure that any distance we're shifting the components * are a multiple of 4. * From ead298383231e136af8aef128297b2ea0f067fd2 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Fri, 16 Jul 2021 14:01:02 -0600 Subject: [PATCH 02/10] Taking another stab at the translations --- desktop/main.js | 8 ++++---- src/CONFIG.js | 4 ++-- src/languages/en.js | 10 +++++----- src/languages/es.js | 8 ++++---- src/libs/Navigation/AppNavigator/AuthScreens.js | 4 ++-- .../LocalNotification/BrowserNotifications.js | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/desktop/main.js b/desktop/main.js index a468ac192c88d..2f84fa5d24f3c 100644 --- a/desktop/main.js +++ b/desktop/main.js @@ -86,7 +86,7 @@ const quitAndInstallWithUpdate = () => { // Defines the system-level menu item for manually triggering an update after const updateAppMenuItem = new MenuItem({ - label: 'Update new.expensify.com', + label: 'Update New Expensify', enabled: false, click: quitAndInstallWithUpdate, }); @@ -120,7 +120,7 @@ const mainWindow = (() => { // Prod and staging set the icon in the electron-builder config, so only update it here for dev if (isDev) { app.dock.setIcon(`${__dirname}/icon-dev.png`); - app.setName('new.expensify.com'); + app.setName('New Expensify'); } return app.whenReady() @@ -137,7 +137,7 @@ const mainWindow = (() => { // Prod and staging overwrite the app name in the electron-builder config, so only update it here for dev if (isDev) { - browserWindow.setTitle('new.expensify.com'); + browserWindow.setTitle('New Expensify'); } // List the Expensify Chat instance under the Window menu, even when it's hidden @@ -172,7 +172,7 @@ const mainWindow = (() => { const windowMenu = systemMenu.items.find(item => item.role === 'windowmenu'); windowMenu.submenu.append(new MenuItem({type: 'separator'})); windowMenu.submenu.append(new MenuItem({ - label: 'new.expensify.com', + label: 'New Expensify', accelerator: 'CmdOrCtrl+1', click: () => browserWindow.show(), })); diff --git a/src/CONFIG.js b/src/CONFIG.js index 714e3ca39dd17..b43cbc0309c70 100644 --- a/src/CONFIG.js +++ b/src/CONFIG.js @@ -37,7 +37,7 @@ const secureURLRoot = useNgrok && secureNgrokURL ? secureNgrokURL : expensifyURL const expensifyURLRoot = useNgrok && ngrokURL ? ngrokURL : expensifyComWithProxy; export default { - APP_NAME: 'ExpensifyCash', + APP_NAME: 'NewExpensify', AUTH_TOKEN_EXPIRATION_TIME: 1000 * 60 * 90, EXPENSIFY: { // Note: This will be EXACTLY what is set for EXPENSIFY_URL_COM whether the proxy is enabled or not. @@ -55,7 +55,7 @@ export default { APP_KEY: lodashGet(Config, 'PUSHER_APP_KEY', '268df511a204fbb60884'), CLUSTER: 'mt1', }, - SITE_TITLE: 'new.expensify.com', + SITE_TITLE: 'New Expensify', FAVICON: { DEFAULT: '/favicon.png', UNREAD: '/favicon-unread.png', diff --git a/src/languages/en.js b/src/languages/en.js index 9c2e87e69b321..6ca1c542bc440 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -61,7 +61,7 @@ export default { }, attachmentPicker: { cameraPermissionRequired: 'Camera Permission Required', - expensifyDoesntHaveAccessToCamera: 'new.expensify.com does not have access to your camera, please enable the permission and try again.', + expensifyDoesntHaveAccessToCamera: 'This app 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', @@ -75,7 +75,7 @@ export default { }, baseUpdateAppModal: { updateApp: 'Update App', - updatePrompt: 'A new version of new.expensify.com is available.\nUpdate now or restart the app at a later time to download the latest changes.', + updatePrompt: 'A new version of this app is available.\nUpdate now or restart the app at a later time to download the latest changes.', }, iOUConfirmationList: { whoPaid: 'WHO PAID?', @@ -226,7 +226,7 @@ export default { }, passwordPage: { changePassword: 'Change Password', - changingYourPasswordPrompt: 'Changing your password will update your password for both your Expensify.com\nand new.expensify.com accounts.', + changingYourPasswordPrompt: 'Changing your password will update your password for both your Expensify.com\nand New Expensify accounts.', currentPassword: 'Current Password', newPassword: 'New Password', newPasswordPrompt: 'New password must be different than your old password, have at least 8 characters,\n1 capital letter, 1 lowercase letter, 1 number.', @@ -258,8 +258,8 @@ export default { }, }, signInPage: { - expensifyDotCash: 'new.expensify.com', - expensifyIsOpenSource: 'The New Expensify is open source', + expensifyDotCash: 'New Expensify', + expensifyIsOpenSource: 'New Expensify is open source', theCode: 'the code', openJobs: 'open jobs', heroHeading: 'Split bills\nand chat with friends.', diff --git a/src/languages/es.js b/src/languages/es.js index a4a451f3d23e5..47361753cda0a 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -57,7 +57,7 @@ export default { }, attachmentPicker: { cameraPermissionRequired: 'Se necesita permiso para usar la cámara', - expensifyDoesntHaveAccessToCamera: 'new.expensify.com no tiene acceso a tu cámara, por favor activa el permiso y vuelve a intentarlo.', + expensifyDoesntHaveAccessToCamera: 'Esta aplicación 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', @@ -71,7 +71,7 @@ export default { }, baseUpdateAppModal: { updateApp: 'Actualizar App', - updatePrompt: 'Existe una nueva versión de new.expensify.com.\nActualiza ahora or reinicia la aplicación más tarde para recibir la última versión.', + updatePrompt: 'Existe una nueva versión de esta aplicación.\nActualiza ahora or reinicia la aplicación más tarde para recibir la última versión.', }, iOUConfirmationList: { whoPaid: '¿QUIÉN PAGO?', @@ -250,8 +250,8 @@ export default { }, }, signInPage: { - expensifyDotCash: 'new.expensify.com', - expensifyIsOpenSource: 'new.expensify.com es open source', + expensifyDotCash: 'New Expensify', + expensifyIsOpenSource: 'New Expensify es open source', theCode: 'el código', openJobs: 'trabajos disponibles', }, diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js index af019669c23b7..f8fe130ec26b7 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.js +++ b/src/libs/Navigation/AppNavigator/AuthScreens.js @@ -260,7 +260,7 @@ class AuthScreens extends React.Component { name={SCREENS.HOME} options={{ headerShown: false, - title: 'new.expensify.com', + title: 'New Expensify', // prevent unnecessary scrolling cardStyle: { @@ -273,7 +273,7 @@ class AuthScreens extends React.Component { name="ValidateLogin" options={{ headerShown: false, - title: 'new.expensify.com', + title: 'New Expensify', }} component={ValidateLoginPage} /> diff --git a/src/libs/Notification/LocalNotification/BrowserNotifications.js b/src/libs/Notification/LocalNotification/BrowserNotifications.js index 740f361b3aaa0..b122c16f03acf 100644 --- a/src/libs/Notification/LocalNotification/BrowserNotifications.js +++ b/src/libs/Notification/LocalNotification/BrowserNotifications.js @@ -126,7 +126,7 @@ export default { pushUpdateAvailableNotification() { push({ title: 'Update available', - body: 'A new version of new.expensify.com is available!', + body: 'A new version of this app is available!', delay: 0, onClick: () => { Onyx.merge(ONYXKEYS.UPDATE_AVAILABLE, true); From 17d344d37aab9803149f86c064c479a26e539d38 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Mon, 19 Jul 2021 08:30:33 -0600 Subject: [PATCH 03/10] A few more corrections after slack discussions --- src/languages/en.js | 2 +- src/languages/es.js | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 6ca1c542bc440..931920e6a51ca 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -96,7 +96,7 @@ export default { hello: 'Hello', phoneCountryCode: '1', welcomeText: { - phrase1: 'Welcome to the New Expensify! Enter your phone number or email to continue.', + phrase1: 'Welcome to New Expensify! Enter your phone number or email to continue.', phrase2: 'Money talks. And now that chat and payments are in one place, it\'s also easy.', phrase3: 'Your payments get to you as fast as you can get your point across.', }, diff --git a/src/languages/es.js b/src/languages/es.js index 47361753cda0a..7f01c6b287953 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -92,7 +92,7 @@ export default { hello: 'Hola', phoneCountryCode: '34', welcomeText: { - phrase1: 'Con new.expensify.com, chat y pagos son lo mismo.', + phrase1: 'Con Nuevo Expensify, chat y pagos son lo mismo.', phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.', phrase3: 'Tus pagos llegan tan rápido como tus mensajes.', }, @@ -219,7 +219,7 @@ export default { }, passwordPage: { changePassword: 'Cambiar Contraseña', - changingYourPasswordPrompt: 'El cambio de contraseña va a afectar tanto a la cuenta de Expensify.com\ncomo la de new.expensify.com.', + changingYourPasswordPrompt: 'El cambio de contraseña va a afectar tanto a la cuenta de Expensify.com\ncomo la de Nuevo Expensify.', currentPassword: 'Contraseña Actual', newPassword: 'Nueva contraseña', newPasswordPrompt: 'La nueva contraseña tiene que ser diferente de la antigua, tener al menos 8 letras,\n1 letra mayúscula, 1 letra minúscula y 1 número.', @@ -256,12 +256,13 @@ export default { openJobs: 'trabajos disponibles', }, termsOfUse: { - phrase1: 'Al usar new.expensify.com, estás aceptando los', + phrase1: 'Al usar Nuevo Expensify, estás aceptando los', phrase2: 'términos de servicio', phrase3: 'y', phrase4: 'política de privacidad', - phrase5: 'El envío de dinero es brindado por Expensify Payments LLC (NMLS ID:2017010) de conformidad con sus', - phrase6: 'licencias', + phrase5: 'El envío de dinero es brindado por Expensify Payments LLC (NMLS', + phrase6: 'ID:2017010) de conformidad con sus', + phrase7: 'licencias', }, passwordForm: { pleaseFillOutAllFields: 'Por favor completa todos los campos', From da1724cba3aacf2041d790a55fbfbcef2af62986 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Mon, 19 Jul 2021 09:59:05 -0600 Subject: [PATCH 04/10] Correct the spanish welcome text --- src/languages/es.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/es.js b/src/languages/es.js index 7f01c6b287953..4e6a5412ddde3 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -92,7 +92,7 @@ export default { hello: 'Hola', phoneCountryCode: '34', welcomeText: { - phrase1: 'Con Nuevo Expensify, chat y pagos son lo mismo.', + phrase1: 'Al iniciar sesión, estás accediendo a los', phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.', phrase3: 'Tus pagos llegan tan rápido como tus mensajes.', }, From 829f1c40a9a923a105216a93b069ad4fd0b09b38 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Mon, 19 Jul 2021 10:25:16 -0600 Subject: [PATCH 05/10] Redo translation of terms, not welcome --- src/languages/es.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/es.js b/src/languages/es.js index 4e6a5412ddde3..e5e15996bd8fc 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -92,7 +92,7 @@ export default { hello: 'Hola', phoneCountryCode: '34', welcomeText: { - phrase1: 'Al iniciar sesión, estás accediendo a los', + phrase1: 'Con Nuevo Expensify, chat y pagos son lo mismo.', phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.', phrase3: 'Tus pagos llegan tan rápido como tus mensajes.', }, @@ -256,7 +256,7 @@ export default { openJobs: 'trabajos disponibles', }, termsOfUse: { - phrase1: 'Al usar Nuevo Expensify, estás aceptando los', + phrase1: 'Al iniciar sesión, estás accediendo a los', phrase2: 'términos de servicio', phrase3: 'y', phrase4: 'política de privacidad', From 7afe7cda80554663cba7eae0915d6471131562e7 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Tue, 27 Jul 2021 14:07:45 -0600 Subject: [PATCH 06/10] Update src/languages/es.js Co-authored-by: Ionatan Wiznia --- src/languages/es.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/es.js b/src/languages/es.js index e5e15996bd8fc..2dcafb1f44f68 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -250,7 +250,7 @@ export default { }, }, signInPage: { - expensifyDotCash: 'New Expensify', + expensifyDotCash: 'Nuevo Expensify', expensifyIsOpenSource: 'New Expensify es open source', theCode: 'el código', openJobs: 'trabajos disponibles', From b63c3ef4163e0fb32194ebabf6b3d1b02ab006a3 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Tue, 27 Jul 2021 14:07:52 -0600 Subject: [PATCH 07/10] Update src/languages/es.js Co-authored-by: Ionatan Wiznia --- src/languages/es.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/es.js b/src/languages/es.js index 2dcafb1f44f68..b92a3be476af6 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -251,7 +251,7 @@ export default { }, signInPage: { expensifyDotCash: 'Nuevo Expensify', - expensifyIsOpenSource: 'New Expensify es open source', + expensifyIsOpenSource: 'Nuevo Expensify es open source', theCode: 'el código', openJobs: 'trabajos disponibles', }, From c78cad65f4dfa9fe063a7666fbec05533eb1de1e Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Wed, 28 Jul 2021 11:13:07 -0600 Subject: [PATCH 08/10] Revert app name --- src/CONFIG.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CONFIG.js b/src/CONFIG.js index b43cbc0309c70..cb979552c0f5e 100644 --- a/src/CONFIG.js +++ b/src/CONFIG.js @@ -37,7 +37,7 @@ const secureURLRoot = useNgrok && secureNgrokURL ? secureNgrokURL : expensifyURL const expensifyURLRoot = useNgrok && ngrokURL ? ngrokURL : expensifyComWithProxy; export default { - APP_NAME: 'NewExpensify', + APP_NAME: 'ExpensifyCash', AUTH_TOKEN_EXPIRATION_TIME: 1000 * 60 * 90, EXPENSIFY: { // Note: This will be EXACTLY what is set for EXPENSIFY_URL_COM whether the proxy is enabled or not. From 5a990e0e514ac03a3d144773740fb8dd8618fcc6 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Wed, 28 Jul 2021 12:14:59 -0600 Subject: [PATCH 09/10] Add "the" into the term --- src/languages/en.js | 2 +- src/languages/es.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 9f2988cde8e59..698ee5423a3e6 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -98,7 +98,7 @@ export default { hello: 'Hello', phoneCountryCode: '1', welcomeText: { - phrase1: 'Welcome to New Expensify! Enter your phone number or email to continue.', + phrase1: 'Welcome to the New Expensify! Enter your phone number or email to continue.', phrase2: 'Money talks. And now that chat and payments are in one place, it\'s also easy.', phrase3: 'Your payments get to you as fast as you can get your point across.', }, diff --git a/src/languages/es.js b/src/languages/es.js index 2a9e9c7a7cdaf..a330f5b337925 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -93,7 +93,7 @@ export default { hello: 'Hola', phoneCountryCode: '34', welcomeText: { - phrase1: 'Con Nuevo Expensify, chat y pagos son lo mismo.', + phrase1: 'Con el Nuevo Expensify, chat y pagos son lo mismo.', phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.', phrase3: 'Tus pagos llegan tan rápido como tus mensajes.', }, From a56a43069fa9b22176b73361b3449678f91a6906 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Wed, 28 Jul 2021 12:34:40 -0600 Subject: [PATCH 10/10] Remove unused language --- src/languages/en.js | 1 - src/languages/es.js | 1 - 2 files changed, 2 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 698ee5423a3e6..099cded8ec9a1 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -266,7 +266,6 @@ export default { }, signInPage: { expensifyDotCash: 'New Expensify', - expensifyIsOpenSource: 'New Expensify is open source', theCode: 'the code', openJobs: 'open jobs', heroHeading: 'Split bills\nand chat with friends.', diff --git a/src/languages/es.js b/src/languages/es.js index a330f5b337925..88f1f9ec104e7 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -257,7 +257,6 @@ export default { }, signInPage: { expensifyDotCash: 'Nuevo Expensify', - expensifyIsOpenSource: 'Nuevo Expensify es open source', theCode: 'el código', openJobs: 'trabajos disponibles', },