Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update copy to refer to new URL #4091

Merged
merged 13 commits into from
Aug 2, 2021
Merged

Update copy to refer to new URL #4091

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b04040b
Update copy to refer to new URL
tgolen Jul 15, 2021
51adf3c
Merge branch 'main' into tgolen-password-copy
tgolen Jul 16, 2021
ead2983
Taking another stab at the translations
tgolen Jul 16, 2021
17d344d
A few more corrections after slack discussions
tgolen Jul 19, 2021
da1724c
Correct the spanish welcome text
tgolen Jul 19, 2021
829f1c4
Redo translation of terms, not welcome
tgolen Jul 19, 2021
7afe7cd
Update src/languages/es.js
tgolen Jul 27, 2021
b63c3ef
Update src/languages/es.js
tgolen Jul 27, 2021
d2b43b7
Merge branch 'main' into tgolen-password-copy
tgolen Jul 28, 2021
c78cad6
Revert app name
tgolen Jul 28, 2021
5a990e0
Add "the" into the term
tgolen Jul 28, 2021
a56a430
Remove unused language
tgolen Jul 28, 2021
66612e1
Merge branch 'main' into tgolen-password-copy
tgolen Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions desktop/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
enabled: false,
click: quitAndInstallWithUpdate,
});
Expand Down Expand Up @@ -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');
}

return app.whenReady()
Expand All @@ -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');
}

// List the Expensify Chat instance under the Window menu, even when it's hidden
Expand Down Expand Up @@ -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',
accelerator: 'CmdOrCtrl+1',
click: () => browserWindow.show(),
}));
Expand Down
4 changes: 2 additions & 2 deletions src/CONFIG.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -55,7 +55,7 @@ export default {
APP_KEY: lodashGet(Config, 'PUSHER_APP_KEY', '268df511a204fbb60884'),
CLUSTER: 'mt1',
},
SITE_TITLE: 'Expensify.cash',
SITE_TITLE: 'New Expensify',
FAVICON: {
DEFAULT: '/favicon.png',
UNREAD: '/favicon-unread.png',
Expand Down
12 changes: 6 additions & 6 deletions src/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: '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',
Expand All @@ -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 this app is available.\nUpdate now or restart the app at a later time to download the latest changes.',
},
iOUConfirmationList: {
whoPaid: 'WHO PAID?',
Expand All @@ -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.',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on David's Vatican reference, my understanding is the home page saying "the New Expensify" makes sense here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, updated!

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.',
},
Expand Down Expand Up @@ -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 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.',
Expand Down Expand Up @@ -258,8 +258,8 @@ export default {
},
},
signInPage: {
expensifyDotCash: 'Expensify.cash',
expensifyIsOpenSource: 'The New Expensify is open source',
expensifyDotCash: 'New Expensify',
expensifyIsOpenSource: 'New Expensify is open source',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to my comment above, if we decide to use "the" at all, this seems like the other sensible place to do so.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we want to use "the" here because this ends up as the header of the page.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, hold on, I was looking at the line above it for expensifyDotCash.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The phrase for expensifyIsOpenSource is not referenced anywhere, so I will just remove it. I've updated this branch.

theCode: 'the code',
openJobs: 'open jobs',
heroHeading: 'Split bills\nand chat with friends.',
Expand Down
19 changes: 10 additions & 9 deletions src/languages/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: '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',
Expand All @@ -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 esta aplicación.\nActualiza ahora or reinicia la aplicación más tarde para recibir la última versión.',
},
iOUConfirmationList: {
whoPaid: '¿QUIÉN PAGO?',
Expand All @@ -92,7 +92,7 @@ export default {
hello: 'Hola',
phoneCountryCode: '34',
welcomeText: {
phrase1: 'Con Expensify.cash, 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.',
},
Expand Down Expand Up @@ -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 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.',
Expand Down Expand Up @@ -250,18 +250,19 @@ export default {
},
},
signInPage: {
expensifyDotCash: 'Expensify.cash',
expensifyIsOpenSource: 'Expensify.cash es open source',
expensifyDotCash: 'New Expensify',
tgolen marked this conversation as resolved.
Show resolved Hide resolved
expensifyIsOpenSource: 'New Expensify es open source',
tgolen marked this conversation as resolved.
Show resolved Hide resolved
theCode: 'el código',
openJobs: 'trabajos disponibles',
},
termsOfUse: {
phrase1: 'Al usar Expensify.cash, estás aceptando los',
phrase1: 'Al usar Nuevo Expensify, estás aceptando los',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The english version of this leaves out the name of the app. I think we should do the same here.

English:

By logging in, you agree to the

@iwiznia @marklouisdeshaun what is the proper translation into Spanish?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By logging in, you agree to the

Al iniciar sesión, estás accediendo a los

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this read correctly, then?

image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, seems it's missing a line? Is this the up to date copy?

    termsOfUse: {
        phrase1: 'By logging in, you agree to the',
        phrase2: 'terms of service',
        phrase3: 'and',
        phrase4: 'privacy policy',
        phrase5: 'Money transmission is provided by Expensify Payments LLC (NMLS',
        phrase6: 'ID:2017010) pursuant to its',
        phrase7: 'licenses',
    },

If so:

    termsOfUse: {
        phrase1: 'Al usar Expensify.cash, 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',
        phrase6: 'ID:2017010) de conformidad con sus',
        phrase7: 'licencias',
    },

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, so sorry... I was looking at the welcome text 🤦

OK, I think I've got it right if you want to check the changes in this PR.

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',
Expand Down
4 changes: 2 additions & 2 deletions src/libs/Navigation/AppNavigator/AuthScreens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ class AuthScreens extends React.Component {
name={SCREENS.HOME}
options={{
headerShown: false,
title: 'Expensify.cash',
title: 'New Expensify',

// prevent unnecessary scrolling
cardStyle: {
Expand All @@ -273,7 +273,7 @@ class AuthScreens extends React.Component {
name="ValidateLogin"
options={{
headerShown: false,
title: 'Expensify.cash',
title: 'New Expensify',
}}
component={ValidateLoginPage}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/libs/Notification/LocalNotification/BrowserNotifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 this app is available!',
delay: 0,
onClick: () => {
Onyx.merge(ONYXKEYS.UPDATE_AVAILABLE, true);
Expand Down
2 changes: 1 addition & 1 deletion src/libs/actions/BankAccounts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/styles/roundToNearestMultipleOfFour.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down