Fix spend rule currency deploy blockers#94207
Draft
JS00001 wants to merge 6 commits into
Draft
Conversation
Contributor
🦜 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 bc3747c7f54..0a7d6a1ae5f 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8180,6 +8180,8 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
composeOnCards: ({content, cards}: {content: string; cards: string}) => `${content} auf ${cards}`,
composeFromCards: ({content, cards}: {content: string; cards: string}) => `${content} von ${cards}`,
},
+ allowedCurrencyFilters: ({currencies}: {currencies: string}) => `Währungen ${currencies}`,
+ blockedCurrencyFilters: ({currencies}: {currencies: string}) => `Währungen nicht in ${currencies}`,
},
updatedCategoryTaxRate: ({categoryName, oldTax, newTax}: {categoryName: string; oldTax: string; newTax: string}) =>
`hat den Standardsteuersatz der Kategorie „${categoryName}“ auf „${newTax}“ geändert (zuvor „${oldTax}“)`,
@@ -9726,7 +9728,6 @@ Hier ist ein *Testbeleg*, um dir zu zeigen, wie es funktioniert:`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 173bf65cb93..e11b3b52de3 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -7651,6 +7651,8 @@ ${amount} para ${merchant} - ${date}`,
composeOnCards: ({content, cards}: {content: string; cards: string}) => `${content} en ${cards}`,
composeFromCards: ({content, cards}: {content: string; cards: string}) => `${content} de ${cards}`,
},
+ allowedCurrencyFilters: ({currencies}: {currencies: string}) => `monedas ${currencies}`,
+ blockedCurrencyFilters: ({currencies}: {currencies: string}) => `monedas que no están en ${currencies}`,
},
preventSelfApproval: (oldValue, newValue) =>
`actualizó "Evitar la autoaprobación" a "${newValue === 'true' ? 'Habilitada' : 'Deshabilitada'}" (previamente "${oldValue === 'true' ? 'Habilitada' : 'Deshabilitada'}")`,
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index d11270506d4..06147f926d6 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8214,6 +8214,8 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
composeOnCards: ({content, cards}: {content: string; cards: string}) => `${content} sur ${cards}`,
composeFromCards: ({content, cards}: {content: string; cards: string}) => `${content} de ${cards}`,
},
+ allowedCurrencyFilters: ({currencies}: {currencies: string}) => `devises ${currencies}`,
+ blockedCurrencyFilters: ({currencies}: {currencies: string}) => `devises ne figurant pas dans ${currencies}`,
},
updatedCategoryTaxRate: ({categoryName, oldTax, newTax}: {categoryName: string; oldTax: string; newTax: string}) =>
`a modifié le taux de taxe par défaut de la catégorie « ${categoryName} » en « ${newTax} » (auparavant « ${oldTax} »)`,
@@ -9758,7 +9760,6 @@ Voici un *reçu test* pour vous montrer comment ça fonctionne :`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index c810e1ed480..7cade37cf15 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8170,6 +8170,8 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
composeOnCards: ({content, cards}: {content: string; cards: string}) => `${content} su ${cards}`,
composeFromCards: ({content, cards}: {content: string; cards: string}) => `${content} da ${cards}`,
},
+ allowedCurrencyFilters: ({currencies}: {currencies: string}) => `valute ${currencies}`,
+ blockedCurrencyFilters: ({currencies}: {currencies: string}) => `valute non in ${currencies}`,
},
updatedCategoryTaxRate: ({categoryName, oldTax, newTax}: {categoryName: string; oldTax: string; newTax: string}) =>
`ha cambiato l’aliquota fiscale predefinita della categoria "${categoryName}" in "${newTax}" (in precedenza "${oldTax}")`,
@@ -9714,7 +9716,6 @@ Ecco una *ricevuta di prova* per mostrarti come funziona:`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index f3749ef6ba9..86cc5c34efe 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8071,6 +8071,8 @@ ${reportName}`,
composeOnCards: ({content, cards}: {content: string; cards: string}) => `${cards} 上の ${content}`,
composeFromCards: ({content, cards}: {content: string; cards: string}) => `${cards} からの ${content}`,
},
+ allowedCurrencyFilters: ({currencies}: {currencies: string}) => `通貨 ${currencies}`,
+ blockedCurrencyFilters: ({currencies}: {currencies: string}) => `${currencies} に含まれない通貨`,
},
updatedCategoryTaxRate: ({categoryName, oldTax, newTax}: {categoryName: string; oldTax: string; newTax: string}) =>
`「${categoryName}」カテゴリのデフォルト税率を「${newTax}」に変更しました（以前は「${oldTax}」）`,
@@ -9591,7 +9593,6 @@ ${reportName}`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 16407d9f6ac..e0f13bbfe0d 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8137,6 +8137,8 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
composeOnCards: ({content, cards}: {content: string; cards: string}) => `${content} op ${cards}`,
composeFromCards: ({content, cards}: {content: string; cards: string}) => `${content} van ${cards}`,
},
+ allowedCurrencyFilters: ({currencies}: {currencies: string}) => `valuta’s ${currencies}`,
+ blockedCurrencyFilters: ({currencies}: {currencies: string}) => `valuta’s die niet in ${currencies} staan`,
},
updatedCategoryTaxRate: ({categoryName, oldTax, newTax}: {categoryName: string; oldTax: string; newTax: string}) =>
`heeft het standaardbelastingtarief van de categorie "${categoryName}" gewijzigd naar "${newTax}" (voorheen "${oldTax}")`,
@@ -9680,7 +9682,6 @@ Hier is een *proefbon* om je te laten zien hoe het werkt:`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 31a534f28c8..07163c5fbaa 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8129,6 +8129,8 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
composeOnCards: ({content, cards}: {content: string; cards: string}) => `${content} na ${cards}`,
composeFromCards: ({content, cards}: {content: string; cards: string}) => `${content} z ${cards}`,
},
+ allowedCurrencyFilters: ({currencies}: {currencies: string}) => `waluty ${currencies}`,
+ blockedCurrencyFilters: ({currencies}: {currencies: string}) => `waluty inne niż ${currencies}`,
},
updatedCategoryTaxRate: ({categoryName, oldTax, newTax}: {categoryName: string; oldTax: string; newTax: string}) =>
`zmienił(a) domyślną stawkę podatku dla kategorii „${categoryName}” na „${newTax}” (wcześniej „${oldTax}”)`,
@@ -9665,7 +9667,6 @@ Oto *paragon testowy*, żeby pokazać Ci, jak to działa:`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 166a913104b..006a9e0d77f 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8127,6 +8127,8 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
composeOnCards: ({content, cards}: {content: string; cards: string}) => `${content} em ${cards}`,
composeFromCards: ({content, cards}: {content: string; cards: string}) => `${content} de ${cards}`,
},
+ allowedCurrencyFilters: ({currencies}: {currencies: string}) => `moedas ${currencies}`,
+ blockedCurrencyFilters: ({currencies}: {currencies: string}) => `moedas que não estão em ${currencies}`,
},
updatedCategoryTaxRate: ({categoryName, oldTax, newTax}: {categoryName: string; oldTax: string; newTax: string}) =>
`alterou a alíquota de imposto padrão da categoria "${categoryName}" para "${newTax}" (antes "${oldTax}")`,
@@ -9669,7 +9671,6 @@ Aqui está um *comprovante de teste* para mostrar como funciona:`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index c1eead6cbb9..4b4af4da024 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7911,6 +7911,8 @@ ${reportName}`,
composeOnCards: ({content, cards}: {content: string; cards: string}) => `${cards} 上的 ${content}`,
composeFromCards: ({content, cards}: {content: string; cards: string}) => `来自 ${cards} 的 ${content}`,
},
+ allowedCurrencyFilters: ({currencies}: {currencies: string}) => `货币 ${currencies}`,
+ blockedCurrencyFilters: ({currencies}: {currencies: string}) => `不在 ${currencies} 中的货币`,
},
updatedCategoryTaxRate: ({categoryName, oldTax, newTax}: {categoryName: string; oldTax: string; newTax: string}) =>
`将“${categoryName}”类别的默认税率更改为“${newTax}”（之前为“${oldTax}”）`,
@@ -9408,7 +9410,6 @@ ${reportName}`,
pdfFailedBody: 'Your file could not be generated. Try again, or reach out to Concierge for help.',
readyPartialBody: ({count, total}: {count: number; total: number}) =>
`${count} of ${total} reports exported. If it didn't automatically download, use the button below. See which reports failed in <concierge-link>Concierge</concierge-link>.`,
-
close: 'Close',
},
domain: {
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
Fixed Issues
$ #94116
$ #94092
$ #94078
$ #94091
Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)Avatar, 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.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari