Repository navigation
[Payment due @daledah] [no qa] Add violation messages for the ruleViolation type - #103080
Merged
Merged
Conversation
Codecov Report❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.
|
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
JS00001
changed the title
ruleViolation type
JS00001
marked this pull request as ready for review
October 6, 2026 16:13
melvin-bot
Bot
requested review from
daledah and
trjExpensify
and removed request for
a team
October 6, 2026 16:13
JS00001
changed the title
ruleViolation typeruleViolation type
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
luacmartins
previously approved these changes
Oct 7, 2026
Contributor
|
reviewing it now |
daledah
reviewed
Oct 8, 2026
daledah
approved these changes
Oct 8, 2026
daledah
left a comment
daledah
left a comment
Contributor
There was a problem hiding this comment.
The code changes LGTM, with only one remaining minor comment.
melvin-bot
Bot
changed the title
ruleViolation typeruleViolation type
|
🎯 @daledah, thanks for reviewing and testing this PR! 🎉 A payment issue will be created for your review once this PR is deployed to production. If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created. |
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 fe45d4c9..38752e1c 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -10957,14 +10957,14 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
expense: (adjectives: string) => (adjectives ? `${adjectives} Ausgabe` : 'Ausgabe'),
perDiem: 'Tagespauschale',
notExpenseType: (expenseType: string) => `kein(e) ${expenseType}`,
- billable: {enabled: 'Abrechenbar', disabled: 'Nicht verrechenbar'},
+ billable: {enabled: 'Abrechenbar', disabled: 'Nicht fakturierbar'},
reimbursable: {enabled: 'Erstattungsfähig', disabled: 'Nicht erstattungsfähig'},
withoutCategory: 'ohne Kategorie',
fromMerchant: (merchant: string) => `von ${merchant}`,
notFromMerchant: (merchant: string) => `nicht von ${merchant}`,
fromMerchantsContaining: (merchant: string) => `von Händlern mit ${merchant}`,
- notFromMerchantsContaining: (merchant: string) => `nicht von Anbietern, die ${merchant} enthalten`,
- withVendor: (vendor: string) => `mit Händler ${vendor}`,
+ notFromMerchantsContaining: (merchant: string) => `nicht von Anbietern mit ${merchant}`,
+ withVendor: (vendor: string) => `mit Anbieter ${vendor}`,
withoutVendor: (vendor: string) => `ohne Anbieter ${vendor}`,
fromVendor: (vendor: string) => `von ${vendor}`,
notFromVendor: (vendor: string) => `nicht von ${vendor}`,
@@ -10973,7 +10973,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
underAmount: (amount: string) => `unter ${amount}`,
amountOrLess: (amount: string) => `${amount} oder weniger`,
withoutTag: 'ohne Tag',
- tagged: (tag: string) => `markiert mit ${tag}`,
+ tagged: (tag: string) => `mit Schlagwort ${tag} versehen`,
inCurrency: (currency: string) => `in ${currency}`,
notInCurrency: (currency: string) => `nicht in ${currency}`,
paidInCurrency: (currency: string) => `bezahlt in ${currency}`,
diff --git a/src/languages/el.ts b/src/languages/el.ts
index d41785ed..69586211 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -11169,10 +11169,10 @@ ${reportName}`,
ruleViolation: {
fallback: 'Παραβιάζει την πολιτική εξόδων',
anyExpense: 'Οποιαδήποτε δαπάνη',
- expense: (adjectives: string) => (adjectives ? `${adjectives} έξοδο` : 'Έξοδο'),
+ expense: (adjectives: string) => (adjectives ? `${adjectives} δαπάνη` : 'Δαπάνη'),
perDiem: 'ημερήσια αποζημίωση',
notExpenseType: (expenseType: string) => `όχι ${expenseType}`,
- billable: {enabled: 'Χρεώσιμο', disabled: 'Μη τιμολογήσιμα'},
+ billable: {enabled: 'Χρεώσιμο', disabled: 'Μη χρεώσιμη'},
reimbursable: {enabled: 'Επιστρέψιμο', disabled: 'Μη αποζημιώσιμο'},
withoutCategory: 'χωρίς κατηγορία',
fromMerchant: (merchant: string) => `από ${merchant}`,
@@ -11188,17 +11188,17 @@ ${reportName}`,
underAmount: (amount: string) => `κάτω από ${amount}`,
amountOrLess: (amount: string) => `${amount} ή λιγότερο`,
withoutTag: 'χωρίς ετικέτα',
- tagged: (tag: string) => `με ετικέτα ${tag}`,
+ tagged: (tag: string) => `επισημασμένο με ${tag}`,
inCurrency: (currency: string) => `σε ${currency}`,
notInCurrency: (currency: string) => `όχι σε ${currency}`,
paidInCurrency: (currency: string) => `πληρώθηκε σε ${currency}`,
- notPaidInCurrency: (currency: string) => `δεν έχουν πληρωθεί σε ${currency}`,
+ notPaidInCurrency: (currency: string) => `δεν πληρώθηκε σε ${currency}`,
attachment: 'ένα συνημμένο',
attribute: (attribute: string) => `ένα ${attribute}`,
withAttributes: (attributes: string) => `με ${attributes}`,
withoutAttributes: (attributes: string) => `χωρίς ${attributes}`,
merchantCode: (code: string) => `MCC ${code}`,
- atMerchantCode: (merchantCode: string) => `στον/στην ${merchantCode}`,
+ atMerchantCode: (merchantCode: string) => `στο ${merchantCode}`,
},
},
reportViolations: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 52b4ffbe..1d20d8c7 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -11153,31 +11153,31 @@ ${reportName}`,
fallback: 'Infringe la política de gastos',
anyExpense: 'Cualquier gasto',
expense: (adjectives: string) => (adjectives ? `gasto ${adjectives}` : 'Gasto'),
- perDiem: 'Per diem',
- notExpenseType: (expenseType: string) => `no es un(a) ${expenseType}`,
+ perDiem: 'per diem',
+ notExpenseType: (expenseType: string) => `no es un/una ${expenseType}`,
billable: {enabled: 'Facturable', disabled: 'No facturable'},
reimbursable: {enabled: 'Reembolsable', disabled: 'No reembolsable'},
withoutCategory: 'sin categoría',
fromMerchant: (merchant: string) => `de ${merchant}`,
- notFromMerchant: (merchant: string) => `no de ${merchant}`,
- fromMerchantsContaining: (merchant: string) => `de comerciantes que contengan ${merchant}`,
- notFromMerchantsContaining: (merchant: string) => `no de comercios que contengan ${merchant}`,
+ notFromMerchant: (merchant: string) => `no es de ${merchant}`,
+ fromMerchantsContaining: (merchant: string) => `de comerciantes que contienen ${merchant}`,
+ notFromMerchantsContaining: (merchant: string) => `que no sean de comercios que contengan ${merchant}`,
withVendor: (vendor: string) => `con el proveedor ${vendor}`,
withoutVendor: (vendor: string) => `sin proveedor ${vendor}`,
fromVendor: (vendor: string) => `de ${vendor}`,
- notFromVendor: (vendor: string) => `no es de ${vendor}`,
+ notFromVendor: (vendor: string) => `no de ${vendor}`,
overAmount: (amount: string) => `más de ${amount}`,
amountOrMore: (amount: string) => `${amount} o más`,
underAmount: (amount: string) => `menos de ${amount}`,
amountOrLess: (amount: string) => `${amount} o menos`,
- withoutTag: 'sin etiqueta',
+ withoutTag: 'sin una etiqueta',
tagged: (tag: string) => `etiquetado como ${tag}`,
inCurrency: (currency: string) => `en ${currency}`,
notInCurrency: (currency: string) => `no en ${currency}`,
paidInCurrency: (currency: string) => `pagado en ${currency}`,
notPaidInCurrency: (currency: string) => `no pagado en ${currency}`,
attachment: 'un archivo adjunto',
- attribute: (attribute: string) => `un/una ${attribute}`,
+ attribute: (attribute: string) => `un(a) ${attribute}`,
withAttributes: (attributes: string) => `con ${attributes}`,
withoutAttributes: (attributes: string) => `sin ${attributes}`,
merchantCode: (code: string) => `MCC ${code}`,
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index e9a4831f..39c2a00d 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -10975,23 +10975,23 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
taxRequired: 'Taux de taxe manquant',
},
ruleViolation: {
- fallback: 'Viole la politique de dépenses',
- anyExpense: "N'importe quelle dépense",
+ fallback: 'Enfreint la politique de dépenses',
+ anyExpense: 'Toute dépense',
expense: (adjectives: string) => (adjectives ? `Dépense ${adjectives}` : 'Dépense'),
perDiem: 'indemnité journalière',
- notExpenseType: (expenseType: string) => `pas une ${expenseType}`,
- billable: {enabled: 'Facturable', disabled: 'Non refacturable'},
+ notExpenseType: (expenseType: string) => `n’est pas une ${expenseType}`,
+ billable: {enabled: 'Facturable', disabled: 'Non facturable'},
reimbursable: {enabled: 'Remboursable', disabled: 'Non remboursable'},
withoutCategory: 'sans catégorie',
fromMerchant: (merchant: string) => `de la part de ${merchant}`,
notFromMerchant: (merchant: string) => `pas de ${merchant}`,
- fromMerchantsContaining: (merchant: string) => `des marchands contenant ${merchant}`,
- notFromMerchantsContaining: (merchant: string) => `ne provenant pas de marchands contenant ${merchant}`,
+ fromMerchantsContaining: (merchant: string) => `des commerçants contenant ${merchant}`,
+ notFromMerchantsContaining: (merchant: string) => `ne provenant pas de commerçants contenant ${merchant}`,
withVendor: (vendor: string) => `avec le fournisseur ${vendor}`,
withoutVendor: (vendor: string) => `sans fournisseur ${vendor}`,
fromVendor: (vendor: string) => `de ${vendor}`,
- notFromVendor: (vendor: string) => `pas de ${vendor}`,
- overAmount: (amount: string) => `plus de ${amount}`,
+ notFromVendor: (vendor: string) => `non provenant de ${vendor}`,
+ overAmount: (amount: string) => `au-delà de ${amount}`,
amountOrMore: (amount: string) => `${amount} ou plus`,
underAmount: (amount: string) => `inférieur à ${amount}`,
amountOrLess: (amount: string) => `${amount} ou moins`,
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 1908615c..96327c6b 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -10905,31 +10905,31 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
fallback: 'Viola la politica spese',
anyExpense: 'Qualsiasi spesa',
expense: (adjectives: string) => (adjectives ? `spesa ${adjectives}` : 'Spesa'),
- perDiem: 'indennità di trasferta',
- notExpenseType: (expenseType: string) => `non è un/una ${expenseType}`,
+ perDiem: 'diaria',
+ notExpenseType: (expenseType: string) => `non è un ${expenseType}`,
billable: {enabled: 'Fatturabile', disabled: 'Non fatturabile'},
reimbursable: {enabled: 'Rimborsabile', disabled: 'Non rimborsabile'},
withoutCategory: 'senza categoria',
fromMerchant: (merchant: string) => `da ${merchant}`,
notFromMerchant: (merchant: string) => `non di ${merchant}`,
fromMerchantsContaining: (merchant: string) => `da esercenti che contengono ${merchant}`,
- notFromMerchantsContaining: (merchant: string) => `non da esercenti che contengono ${merchant}`,
+ notFromMerchantsContaining: (merchant: string) => `non dai commercianti che contengono ${merchant}`,
withVendor: (vendor: string) => `con il fornitore ${vendor}`,
withoutVendor: (vendor: string) => `senza fornitore ${vendor}`,
fromVendor: (vendor: string) => `da ${vendor}`,
- notFromVendor: (vendor: string) => `non di ${vendor}`,
+ notFromVendor: (vendor: string) => `non da ${vendor}`,
overAmount: (amount: string) => `oltre ${amount}`,
amountOrMore: (amount: string) => `${amount} o più`,
- underAmount: (amount: string) => `meno di ${amount}`,
+ underAmount: (amount: string) => `inferiore a ${amount}`,
amountOrLess: (amount: string) => `${amount} o meno`,
withoutTag: 'senza un tag',
- tagged: (tag: string) => `contrassegnato con ${tag}`,
+ tagged: (tag: string) => `taggato ${tag}`,
inCurrency: (currency: string) => `in ${currency}`,
notInCurrency: (currency: string) => `non in ${currency}`,
paidInCurrency: (currency: string) => `pagato in ${currency}`,
notPaidInCurrency: (currency: string) => `non pagato in ${currency}`,
attachment: 'un allegato',
- attribute: (attribute: string) => `un*${attribute}*`,
+ attribute: (attribute: string) => `a ${attribute}`,
withAttributes: (attributes: string) => `con ${attributes}`,
withoutAttributes: (attributes: string) => `senza ${attributes}`,
merchantCode: (code: string) => `MCC ${code}`,
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 7114b608..f863e0ed 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -10748,33 +10748,33 @@ ${reportName}`,
expense: (adjectives: string) => (adjectives ? `${adjectives}経費` : '経費'),
perDiem: '日当',
notExpenseType: (expenseType: string) => `${expenseType}ではありません`,
- billable: {enabled: '請求対象', disabled: '請求不可'},
+ billable: {enabled: '請求可能', disabled: '請求対象外'},
reimbursable: {enabled: '精算対象', disabled: '精算対象外'},
withoutCategory: 'カテゴリなし',
fromMerchant: (merchant: string) => `${merchant} から`,
- notFromMerchant: (merchant: string) => `${merchant} 以外`,
- fromMerchantsContaining: (merchant: string) => `${merchant} を含む加盟店から`,
- notFromMerchantsContaining: (merchant: string) => `${merchant} を含まない加盟店からのもの`,
- withVendor: (vendor: string) => `仕入先 ${vendor} と`,
- withoutVendor: (vendor: string) => `ベンダー ${vendor} なし`,
+ notFromMerchant: (merchant: string) => `${merchant} からのものではありません`,
+ fromMerchantsContaining: (merchant: string) => `${merchant} を含む店舗から`,
+ notFromMerchantsContaining: (merchant: string) => `${merchant} を含まない加盟店から`,
+ withVendor: (vendor: string) => `取引先 ${vendor} に対して`,
+ withoutVendor: (vendor: string) => `仕入先 ${vendor} なし`,
fromVendor: (vendor: string) => `${vendor} から`,
- notFromVendor: (vendor: string) => `${vendor} 以外`,
- overAmount: (amount: string) => `${amount} を超える`,
+ notFromVendor: (vendor: string) => `${vendor} からのものではありません`,
+ overAmount: (amount: string) => `${amount} を超過`,
amountOrMore: (amount: string) => `${amount} 以上`,
underAmount: (amount: string) => `${amount} 未満`,
amountOrLess: (amount: string) => `${amount} 以下`,
withoutTag: 'タグなし',
- tagged: (tag: string) => `${tag} をタグ付けしました`,
+ tagged: (tag: string) => `タグ: ${tag}`,
inCurrency: (currency: string) => `${currency}建て`,
- notInCurrency: (currency: string) => `${currency} 以外`,
- paidInCurrency: (currency: string) => `${currency} で支払済み`,
+ notInCurrency: (currency: string) => `${currency}以外`,
+ paidInCurrency: (currency: string) => `${currency}で支払いました`,
notPaidInCurrency: (currency: string) => `${currency}で未払い`,
attachment: '添付ファイル',
- attribute: (attribute: string) => `${attribute} を 1 つ`,
- withAttributes: (attributes: string) => `${attributes} 付き`,
+ attribute: (attribute: string) => `${attribute} を追加`,
+ withAttributes: (attributes: string) => `${attributes} を使用`,
withoutAttributes: (attributes: string) => `${attributes} なし`,
merchantCode: (code: string) => `MCC ${code}`,
- atMerchantCode: (merchantCode: string) => `${merchantCode} にて`,
+ atMerchantCode: (merchantCode: string) => `${merchantCode} で`,
},
},
reportViolations: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index d75e103e..ccadffa0 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -10870,7 +10870,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
taxRequired: 'Ontbrekend belastingtarief',
},
ruleViolation: {
- fallback: 'Schendt onkostenbeleid',
+ fallback: 'Schendt declaratiebeleid',
anyExpense: 'Elke uitgave',
expense: (adjectives: string) => (adjectives ? `${adjectives} uitgave` : 'Uitgave'),
perDiem: 'dagvergoeding',
@@ -10880,18 +10880,18 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
withoutCategory: 'zonder categorie',
fromMerchant: (merchant: string) => `van ${merchant}`,
notFromMerchant: (merchant: string) => `niet van ${merchant}`,
- fromMerchantsContaining: (merchant: string) => `van handelaren met ${merchant}`,
+ fromMerchantsContaining: (merchant: string) => `van verkopers die ${merchant} bevatten`,
notFromMerchantsContaining: (merchant: string) => `niet van handelaren met ${merchant}`,
withVendor: (vendor: string) => `met leverancier ${vendor}`,
withoutVendor: (vendor: string) => `zonder leverancier ${vendor}`,
fromVendor: (vendor: string) => `van ${vendor}`,
notFromVendor: (vendor: string) => `niet van ${vendor}`,
- overAmount: (amount: string) => `boven ${amount}`,
+ overAmount: (amount: string) => `over ${amount}`,
amountOrMore: (amount: string) => `${amount} of meer`,
underAmount: (amount: string) => `onder ${amount}`,
amountOrLess: (amount: string) => `${amount} of minder`,
- withoutTag: 'zonder een label',
- tagged: (tag: string) => `gelabeld met ${tag}`,
+ withoutTag: 'zonder tag',
+ tagged: (tag: string) => `getagd met ${tag}`,
inCurrency: (currency: string) => `in ${currency}`,
notInCurrency: (currency: string) => `niet in ${currency}`,
paidInCurrency: (currency: string) => `betaald in ${currency}`,
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 6566124a..46dfd5aa 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -10883,8 +10883,8 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
expense: (adjectives: string) => (adjectives ? `${adjectives} wydatek` : 'Wydatek'),
perDiem: 'ryczałt dzienny',
notExpenseType: (expenseType: string) => `nie jest typem ${expenseType}`,
- billable: {enabled: 'Do refakturowania', disabled: 'Niefakturowalne'},
- reimbursable: {enabled: 'Podlegające zwrotowi', disabled: 'Nierefundowane'},
+ billable: {enabled: 'Do refakturowania', disabled: 'Niefakturowane'},
+ reimbursable: {enabled: 'Podlegające zwrotowi', disabled: 'Niezwracane'},
withoutCategory: 'bez kategorii',
fromMerchant: (merchant: string) => `od ${merchant}`,
notFromMerchant: (merchant: string) => `nie od ${merchant}`,
@@ -10902,11 +10902,11 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
tagged: (tag: string) => `oznaczono tagiem ${tag}`,
inCurrency: (currency: string) => `w ${currency}`,
notInCurrency: (currency: string) => `nie w ${currency}`,
- paidInCurrency: (currency: string) => `zapłacone w ${currency}`,
+ paidInCurrency: (currency: string) => `zapłacono w ${currency}`,
notPaidInCurrency: (currency: string) => `niezapłacone w ${currency}`,
attachment: 'załącznik',
attribute: (attribute: string) => `${attribute}`,
- withAttributes: (attributes: string) => `z atrybutami ${attributes}`,
+ withAttributes: (attributes: string) => `z ${attributes}`,
withoutAttributes: (attributes: string) => `bez ${attributes}`,
merchantCode: (code: string) => `MCC ${code}`,
atMerchantCode: (merchantCode: string) => `u ${merchantCode}`,
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 5ea9fadd..5753386a 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -10873,21 +10873,21 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
reimbursable: {enabled: 'Reembolsável', disabled: 'Não reembolsável'},
withoutCategory: 'sem categoria',
fromMerchant: (merchant: string) => `de ${merchant}`,
- notFromMerchant: (merchant: string) => `não de ${merchant}`,
- fromMerchantsContaining: (merchant: string) => `de estabelecimentos que contêm ${merchant}`,
- notFromMerchantsContaining: (merchant: string) => `não de estabelecimentos que contenham ${merchant}`,
+ notFromMerchant: (merchant: string) => `não é de ${merchant}`,
+ fromMerchantsContaining: (merchant: string) => `de estabelecimentos que contenham ${merchant}`,
+ notFromMerchantsContaining: (merchant: string) => `que não sejam de comerciantes contendo ${merchant}`,
withVendor: (vendor: string) => `com o fornecedor ${vendor}`,
withoutVendor: (vendor: string) => `sem fornecedor ${vendor}`,
fromVendor: (vendor: string) => `de ${vendor}`,
notFromVendor: (vendor: string) => `não é de ${vendor}`,
- overAmount: (amount: string) => `mais de ${amount}`,
+ overAmount: (amount: string) => `acima de ${amount}`,
amountOrMore: (amount: string) => `${amount} ou mais`,
underAmount: (amount: string) => `abaixo de ${amount}`,
amountOrLess: (amount: string) => `${amount} ou menos`,
withoutTag: 'sem uma tag',
- tagged: (tag: string) => `marcado como ${tag}`,
+ tagged: (tag: string) => `marcado com ${tag}`,
inCurrency: (currency: string) => `em ${currency}`,
- notInCurrency: (currency: string) => `não em ${currency}`,
+ notInCurrency: (currency: string) => `não está em ${currency}`,
paidInCurrency: (currency: string) => `pago em ${currency}`,
notPaidInCurrency: (currency: string) => `não pago em ${currency}`,
attachment: 'um anexo',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 21bc8c5d..534b8cf6 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -10466,31 +10466,31 @@ ${reportName}`,
anyExpense: '任何报销费用',
expense: (adjectives: string) => (adjectives ? `${adjectives} 报销费用` : '报销费用'),
perDiem: '每日津贴',
- notExpenseType: (expenseType: string) => `不是 ${expenseType}`,
+ notExpenseType: (expenseType: string) => `不是${expenseType}`,
billable: {enabled: '可计费', disabled: '不可计费'},
reimbursable: {enabled: '可报销', disabled: '不可报销'},
withoutCategory: '无类别',
fromMerchant: (merchant: string) => `来自 ${merchant}`,
notFromMerchant: (merchant: string) => `非来自 ${merchant}`,
- fromMerchantsContaining: (merchant: string) => `来自包含 ${merchant} 的商家`,
- notFromMerchantsContaining: (merchant: string) => `不来自包含 ${merchant} 的商家`,
- withVendor: (vendor: string) => `与商家 ${vendor}`,
+ fromMerchantsContaining: (merchant: string) => `来自包含「${merchant}」的商家`,
+ notFromMerchantsContaining: (merchant: string) => `商家名称不包含 ${merchant}`,
+ withVendor: (vendor: string) => `与供应商 ${vendor}`,
withoutVendor: (vendor: string) => `无供应商 ${vendor}`,
fromVendor: (vendor: string) => `来自 ${vendor}`,
notFromVendor: (vendor: string) => `非来自 ${vendor}`,
overAmount: (amount: string) => `超过 ${amount}`,
- amountOrMore: (amount: string) => `${amount} 或更多`,
+ amountOrMore: (amount: string) => `${amount} 或以上`,
underAmount: (amount: string) => `低于 ${amount}`,
- amountOrLess: (amount: string) => `${amount} 或以下`,
+ amountOrLess: (amount: string) => `${amount} 或更少`,
withoutTag: '没有标签',
- tagged: (tag: string) => `已添加标签 ${tag}`,
- inCurrency: (currency: string) => `以 ${currency} 计`,
- notInCurrency: (currency: string) => `不是以 ${currency} 为单位`,
+ tagged: (tag: string) => `已标记为 ${tag}`,
+ inCurrency: (currency: string) => `以${currency}计`,
+ notInCurrency: (currency: string) => `不是以 ${currency} 计价`,
paidInCurrency: (currency: string) => `以 ${currency} 支付`,
notPaidInCurrency: (currency: string) => `未以 ${currency} 支付`,
attachment: '一个附件',
attribute: (attribute: string) => `一个 ${attribute}`,
- withAttributes: (attributes: string) => `带有 ${attributes}`,
+ withAttributes: (attributes: string) => `包含 ${attributes}`,
withoutAttributes: (attributes: string) => `不含 ${attributes}`,
merchantCode: (code: string) => `MCC ${code}`,
atMerchantCode: (merchantCode: string) => `在 ${merchantCode}`,
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
Contributor
Author
|
@daledah looks like the reviewer checklist is incomplete |
luacmartins
approved these changes
Oct 8, 2026
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safari |
Contributor
|
@JS00001 i added the reviewer checklist |
Contributor
Author
|
ty! |
Contributor
|
🚧 JS00001 has triggered a test Expensify/App build. You can view the workflow run here. |
Contributor
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
Contributor
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
90 tasks done
Contributor
|
🚀 Deployed to staging by https://github.com/JS00001 in version: 9.5.6-0 🚀
|
Contributor
|
No help site update is needed: this PR only adds the localized message text for the new |
Contributor
|
🚀 Deployed to production by https://github.com/puneetlath in version: 9.5.6-6 🚀
Bundle Size Analysis (Sentry): |
|
🤖 Payment issue created: #103659 |
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
6 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
Adds support for the
rulesViolationviolation and builds the message on the FE (localized) matching https://github.com/Expensify/Auth/blob/c05949221e0de370adbfbdba3afd60a325feceae/auth/lib/Violations.cpp#L2233This violation will not show up on the UI yet, so there is no UI to test. This will come in future PRs
Fixed Issues
$ https://github.com/Expensify/Expensify/issues/682794
Tests
N/A
Offline tests
N/A
QA Steps
N/A
PR Author Checklist
### Fixed Issuessection aboveTestssectionQA stepssectiontoggleReportand notonIconClick).Avatar, I verified the components usingAvatarhave been tested & I retested again)/** comment above it */thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor)thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)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: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari