Fix copy#87821
Merged
Merged
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 604e93aa..7f1c0575 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6884,7 +6884,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
categories: 'Kategorien',
merchants: 'Händler',
noAvailableCards: 'Alle Karten haben bereits eine Regel',
- noAvailableCardsSubtitle: 'Bearbeiten Sie eine bestehende Kartenregel, um Änderungen vorzunehmen',
+ noAvailableCardsSubtitle: 'Bearbeiten Sie eine vorhandene Kartenregel, um Änderungen vorzunehmen',
max: 'Max',
categoryOptions: {
[CONST.SPEND_RULES.CATEGORIES.AIRLINES]: 'Fluggesellschaften',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 1addc86f..c28b5588 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -6906,7 +6906,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
categories: 'Catégories',
merchants: 'Commerçants',
noAvailableCards: 'Toutes les cartes ont déjà une règle',
- noAvailableCardsSubtitle: 'Modifier une règle de carte existante pour effectuer des changements',
+ noAvailableCardsSubtitle: 'Modifier une règle de carte existante pour apporter des changements',
max: 'Max',
categoryOptions: {
[CONST.SPEND_RULES.CATEGORIES.AIRLINES]: 'Compagnies aériennes',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index d2cd959c..625312cd 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6869,7 +6869,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
categories: 'Categorie',
merchants: 'Esercenti',
noAvailableCards: 'Tutte le carte hanno già una regola',
- noAvailableCardsSubtitle: 'Modifica una regola della carta esistente per apportare modifiche',
+ noAvailableCardsSubtitle: 'Modifica una regola carta esistente per apportare modifiche',
max: 'Massimo',
categoryOptions: {
[CONST.SPEND_RULES.CATEGORIES.AIRLINES]: 'Compagnie aeree',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index b50917b3..51f79742 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -5224,7 +5224,7 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
chooseCard: 'カードを選択',
chooseCardFor: (assignee: string) =>
`<strong>${assignee}</strong> に割り当てるカードを選択してください。お探しのカードが見つかりませんか？<concierge-link>お知らせください。</concierge-link>`,
- noActiveCards: 'このフィードには有効なカードがありません',
+ noActiveCards: 'このフィードに有効なカードはありません',
somethingMightBeBroken:
'<muted-text><centered-text>もしくは不具合が発生している可能性があります。いずれにせよ、ご不明な点があれば、<concierge-link>Concierge にお問い合わせください</concierge-link>。</centered-text></muted-text>',
chooseTransactionStartDate: '取引の開始日を選択',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 3bec372d..50fe6cd3 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -5257,7 +5257,7 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
chooseCard: 'Escolha um cartão',
chooseCardFor: (assignee: string) =>
`Escolha um cartão para <strong>${assignee}</strong>. Não encontra o cartão que está procurando? <concierge-link>Conte para a gente.</concierge-link>`,
- noActiveCards: 'Nenhum cartão ativo neste feed',
+ noActiveCards: 'Não há cartões ativos neste feed',
somethingMightBeBroken:
'<muted-text><centered-text>Ou talvez algo esteja com problema. De qualquer forma, se tiver alguma dúvida, é só <concierge-link>entrar em contato com a Concierge</concierge-link>.</centered-text></muted-text>',
chooseTransactionStartDate: 'Escolha uma data de início da transação',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 4d88661d..b19317e0 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -5131,7 +5131,7 @@ _如需更详细的说明，请[访问我们的帮助网站](${CONST.NETSUITE_IM
chooseTheCardholder: '选择持卡人',
chooseCard: '选择一张卡片',
chooseCardFor: (assignee: string) => `为 <strong>${assignee}</strong> 选择一张卡片。找不到需要的卡片？<concierge-link>告诉我们。</concierge-link>`,
- noActiveCards: '此订阅源中没有可用的卡片',
+ noActiveCards: '此信息源中没有活动卡片',
somethingMightBeBroken:
'<muted-text><centered-text>或者可能出了点问题。不管怎样，如果你有任何疑问，请<concierge-link>联系 Concierge</concierge-link>。</centered-text></muted-text>',
chooseTransactionStartDate: '选择交易开始日期',
@@ -6668,8 +6668,8 @@ ${reportName}
confirmErrorApplyAtLeastOneSpendRule: '至少应用一条支出规则',
categories: '类别',
merchants: '商家',
- noAvailableCards: '所有卡片都已有规则',
- noAvailableCardsSubtitle: '编辑现有卡规则以进行更改',
+ noAvailableCards: '所有卡片已具有规则',
+ noAvailableCardsSubtitle: '编辑现有的卡片规则以进行更改',
max: '最大',
categoryOptions: {
[CONST.SPEND_RULES.CATEGORIES.AIRLINES]: '航空公司',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
melvin-bot
Bot
requested review from
JmillsExpensify
and removed request for
a team
luacmartins
requested review from
a team and
cretadn22
and removed request for
JmillsExpensify
melvin-bot
Bot
requested review from
NicolasBonet and
flaviadefaria
and removed request for
a team
|
@NicolasBonet Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
coleaeason
approved these changes
Apr 13, 2026
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safari |
cead22
approved these changes
Apr 13, 2026
Contributor
|
🚧 @luacmartins 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. |
OSBotify
pushed a commit
that referenced
this pull request
Apr 14, 2026
Fix copy (cherry picked from commit 0a5ccfc) (cherry-picked to staging by luacmartins)
89 tasks
Contributor
|
🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.59-3 🚀
Bundle Size Analysis (Sentry): |
Contributor
|
No help site changes needed. The copy changes in this PR (empty-state messages on the card selection and spend rule card pages) are not referenced in any article under |
Contributor
|
🚀 Deployed to production by https://github.com/AndrewGable in version: 9.3.59-4 🚀
|
Contributor
|
🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.60-0 🚀
Bundle Size Analysis (Sentry): |
Contributor
|
I reviewed the changes in this PR against the help site articles under No help site changes are required. The PR fixes internal UI empty-state copy (renaming |
Contributor
|
🚀 Deployed to production by https://github.com/mountiny in version: 9.3.60-22 🚀
|
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
5 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
#87419 changed the copy for the CardSelectionStep page too, which is incorrect. This PR fixes that
Fixed Issues
#87800 (partial, just fixes the blocker part)
Tests
Pre-condition:
/confirmationwith/card-selectionOffline tests
N/A
QA Steps
Same as tests
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