Add spend rule base page#86684
Draft
luacmartins wants to merge 16 commits intocmartins-spendRuleSectionfrom
Draft
Add spend rule base page#86684luacmartins wants to merge 16 commits intocmartins-spendRuleSectionfrom
luacmartins wants to merge 16 commits intocmartins-spendRuleSectionfrom
Conversation
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
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 1c43c9ef..9e42c7a8 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6679,11 +6679,16 @@ Fordern Sie Spesendetails wie Belege und Beschreibungen an, legen Sie Limits und
title: 'Expensify Karten bieten integrierten Schutz – jederzeit',
description: `Expensify lehnt diese Belastungen immer ab:\n\n • Dienstleistungen für Erwachsene\n • Geldautomaten (ATMs)\n • Glücksspiel\n • Geldüberweisungen\n\nFügen Sie weitere Ausgabenregeln hinzu, um den Cashflow des Unternehmens zu schützen.`,
},
- addSpendRule: 'Ausgabenregel hinzufügen',
+ addSpendRule: 'Ausgaberegel hinzufügen',
cardPageTitle: 'Karte',
cardsSectionTitle: 'Karten',
chooseCards: 'Karten auswählen',
saveRule: 'Regel speichern',
+ allow: 'Zulassen',
+ spendRuleSectionTitle: 'Ausgabenregel',
+ restrictionType: 'Beschränkungstyp',
+ restrictionTypeHelpAllow: 'Ausgaben werden genehmigt, wenn sie mit einem Händler oder einer Kategorie übereinstimmen und einen Höchstbetrag nicht überschreiten.',
+ restrictionTypeHelpBlock: 'Ausgaben werden abgelehnt, wenn sie einem Händler oder einer Kategorie entsprechen oder einen Höchstbetrag überschreiten.',
},
},
planTypePage: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 4f9aacc2..0b8bdea9 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -6703,11 +6703,16 @@ Rendez obligatoires des informations de dépense comme les reçus et les descrip
title: 'Les Cartes Expensify offrent une protection intégrée – en permanence',
description: `Expensify refuse toujours ces types de dépenses:\n\n • Services pour adultes\n • DAB\n • Jeux d’argent\n • Transferts d’argent\n\nAjoutez davantage de règles de dépenses pour protéger la trésorerie de l’entreprise.`,
},
- addSpendRule: 'Ajouter une règle de dépenses',
+ addSpendRule: 'Ajouter une règle de dépense',
cardPageTitle: 'Carte',
cardsSectionTitle: 'Cartes',
chooseCards: 'Choisir des cartes',
saveRule: 'Enregistrer la règle',
+ allow: 'Autoriser',
+ spendRuleSectionTitle: 'Règle de dépense',
+ restrictionType: 'Type de restriction',
+ restrictionTypeHelpAllow: 'Les frais sont approuvés s’ils correspondent à un commerçant ou une catégorie, et ne dépassent pas un montant maximal.',
+ restrictionTypeHelpBlock: 'Les paiements sont refusés s’ils correspondent à un commerçant ou une catégorie, ou s’ils dépassent un montant maximal.',
},
},
planTypePage: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index a3fdb593..9096764a 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6669,8 +6669,13 @@ Richiedi dettagli sulle spese come ricevute e descrizioni, imposta limiti e valo
addSpendRule: 'Aggiungi regola di spesa',
cardPageTitle: 'Carta',
cardsSectionTitle: 'Carte',
- chooseCards: 'Scegli le carte',
+ chooseCards: 'Scegli carte',
saveRule: 'Salva regola',
+ allow: 'Consenti',
+ spendRuleSectionTitle: 'Regola di spesa',
+ restrictionType: 'Tipo di restrizione',
+ restrictionTypeHelpAllow: 'Gli addebiti vengono approvati se corrispondono a un qualsiasi esercente o categoria e non superano un importo massimo.',
+ restrictionTypeHelpBlock: 'Le spese vengono rifiutate se corrispondono a un qualsiasi esercente o categoria, o se superano un importo massimo.',
},
},
planTypePage: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index a0e9bf47..521507ce 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -6597,6 +6597,11 @@ ${reportName}
cardsSectionTitle: 'カード',
chooseCards: 'カードを選択',
saveRule: 'ルールを保存',
+ allow: '許可する',
+ spendRuleSectionTitle: '支出ルール',
+ restrictionType: '制限の種類',
+ restrictionTypeHelpAllow: '明細は、いずれかの加盟店またはカテゴリに一致し、かつ上限金額を超えない場合に承認されます。',
+ restrictionTypeHelpBlock: '加盟店またはカテゴリに一致するか、上限金額を超える支出は拒否されます。',
},
},
planTypePage: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 2b72a135..ca7c8168 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -6645,11 +6645,16 @@ Vereis onkostendetails zoals bonnen en beschrijvingen, stel limieten en standaar
title: 'Expensify Kaarten bieden altijd ingebouwde bescherming',
description: `Expensify wijst deze transacties altijd af:\n\n • Seksdiensten\n • Geldautomaten (ATM's)\n • Gokken\n • Geldoverschrijvingen\n\nVoeg meer bestedingsregels toe om de cashflow van je bedrijf te beschermen.`,
},
- addSpendRule: 'Bestedingsregel toevoegen',
+ addSpendRule: 'Uitgavenregel toevoegen',
cardPageTitle: 'Kaart',
cardsSectionTitle: 'Kaarten',
chooseCards: 'Kaarten kiezen',
saveRule: 'Regel opslaan',
+ allow: 'Toestaan',
+ spendRuleSectionTitle: 'Bestedingsregel',
+ restrictionType: 'Restrictietype',
+ restrictionTypeHelpAllow: 'Kosten worden goedgekeurd als ze overeenkomen met een handelaar of categorie en een maximumbedrag niet overschrijden.',
+ restrictionTypeHelpBlock: 'Transacties worden geweigerd als ze overeenkomen met een handelaar of categorie, of een maximumbedrag overschrijden.',
},
},
planTypePage: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 7dbfd09d..5d56fa94 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6640,11 +6640,16 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
title: 'Karty Expensify zapewniają wbudowaną ochronę – zawsze',
description: `Expensify zawsze odrzuca te obciążenia:\n\n • Usługi dla dorosłych\n • Bankomaty\n • Hazard\n • Przelewy pieniężne\n\nDodaj więcej zasad wydatków, żeby chronić przepływy pieniężne firmy.`,
},
- addSpendRule: 'Dodaj zasadę wydatków',
+ addSpendRule: 'Dodaj regułę wydatków',
cardPageTitle: 'Karta',
cardsSectionTitle: 'Karty',
chooseCards: 'Wybierz karty',
saveRule: 'Zapisz regułę',
+ allow: 'Zezwól',
+ spendRuleSectionTitle: 'Zasada wydatków',
+ restrictionType: 'Typ ograniczenia',
+ restrictionTypeHelpAllow: 'Opłaty są zatwierdzane, jeśli pasują do dowolnego sprzedawcy lub kategorii i nie przekraczają maksymalnej kwoty.',
+ restrictionTypeHelpBlock: 'Obciążenia są odrzucane, jeśli pasują do jakiegokolwiek sprzedawcy lub kategorii albo przekraczają maksymalną kwotę.',
},
},
planTypePage: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 3e668407..2b31ddfe 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -6644,11 +6644,16 @@ Exija dados de despesas como recibos e descrições, defina limites e padrões e
title: 'Os Cartões Expensify oferecem proteção integrada — sempre',
description: `A Expensify sempre recusa estas cobranças:\n\n • Serviços adultos\n • Caixas eletrônicos (ATMs)\n • Jogos de azar\n • Transferências de dinheiro\n\nAdicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
},
- addSpendRule: 'Adicionar regra de gastos',
+ addSpendRule: 'Adicionar regra de gasto',
cardPageTitle: 'Cartão',
cardsSectionTitle: 'Cartões',
chooseCards: 'Escolher cartões',
saveRule: 'Salvar regra',
+ allow: 'Permitir',
+ spendRuleSectionTitle: 'Regra de gasto',
+ restrictionType: 'Tipo de restrição',
+ restrictionTypeHelpAllow: 'As cobranças são aprovadas se corresponderem a qualquer comerciante ou categoria e não excederem um valor máximo.',
+ restrictionTypeHelpBlock: 'As cobranças são recusadas se corresponderem a qualquer comerciante ou categoria, ou excederem um valor máximo.',
},
},
planTypePage: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 57f861b2..17334c49 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6480,11 +6480,16 @@ ${reportName}
title: 'Expensify 卡提供始终内置的保护',
description: `Expensify 始终会拒绝以下消费：\n\n • 成人服务\n • 自动取款机（ATM）\n • 赌博\n • 转账汇款\n\n添加更多消费规则，保护公司的现金流。`,
},
- addSpendRule: '添加支出规则',
+ addSpendRule: '添加消费规则',
cardPageTitle: '卡',
- cardsSectionTitle: '卡',
- chooseCards: '选择卡',
+ cardsSectionTitle: '卡片',
+ chooseCards: '选择卡片',
saveRule: '保存规则',
+ allow: '允许',
+ spendRuleSectionTitle: '支出规则',
+ restrictionType: '限制类型',
+ restrictionTypeHelpAllow: '如果与任意商户或类别匹配且不超过最高金额，费用将被批准。',
+ restrictionTypeHelpBlock: '如果消费与任何商户或类别匹配，或超过最高限额，将被拒付。',
},
},
planTypePage: {
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
$ #86521
PROPOSAL:
Tests
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)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
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari