[CP Staging] Revert "Feature: Display Custom Tag Name on Tags Page for Single-Level Tags" - #71677
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 8fea408a..908f2bc0 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -4881,7 +4881,7 @@ const translations = {
existingTagError: 'Ein Tag mit diesem Namen existiert bereits',
invalidTagNameError: 'Der Tag-Name darf nicht 0 sein. Bitte wählen Sie einen anderen Wert.',
genericFailureMessage: 'Beim Aktualisieren des Tags ist ein Fehler aufgetreten, bitte versuchen Sie es erneut.',
- importedFromAccountingSoftware: 'Die unten stehenden Tags werden aus Ihrem',
+ importedFromAccountingSoftware: 'Die untenstehenden Tags werden aus Ihrem',
glCode: 'GL-Code',
updateGLCodeFailureMessage: 'Beim Aktualisieren des GL-Codes ist ein Fehler aufgetreten, bitte versuchen Sie es erneut.',
tagRules: 'Tag-Regeln',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index ee1f7465..3383ec1f 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -678,9 +678,7 @@ const translations = {
}: {
command?: string;
} = {}) =>
- `Non sei autorizzato a eseguire questa azione quando il supporto è connesso (comando: ${
- command ?? ''
- }). Se ritieni che Success debba essere in grado di eseguire questa azione, avvia una conversazione su Slack.`,
+ `Non sei autorizzato a eseguire questa azione quando il supporto è connesso (comando: ${command ?? ''}). Se ritieni che Success debba essere in grado di eseguire questa azione, avvia una conversazione su Slack.`,
},
lockedAccount: {
title: 'Account bloccato',
@@ -4895,7 +4893,7 @@ const translations = {
existingTagError: 'Un tag con questo nome esiste già',
invalidTagNameError: 'Il nome del tag non può essere 0. Si prega di scegliere un valore diverso.',
genericFailureMessage: "Si è verificato un errore durante l'aggiornamento del tag, riprova.",
- importedFromAccountingSoftware: 'I tag qui sotto sono importati dal tuo',
+ importedFromAccountingSoftware: 'I tag sottostanti sono importati dal tuo',
glCode: 'Codice GL',
updateGLCodeFailureMessage: "Si è verificato un errore durante l'aggiornamento del codice GL, riprova.",
tagRules: 'Regole dei tag',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 05130d6a..ef5f477c 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -4887,8 +4887,8 @@ const translations = {
tagRequiredError: 'Tagnaam is vereist',
existingTagError: 'Er bestaat al een tag met deze naam.',
invalidTagNameError: 'Tagnaam kan niet 0 zijn. Kies een andere waarde.',
- genericFailureMessage: 'Er is een fout opgetreden bij het bijwerken van de tag, probeer het alstublieft opnieuw.',
- importedFromAccountingSoftware: 'De onderstaande labels zijn geïmporteerd uit uw',
+ genericFailureMessage: 'Er is een fout opgetreden bij het bijwerken van het label, probeer het opnieuw.',
+ importedFromAccountingSoftware: 'De onderstaande tags worden geïmporteerd uit uw',
glCode: 'GL-code',
updateGLCodeFailureMessage: 'Er is een fout opgetreden bij het bijwerken van de GL-code, probeer het alstublieft opnieuw.',
tagRules: 'Tagregels',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index a6c2eee1..63d142c8 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -4877,7 +4877,7 @@ const translations = {
tagRequiredError: 'Nazwa tagu jest wymagana',
existingTagError: 'Tag o tej nazwie już istnieje',
invalidTagNameError: 'Nazwa tagu nie może być 0. Proszę wybrać inną wartość.',
- genericFailureMessage: 'Wystąpił błąd podczas aktualizacji tagu, spróbuj ponownie.',
+ genericFailureMessage: 'Wystąpił błąd podczas aktualizacji tagu, spróbuj ponownie',
importedFromAccountingSoftware: 'Tagi poniżej są importowane z twojego',
glCode: 'Kod GL',
updateGLCodeFailureMessage: 'Wystąpił błąd podczas aktualizacji kodu GL, spróbuj ponownie.',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 5aef6982..0cffd42c 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -4793,7 +4793,7 @@ const translations = {
existingTagError: '具有此名称的标签已存在',
invalidTagNameError: '标签名称不能为0。请选择其他值。',
genericFailureMessage: '更新标签时发生错误，请重试。',
- importedFromAccountingSoftware: '以下标签是从您的...导入的',
+ importedFromAccountingSoftware: '以下标签是从您的',
glCode: 'GL代码',
updateGLCodeFailureMessage: '更新总账代码时发生错误，请重试。',
tagRules: '标签规则',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
@parasharrajat 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] |
54 tasks done
JS00001
approved these changes
Oct 1, 2025
amyevans
changed the title
Codecov Report❌ Patch coverage is
📢 Thoughts on this report? Let us know! |
carlosmiceli
approved these changes
Oct 1, 2025
|
@amyevans looks like this was merged without a test passing. Please add a note explaining why this was done and remove the |
Contributor
Author
|
Not emergency, straight revert |
Contributor
Author
OSBotify
pushed a commit
that referenced
this pull request
Oct 1, 2025
…vert-69438-issue68607 [CP Staging] Revert "Feature: Display Custom Tag Name on Tags Page for Single-Level Tags" (cherry picked from commit ba80725) (cherry-picked to staging by Beamanator)
72 tasks done
Contributor
|
🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.2.21-2 🚀
@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes. |
This was referenced Oct 1, 2025
5 of 8 tasks
Contributor
|
🚀 Deployed to production by https://github.com/Julesssss in version: 9.2.21-4 🚀
|
2 of 8 tasks
Contributor
|
🚀 Deployed to production by https://github.com/Julesssss in version: 9.2.21-4 🚀
|
Contributor
|
🚀 Cherry-picked to staging by https://github.com/Beamanator in version: 9.2.22-1 🚀
|
Contributor
|
🚀 Deployed to production by https://github.com/Julesssss in version: 9.2.22-6 🚀
|
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
4 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
Reverts #70766 to fix a few deploy blockers
Fixed Issues
$ #71631
$ #71625
$ #71627
$ #71632
Tests
Offline tests
QA Steps
Steps in linked issues
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
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop