Conversation
|
Hey, I noticed you changed If you want to automatically generate translations for other locales, an Expensify employee will have to:
Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running: npx ts-node ./scripts/generateTranslations.ts --helpTypically, you'd want to translate only what you changed by running |
🦜 Polyglot Parrot! 🦜Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues: View the translation diffdiff --git a/src/languages/de.ts b/src/languages/de.ts
index 669d0c2fcce..ad1df38b10c 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -4623,7 +4623,7 @@ ${amount} für ${merchant} – ${date}`,
creditCardAccount: 'Kreditkartenkonto',
travelInvoicingDescription: 'Reisekosten werden als Kreditkartenbelastungen in das unten angegebene QuickBooks Online-Konto exportiert.',
companyCardsLocationEnabledDescription:
- 'QuickBooks Online unterstützt keine Standorte beim Export von Kreditorenrechnungen. Da in deinem Workspace Standorte aktiviert sind, ist diese Exportoption nicht verfügbar.',
+ 'QuickBooks Online unterstützt keine Standorte beim Export von Kreditorenrechnungen, wenn Standorte als Tags importiert werden. Da in Ihrem Workspace Standorte als Tags importiert sind, ist diese Exportoption nicht verfügbar.',
outOfPocketTaxEnabledDescription:
'QuickBooks Online unterstützt keine Steuern beim Export von Journalbuchungen. Da in Ihrem Workspace Steuern aktiviert sind, ist diese Exportoption nicht verfügbar.',
outOfPocketTaxEnabledError: 'Buchungssätze sind nicht verfügbar, wenn Steuern aktiviert sind. Bitte wähle eine andere Exportoption.',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index dcb9acaca32..af954883f40 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -4505,7 +4505,7 @@ ${amount} para ${merchant} - ${date}`,
creditCardAccount: 'Cuenta de la tarjeta de crédito',
travelInvoicingDescription: 'Los gastos de viaje se exportarán como cargos de tarjeta de crédito a la cuenta de QuickBooks Online especificada a continuación.',
companyCardsLocationEnabledDescription:
- 'QuickBooks Online no permite lugares en las exportaciones de facturas de proveedores. Como tienes activadas los lugares en tu espacio de trabajo, esta opción de exportación no está disponible.',
+ 'QuickBooks Online no admite ubicaciones en las exportaciones de facturas de proveedor cuando las ubicaciones se importan como etiquetas. Como tienes ubicaciones importadas como etiquetas en tu espacio de trabajo, esta opción de exportación no está disponible.',
exportOutOfPocketExpensesDescription: 'Establezca cómo se exportan los gastos de bolsillo a QuickBooks Online.',
exportCheckDescription: 'Crearemos un cheque desglosado para cada informe de Expensify y lo enviaremos desde la cuenta bancaria a continuación.',
exportJournalEntryDescription: 'Crearemos una entrada contable desglosada para cada informe de Expensify y lo contabilizaremos en la cuenta a continuación.',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index e149ae58a55..e370c6a5f4f 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -4635,7 +4635,7 @@ ${amount} pour ${merchant} - ${date}`,
creditCardAccount: 'Compte de carte de crédit',
travelInvoicingDescription: 'Les frais de voyage seront exportés comme des débits de carte de crédit vers le compte QuickBooks Online indiqué ci-dessous.',
companyCardsLocationEnabledDescription:
- 'QuickBooks Online ne prend pas en charge les emplacements pour l’exportation des factures fournisseur. Comme vous avez activé les emplacements sur votre espace de travail, cette option d’exportation n’est pas disponible.',
+ 'QuickBooks Online ne prend pas en charge les emplacements dans les exports de factures fournisseur lorsque les emplacements sont importés en tant que tags. Comme vous avez des emplacements importés en tant que tags dans votre espace de travail, cette option d’export n’est pas disponible.',
outOfPocketTaxEnabledDescription:
'QuickBooks Online ne prend pas en charge les taxes sur les exportations d’écritures comptables. Comme les taxes sont activées sur votre espace de travail, cette option d’exportation n’est pas disponible.',
outOfPocketTaxEnabledError: 'Les écritures comptables ne sont pas disponibles lorsque les taxes sont activées. Veuillez choisir une autre option d’export.',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index e059a3b4e03..8da465fb24e 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -4608,7 +4608,7 @@ ${amount} per ${merchant} - ${date}`,
creditCardAccount: 'Conto della carta di credito',
travelInvoicingDescription: 'Le spese di viaggio verranno esportate come addebiti su carta di credito nel conto QuickBooks Online specificato di seguito.',
companyCardsLocationEnabledDescription:
- 'QuickBooks Online non supporta le sedi nell’esportazione delle fatture fornitore. Poiché hai le sedi abilitate nel tuo spazio di lavoro, questa opzione di esportazione non è disponibile.',
+ 'QuickBooks Online non supporta le sedi nelle esportazioni di fatture fornitore quando le sedi sono importate come tag. Poiché nel tuo spazio di lavoro hai sedi importate come tag, questa opzione di esportazione non è disponibile.',
outOfPocketTaxEnabledDescription:
'QuickBooks Online non supporta le imposte nelle esportazioni delle registrazioni contabili. Poiché hai le imposte abilitate nel tuo spazio di lavoro, questa opzione di esportazione non è disponibile.',
outOfPocketTaxEnabledError: 'Le registrazioni contabili non sono disponibili quando le imposte sono abilitate. Scegli un’altra opzione di esportazione.',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 0baff8dc848..89d5bd38216 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -4573,7 +4573,7 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
creditCardAccount: 'クレジットカード口座',
travelInvoicingDescription: '旅費は、以下で指定した QuickBooks Online アカウントにクレジットカード請求としてエクスポートされます。',
companyCardsLocationEnabledDescription:
- 'QuickBooks Online は仕入先請求書のエクスポートでロケーションをサポートしていません。ワークスペースでロケーションが有効になっているため、このエクスポートオプションは使用できません。',
+ 'QuickBooks Online では、ロケーションをタグとして取り込んでいる場合、ベンダー請求書のエクスポートでロケーションをサポートしていません。現在このワークスペースではロケーションがタグとして取り込まれているため、このエクスポートオプションは利用できません。',
outOfPocketTaxEnabledDescription:
'QuickBooks Online は仕訳のエクスポートで税金に対応していません。ワークスペースで税金が有効になっているため、このエクスポートオプションは利用できません。',
outOfPocketTaxEnabledError: '税金が有効になっている場合、仕訳は利用できません。別のエクスポートオプションを選択してください。',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 8196a472d4b..2ba7eeb0a82 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -4601,7 +4601,7 @@ ${amount} voor ${merchant} - ${date}`,
creditCardAccount: 'Creditcardrekening',
travelInvoicingDescription: 'Reiskosten worden als creditcardkosten geëxporteerd naar het hieronder opgegeven QuickBooks Online-account.',
companyCardsLocationEnabledDescription:
- 'QuickBooks Online ondersteunt geen locaties bij het exporteren van leveranciersfacturen. Omdat je locaties hebt ingeschakeld in je workspace, is deze exportoptie niet beschikbaar.',
+ 'QuickBooks Online ondersteunt geen locaties op leveranciersfactuur-exporten wanneer locaties als tags worden geïmporteerd. Omdat je in je werkruimte locaties als tags hebt geïmporteerd, is deze exportoptie niet beschikbaar.',
outOfPocketTaxEnabledDescription:
'QuickBooks Online ondersteunt geen belastingen op exports van journaalboekingen. Omdat je belastingen hebt ingeschakeld in je workspace, is deze exportoptie niet beschikbaar.',
outOfPocketTaxEnabledError: 'Boekingen zijn niet beschikbaar wanneer belastingen zijn ingeschakeld. Kies een andere exportoptie.',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index cc826b8cf38..8d0c3c30d47 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -4593,7 +4593,7 @@ ${amount} dla ${merchant} - ${date}`,
creditCardAccount: 'Konto karty kredytowej',
travelInvoicingDescription: 'Wydatki na podróże zostaną wyeksportowane jako obciążenia karty kredytowej na konto QuickBooks Online wskazane poniżej.',
companyCardsLocationEnabledDescription:
- 'QuickBooks Online nie obsługuje lokalizacji w eksporcie rachunków do dostawców. Ponieważ masz włączone lokalizacje w swoim obszarze roboczym, ta opcja eksportu jest niedostępna.',
+ 'QuickBooks Online nie obsługuje lokalizacji w eksportach rachunków od dostawców, gdy lokalizacje są importowane jako tagi. Ponieważ w tym obszarze roboczym masz lokalizacje importowane jako tagi, ta opcja eksportu jest niedostępna.',
outOfPocketTaxEnabledDescription:
'QuickBooks Online nie obsługuje podatków przy eksporcie zapisów w dzienniku. Ponieważ masz włączone podatki w swoim obszarze roboczym, ta opcja eksportu jest niedostępna.',
outOfPocketTaxEnabledError: 'Zapisy w dzienniku są niedostępne, gdy podatki są włączone. Wybierz inną opcję eksportu.',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 3d0f44a7b62..ee8b389742c 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -4597,7 +4597,7 @@ ${amount} para ${merchant} - ${date}`,
creditCardAccount: 'Conta de cartão de crédito',
travelInvoicingDescription: 'As despesas de viagem serão exportadas como cobranças de cartão de crédito para a conta do QuickBooks Online especificada abaixo.',
companyCardsLocationEnabledDescription:
- 'O QuickBooks Online não oferece suporte a locais nas exportações de contas de fornecedor. Como você ativou locais no seu workspace, esta opção de exportação não está disponível.',
+ 'O QuickBooks Online não oferece suporte a locais em exportações de contas de fornecedor quando os locais são importados como tags. Como você tem locais importados como tags no seu workspace, essa opção de exportação não está disponível.',
outOfPocketTaxEnabledDescription:
'QuickBooks Online não oferece suporte a impostos em exportações de lançamentos contábeis. Como você tem impostos ativados no seu espaço de trabalho, essa opção de exportação não está disponível.',
outOfPocketTaxEnabledError: 'Lançamentos de diário não estão disponíveis quando os impostos estão ativados. Escolha uma opção de exportação diferente.',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 7c698d84584..11124407608 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -4489,7 +4489,7 @@ ${amount},商户:${merchant} - 日期:${date}`,
bankAccountDescription: '选择从哪里寄送支票。',
creditCardAccount: '信用卡账户',
travelInvoicingDescription: '差旅费用将作为信用卡费用导出到下面指定的 QuickBooks Online 账户。',
- companyCardsLocationEnabledDescription: 'QuickBooks Online 不支持在供应商账单导出中使用地点。由于您在工作区中启用了地点功能,该导出选项不可用。',
+ companyCardsLocationEnabledDescription: '当地点作为标签导入时,QuickBooks Online 不支持在供应商账单导出中使用地点。由于你的工作区中已将地点作为标签导入,因此此导出选项不可用。',
outOfPocketTaxEnabledDescription: 'QuickBooks Online 不支持在日记账分录导出中包含税费。由于你已在工作区中启用税费功能,因此无法使用此导出选项。',
outOfPocketTaxEnabledError: '启用税费时无法使用日记账分录。请选择其他导出选项。',
advancedConfig: {
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
|
All contributors have signed the CLA ✍️ ✅ |
|
I have read the CLA Document and I hereby sign the CLA |
|
@yichensunjoe Can you merge the main branch to trigger the workflows? |
|
@yichensunjoe Please correct the Tests section and Offline tests section of your checklist. |
|
Done. I updated the PR branch with the latest |
|
@yichensunjoe Your QA steps are still unclear. Why not use the steps from the OP instead? Please don't use AI to generate testing steps. Also, there's no need to include If there are no special changes required for the Tests and Offline Tests sections, you can simply write: |
|
Hi @Julesssss, I noticed that the GitHub workflows for this PR haven't started running yet. It looks like they require approval before they can run. Could you please approve them? |
|
Updated the PR description per your feedback: |
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppandroid.hybrid.mp4Android: mWeb Chromeandroid.chrome.mp4iOS: HybridAppios.hybrid.mp4iOS: mWeb Safariios.safari.mp4MacOS: Chrome / Safarimac.safari.mp4 |
|
@yichensunjoe Could you merge the latest main branch into this PR again? I noticed that the typecheck is failing in my local environment. Although it doesn't seem related to our changes, merging main again will help ensure the GitHub workflow is running against the latest codebase. |
|
App/contributingGuides/CONTRIBUTING.md Line 57 in 0019979 @yichensunjoe Please give this PR some extra attention since it's your first PR. |
Keep Vendor bill available when QBO locations are imported as report fields and hide it only when locations are imported as tags. Apply generated translations and add unit coverage for NONE, REPORT_FIELD, TAG, and missing config.
6a730d5 to
d2086ed
Compare
|
Thanks @dmkt9. I updated this PR against the latest While doing that, I also rebuilt the branch as a GitHub-verified commit because the previous local commits were causing |
dmkt9
left a comment
There was a problem hiding this comment.
The changes look good to me. I verified that the tests and typecheck pass locally.
| companyCardsLocationEnabledDescription: | ||
| "QuickBooks Online doesn't support locations on vendor bill exports. As you have locations enabled on your workspace, this export option is unavailable.", | ||
| "QuickBooks Online doesn't support locations on vendor bill exports when locations are imported as tags. As you have locations imported as tags on your workspace, this export option is unavailable.", |
There was a problem hiding this comment.
The string name is a bit unrelated now that we have changed it to tags. Something like this would be better: companyCardsLocationTagDescription
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
|
🚧 @Julesssss has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
🚀 Deployed to staging by https://github.com/Julesssss in version: 9.3.97-0 🚀
Bundle Size Analysis (Sentry): |
Help site review — changes requiredYes, this change requires a help site update. This PR makes the QuickBooks Online Vendor bill company card export option available when locations are imported as report fields (only hidden when locations are imported as tags). The article Draft help site PR: #92457 What it updates:
@yichensunjoe, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR |
|
🚀 Deployed to production by https://github.com/lakchote in version: 9.3.97-1 🚀
|
Explanation of Change
This updates the QuickBooks Online company card export destination picker so Vendor bill is only hidden when Locations are imported as tags (
syncLocations === TAG). Vendor bill remains available when Locations use report fields (REPORT_FIELD), matching the existing out-of-pocket picker behavior and the accepted proposal.The footer copy now describes the tag-specific restriction, and the shared QBO helper is covered with unit tests for missing config,
NONE,REPORT_FIELD, andTAG.Fixed Issues
$ #83788
PROPOSAL: #83788 (comment)
Tests
Same as QA steps.
Offline tests
Same as QA steps.
QA Steps
Precondition: Workspace is connected to QuickBooks Online.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
N/A. Logic-only settings option visibility change; QA steps above cover the visible behavior.