Repository navigation
Remove 'this may be overridden' from personal rules - #82414
Conversation
🦜 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 9bd15d80..d411e4e5 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -2469,6 +2469,7 @@ ${amount} für ${merchant} – ${date}`,
deleteSinglePrompt: 'Sind Sie sicher, dass Sie diese Regel löschen möchten?',
deleteMultiplePrompt: 'Möchtest du diese Regeln wirklich löschen?',
},
+ subtitle: 'Diese Regeln gelten für deine Ausgaben.',
},
preferencesPage: {
appSection: {
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 90a50b07..72fb7a79 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -2475,6 +2475,7 @@ ${amount} pour ${merchant} - ${date}`,
deleteSinglePrompt: 'Voulez-vous vraiment supprimer cette règle ?',
deleteMultiplePrompt: 'Voulez-vous vraiment supprimer ces règles ?',
},
+ subtitle: 'Ces règles s’appliqueront à vos dépenses.',
},
preferencesPage: {
appSection: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index a27f578d..9b81fb96 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -2463,6 +2463,7 @@ ${amount} per ${merchant} - ${date}`,
deleteSinglePrompt: 'Sei sicuro di voler eliminare questa regola?',
deleteMultiplePrompt: 'Sei sicuro di voler eliminare queste regole?',
},
+ subtitle: 'Queste regole verranno applicate alle tue spese.',
},
preferencesPage: {
appSection: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index c73e6577..c0f415f4 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -2448,6 +2448,7 @@ ${date} の ${merchant} への ${amount}`,
deleteSinglePrompt: 'このルールを削除してもよろしいですか?',
deleteMultiplePrompt: 'これらのルールを削除してもよろしいですか?',
},
+ subtitle: 'これらのルールはあなたの経費に適用されます。',
},
preferencesPage: {
appSection: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index e30c0553..2ebab12e 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -2464,6 +2464,7 @@ ${amount} voor ${merchant} - ${date}`,
deleteSinglePrompt: 'Weet je zeker dat je deze regel wilt verwijderen?',
deleteMultiplePrompt: 'Weet je zeker dat je deze regels wilt verwijderen?',
},
+ subtitle: 'Deze regels zijn van toepassing op je uitgaven.',
},
preferencesPage: {
appSection: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 6b835a1d..df50774d 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -2456,6 +2456,7 @@ ${amount} dla ${merchant} - ${date}`,
deleteSinglePrompt: 'Czy na pewno chcesz usunąć tę regułę?',
deleteMultiplePrompt: 'Czy na pewno chcesz usunąć te reguły?',
},
+ subtitle: 'Te zasady będą miały zastosowanie do Twoich wydatków.',
},
preferencesPage: {
appSection: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index d5605cca..8ca3046d 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -2457,6 +2457,7 @@ ${amount} para ${merchant} - ${date}`,
deleteSinglePrompt: 'Tem certeza de que deseja excluir esta regra?',
deleteMultiplePrompt: 'Tem certeza de que deseja excluir essas regras?',
},
+ subtitle: 'Essas regras serão aplicadas às suas despesas.',
},
preferencesPage: {
appSection: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index cb3289df..f1f4b9bf 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -2421,6 +2421,7 @@ ${amount},商户:${merchant} - 日期:${date}`,
deleteSinglePrompt: '确定要删除此规则吗?',
deleteMultiplePrompt: '确定要删除这些规则吗?',
},
+ subtitle: '这些规则将适用于你的报销费用。',
},
preferencesPage: {
appSection: {
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
|
@thienlnam 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] |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: ba6144a3cf
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safari |
|
🚧 @luacmartins 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! 🧪🧪
|
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/luacmartins in version: 9.3.19-0 🚀
|
|
🚀 Deployed to production by https://github.com/mountiny in version: 9.3.19-5 🚀
|
Explanation of Change
coming from https://expensify.slack.com/archives/C07HPDRELLD/p1770992999493849?thread_ts=1770140341.394189&cid=C07HPDRELLD, lets remove the 'If you submit to a workspace, then the workspace rules may override it'
Fixed Issues
https://expensify.slack.com/archives/C07HPDRELLD/p1770992999493849?thread_ts=1770140341.394189&cid=C07HPDRELLD
Tests
Navigate to personal rules
Ensure the message is 'These rules will apply to your expenses'
Offline tests
N/A
QA Steps
Same as tests
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand 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