From 67bea0e7d70dff8bde39bab8db2421b90d966071 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 12 Apr 2023 14:10:16 +0700 Subject: [PATCH 1/6] fix: inconsistent capitalization in product --- src/languages/en.js | 4 ++-- src/libs/ReportUtils.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 8bc794e41955..7014d3047e59 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -193,7 +193,7 @@ export default { nameEmailOrPhoneNumber: 'Name, email, or phone number', }, videoChatButtonAndMenu: { - tooltip: 'Start a Call', + tooltip: 'Start a call', zoom: 'Zoom', googleMeet: 'Google Meet', }, @@ -508,7 +508,7 @@ export default { paymentMethodsTitle: 'Payment methods', setDefaultConfirmation: 'Make default payment method', setDefaultSuccess: 'Default payment method set!', - deleteAccount: 'Delete Account', + deleteAccount: 'Delete account', deleteConfirmation: 'Are you sure that you want to delete this account?', deletePayPalSuccess: 'PayPal.me successfully deleted', error: { diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index 954f248840aa..cdc67f1c5a9a 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -931,7 +931,7 @@ function buildOptimisticAddCommentReportAction(text, file) { const commentText = getParsedComment(text); const isAttachment = _.isEmpty(text) && file !== undefined; const attachmentInfo = isAttachment ? file : {}; - const htmlForNewComment = isAttachment ? 'Uploading Attachment...' : commentText; + const htmlForNewComment = isAttachment ? 'Uploading attachment...' : commentText; // Remove HTML from text when applying optimistic offline comment const textForNewComment = isAttachment ? CONST.ATTACHMENT_MESSAGE_TEXT From bf78b79291eb1bdc8a2fad0c42f0d45c4b437155 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 13 Apr 2023 11:01:35 +0700 Subject: [PATCH 2/6] fix more inconsistent capitalization in product --- src/languages/en.js | 8 ++++---- src/languages/es.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 7014d3047e59..4eaf6ee1668f 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -115,7 +115,7 @@ export default { bankAccount: 'Bank account', join: 'Join', decline: 'Decline', - transferBalance: 'Transfer Balance', + transferBalance: 'Transfer balance', cantFindAddress: 'Can\'t find your address? ', enterManually: 'Enter it manually', message: 'Message ', @@ -439,7 +439,7 @@ export default { versionLetter: 'v', readTheTermsAndPrivacy: { phrase1: 'Read the', - phrase2: 'terms of service', + phrase2: 'Terms of Service', phrase3: 'and', phrase4: 'privacy', }, @@ -533,7 +533,7 @@ export default { failedTransfer: 'Your balance isn’t fully settled. Please transfer to a bank account.', }, chooseTransferAccountPage: { - chooseAccount: 'Choose Account', + chooseAccount: 'Choose account', }, paymentMethodList: { addPaymentMethod: 'Add payment method', @@ -587,7 +587,7 @@ export default { }, termsOfUse: { phrase1: 'By logging in, you agree to the', - phrase2: 'terms of service', + phrase2: 'Terms of Service', phrase3: 'and', phrase4: 'privacy', phrase5: 'Money transmission is provided by Expensify Payments LLC (NMLS ID:2017010) pursuant to its', diff --git a/src/languages/es.js b/src/languages/es.js index ea4bb1fc7a76..f48b217d0984 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -438,7 +438,7 @@ export default { versionLetter: 'v', readTheTermsAndPrivacy: { phrase1: 'Leer los', - phrase2: 'términos de servicio', + phrase2: 'Términos de Servicio', phrase3: 'y', phrase4: 'privacidad', }, @@ -586,7 +586,7 @@ export default { }, termsOfUse: { phrase1: 'Al iniciar sesión, estás accediendo a los', - phrase2: 'términos de servicio', + phrase2: 'Términos de Servicio', phrase3: 'y', phrase4: 'privacidad', phrase5: 'El envío de dinero es brindado por Expensify Payments LLC (NMLS ID:2017010) de conformidad con sus', From 056540c76fb339b706c80c7748aa674c4da5c7a6 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 13 Apr 2023 17:20:40 +0700 Subject: [PATCH 3/6] fix inconsistent capitalization of acceptTerms text in Spanish language --- src/languages/es.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/languages/es.js b/src/languages/es.js index f48b217d0984..3c985cc63db1 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -90,9 +90,15 @@ export default { conjunctionAt: 'a', genericErrorMessage: 'Ups... algo no ha ido bien y la acción no se ha podido completar. Por favor, inténtalo más tarde.', error: { +<<<<<<< HEAD invalidAmount: 'Importe no válido', acceptTerms: 'Debes aceptar los Términos de servicio para continuar', phoneNumber: `Introduce un teléfono válido, incluyendo el código del país (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER})`, +======= + invalidAmount: 'Monto no válido', + acceptTerms: 'Debes aceptar los Términos de Servicio para continuar', + phoneNumber: `Ingresa un teléfono válido, incluyendo el código de país (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER})`, +>>>>>>> fix inconsistent capitalization of acceptTerms text in Spanish language fieldRequired: 'Este campo es obligatorio.', characterLimit: ({limit}) => `Supera el límite de ${limit} caracteres`, dateInvalid: 'Introduce una fecha válida', From a007c2c571ac2b421a9989bf69090fdf42ca3ddc Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 13 Apr 2023 23:53:33 +0700 Subject: [PATCH 4/6] resolve conflict --- src/languages/es.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/languages/es.js b/src/languages/es.js index 3c985cc63db1..562f37e47f46 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -90,15 +90,9 @@ export default { conjunctionAt: 'a', genericErrorMessage: 'Ups... algo no ha ido bien y la acción no se ha podido completar. Por favor, inténtalo más tarde.', error: { -<<<<<<< HEAD invalidAmount: 'Importe no válido', - acceptTerms: 'Debes aceptar los Términos de servicio para continuar', - phoneNumber: `Introduce un teléfono válido, incluyendo el código del país (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER})`, -======= - invalidAmount: 'Monto no válido', acceptTerms: 'Debes aceptar los Términos de Servicio para continuar', - phoneNumber: `Ingresa un teléfono válido, incluyendo el código de país (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER})`, ->>>>>>> fix inconsistent capitalization of acceptTerms text in Spanish language + phoneNumber: `Introduce un teléfono válido, incluyendo el código del país (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER})`, fieldRequired: 'Este campo es obligatorio.', characterLimit: ({limit}) => `Supera el límite de ${limit} caracteres`, dateInvalid: 'Introduce una fecha válida', From 43b6d8362e22be7a9980ed6aab3003837a22d623 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 19 Apr 2023 11:20:18 +0700 Subject: [PATCH 5/6] fix inconsistent capitalization in error of add bank account form --- src/languages/en.js | 20 ++++++++++---------- src/languages/es.js | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 4eaf6ee1668f..1de83e228282 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -441,7 +441,7 @@ export default { phrase1: 'Read the', phrase2: 'Terms of Service', phrase3: 'and', - phrase4: 'privacy', + phrase4: 'Privacy', }, help: 'Help', }, @@ -521,11 +521,11 @@ export default { }, transferAmountPage: { transfer: ({amount}) => `Transfer${amount ? ` ${amount}` : ''}`, - instant: 'Instant (Debit Card)', + instant: 'Instant (Debit card)', instantSummary: ({rate, minAmount}) => `${rate}% fee (${minAmount} minimum)`, - ach: '1-3 Business Days (Bank Account)', + ach: '1-3 Business days (Bank account)', achSummary: 'No fee', - whichAccount: 'Which Account?', + whichAccount: 'Which account?', fee: 'Fee', transferSuccess: 'Transfer successful!', transferDetailBankAccount: 'Your money should arrive in the next 1-3 business days.', @@ -589,7 +589,7 @@ export default { phrase1: 'By logging in, you agree to the', phrase2: 'Terms of Service', phrase3: 'and', - phrase4: 'privacy', + phrase4: 'Privacy', phrase5: 'Money transmission is provided by Expensify Payments LLC (NMLS ID:2017010) pursuant to its', phrase6: 'licenses', }, @@ -708,21 +708,21 @@ export default { error: { noBankAccountAvailable: 'Sorry, no bank account is available', noBankAccountSelected: 'Please choose an account', - taxID: 'Please enter a valid Tax ID Number', + taxID: 'Please enter a valid tax ID number', website: 'Please enter a valid website', zipCode: 'Please enter a valid zip code', phoneNumber: 'Please enter a valid phone number', companyName: 'Please enter a valid legal business name', addressCity: 'Please enter a valid city', - addressStreet: 'Please enter a valid street address that is not a PO Box', + addressStreet: 'Please enter a valid street address that is not a PO box', addressState: 'Please select a valid state', incorporationDateFuture: 'Incorporation date cannot be in the future', incorporationState: 'Please enter a valid state', industryCode: 'Please enter a valid industry classification code. Must be 6 digits.', restrictedBusiness: 'Please confirm company is not on the list of restricted businesses', - routingNumber: 'Please enter a valid Routing Number', - accountNumber: 'Please enter a valid Account Number', - companyType: 'Please enter a valid Company Type', + routingNumber: 'Please enter a valid routing number', + accountNumber: 'Please enter a valid account number', + companyType: 'Please enter a valid company type', tooManyAttempts: 'Due to a high number of login attempts, this option has been temporarily disabled for 24 hours. Please try again later or manually enter details instead.', address: 'Please enter a valid address', dob: 'Please enter a valid date of birth', diff --git a/src/languages/es.js b/src/languages/es.js index 562f37e47f46..0e90e8c4bb38 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -440,7 +440,7 @@ export default { phrase1: 'Leer los', phrase2: 'Términos de Servicio', phrase3: 'y', - phrase4: 'privacidad', + phrase4: 'Privacidad', }, help: 'Ayuda', }, @@ -588,7 +588,7 @@ export default { phrase1: 'Al iniciar sesión, estás accediendo a los', phrase2: 'Términos de Servicio', phrase3: 'y', - phrase4: 'privacidad', + phrase4: 'Privacidad', phrase5: 'El envío de dinero es brindado por Expensify Payments LLC (NMLS ID:2017010) de conformidad con sus', phrase6: 'licencias', }, From c1369d9071283727e27353af774260aa33db485a Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Fri, 21 Apr 2023 10:07:09 +0700 Subject: [PATCH 6/6] fix inconsistent capitalization in incorporationTypes --- src/languages/en.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/en.js b/src/languages/en.js index 7ef33d44b78f..fcd6c0ad0eaa 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -900,7 +900,7 @@ export default { CORPORATION: 'Corp', PARTNERSHIP: 'Partnership', COOPERATIVE: 'Cooperative', - SOLE_PROPRIETORSHIP: 'Sole Proprietorship', + SOLE_PROPRIETORSHIP: 'Sole proprietorship', OTHER: 'Other', }, },