Skip to content

Merge empty tag and category subtitle translations #66795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roryabraham merged 4 commits into from
Jul 31, 2025
Merged

Merge empty tag and category subtitle translations #66795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2dbe411
Merge empty tag and category subtitle translations
shubham1206agra Jul 21, 2025
e443d54
Merge branch 'main' into merge-translation-5
shubham1206agra Jul 23, 2025
65b9482
Merge branch 'Expensify:main' into merge-translation-5
shubham1206agra Jul 24, 2025
a365115
Merge branch 'main' into merge-translation-5
shubham1206agra Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
mixedUAStyles: {...styles.mutedNormalTextLabel, ...styles.mb0},
contentModel: HTMLContentModel.block,
}),
'centered-text': HTMLElementModel.fromCustomModel({
Copy link
Copy Markdown
Contributor

@roryabraham roryabraham Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm is it not possible to fix this with flex styles on the parent container(s)? Including styles to control layout in a translation file feels like an anti-pattern to me.

Copy link
Copy Markdown
Contributor Author

@shubham1206agra shubham1206agra Jul 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@roryabraham I have tried every possible combination to fix this in other way, but it does not work on Native.

Copy link
Copy Markdown
Contributor

@roryabraham roryabraham Jul 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm can you expand on that and provide some more details?

Copy link
Copy Markdown
Contributor

@allgandalf allgandalf Jul 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bump @shubham1206agra

Copy link
Copy Markdown
Contributor

@roryabraham roryabraham Jul 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shubham1206agra brought details to slack here

tagName: 'centered-text',
mixedUAStyles: {...styles.textAlignCenter},
contentModel: HTMLContentModel.block,
}),
comment: HTMLElementModel.fromCustomModel({
tagName: 'comment',
getMixedUAStyles: (tnode) => {
Expand Down Expand Up @@ -173,6 +178,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
styles.blockquote,
styles.onlyEmojisTextLineHeight,
styles.subTextFileUpload,
styles.textAlignCenter,
styles.textSuccess,
],
);
Expand Down
20 changes: 7 additions & 13 deletions src/languages/de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ import type {
EditDestinationSubtitleParams,
ElectronicFundsParams,
EmployeeInviteMessageParams,
EmptyCategoriesSubtitleWithAccountingParams,
EmptyTagsSubtitleWithAccountingParams,
EnterMagicCodeParams,
ExportAgainModalDescriptionParams,
ExportedToIntegrationParams,
Expand Down Expand Up @@ -4452,11 +4454,8 @@ const translations = {
emptyCategories: {
title: 'Sie haben noch keine Kategorien erstellt.',
subtitle: 'Fügen Sie eine Kategorie hinzu, um Ihre Ausgaben zu organisieren.',
},
emptyCategoriesWithAccounting: {
subtitle1: 'Ihre Kategorien werden derzeit aus einer Buchhaltungsverbindung importiert. Gehen Sie zu',
subtitle2: 'Buchhaltung',
subtitle3: 'um Änderungen vorzunehmen.',
subtitleWithAccounting: ({accountingPageURL}: EmptyCategoriesSubtitleWithAccountingParams) =>
`<muted-text><centered-text>Ihre Kategorien werden derzeit aus einer Buchhaltungsverbindung importiert. Gehen Sie zur <a href="${accountingPageURL}">Buchhaltung</a>, um Änderungen vorzunehmen.</centered-text></muted-text>`,
},
updateFailureMessage: 'Beim Aktualisieren der Kategorie ist ein Fehler aufgetreten, bitte versuchen Sie es erneut.',
createFailureMessage: 'Beim Erstellen der Kategorie ist ein Fehler aufgetreten, bitte versuchen Sie es erneut.',
Expand Down Expand Up @@ -4721,14 +4720,9 @@ const translations = {
title: 'Sie haben noch keine Tags erstellt.',
// We need to remove the subtitle and use the below one when we remove the canUseMultiLevelTags beta
subtitle: 'Fügen Sie ein Tag hinzu, um Projekte, Standorte, Abteilungen und mehr zu verfolgen.',
subtitle1: 'Importieren Sie eine Tabelle, um Tags für die Verfolgung von Projekten, Standorten, Abteilungen und mehr hinzuzufügen.',
subtitle2: 'Erfahren Sie mehr',
subtitle3: 'über das Formatieren von Tag-Dateien.',
},
emptyTagsWithAccounting: {
subtitle1: 'Ihre Tags werden derzeit aus einer Buchhaltungsverbindung importiert. Gehen Sie zu',
subtitle2: 'Buchhaltung',
subtitle3: 'um Änderungen vorzunehmen.',
subtitleHTML: `<muted-text><centered-text>Importieren Sie eine Kalkulationstabelle, um Tags für die Verfolgung von Projekten, Standorten, Abteilungen und mehr hinzuzufügen. <a href="${CONST.IMPORT_TAGS_EXPENSIFY_URL}">Erfahren Sie mehr</a> über die Formatierung von Tag-Dateien.</centered-text></muted-text>`,
subtitleWithAccounting: ({accountingPageURL}: EmptyTagsSubtitleWithAccountingParams) =>
`<muted-text><centered-text>Your tags are currently importing from an accounting connection. Gehen Sie zur <a href="${accountingPageURL}">Buchhaltung</a>, um Änderungen vorzunehmen.</centered-text></muted-text>`,
},
deleteTag: 'Tag löschen',
deleteTags: 'Tags löschen',
Expand Down
20 changes: 7 additions & 13 deletions src/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ import type {
EditDestinationSubtitleParams,
ElectronicFundsParams,
EmployeeInviteMessageParams,
EmptyCategoriesSubtitleWithAccountingParams,
EmptyTagsSubtitleWithAccountingParams,
EnterMagicCodeParams,
ExportAgainModalDescriptionParams,
ExportedToIntegrationParams,
Expand Down Expand Up @@ -4434,11 +4436,8 @@ const translations = {
emptyCategories: {
title: "You haven't created any categories",
subtitle: 'Add a category to organize your spend.',
},
emptyCategoriesWithAccounting: {
subtitle1: 'Your categories are currently importing from an accounting connection. Head over to ',
subtitle2: 'accounting',
subtitle3: ' to make any changes.',
subtitleWithAccounting: ({accountingPageURL}: EmptyCategoriesSubtitleWithAccountingParams) =>
`<muted-text><centered-text>Your categories are currently importing from an accounting connection. Head over to <a href="${accountingPageURL}">accounting</a> to make any changes.</centered-text></muted-text>`,
},
updateFailureMessage: 'An error occurred while updating the category, please try again',
createFailureMessage: 'An error occurred while creating the category, please try again',
Expand Down Expand Up @@ -4700,14 +4699,9 @@ const translations = {
title: "You haven't created any tags",
// We need to remove the subtitle and use the below one when we remove the canUseMultiLevelTags beta
subtitle: 'Add a tag to track projects, locations, departments, and more.',
subtitle1: 'Import a spreadsheet to add tags for tracking projects, locations, departments, and more.',
subtitle2: ' Learn more',
subtitle3: ' about formatting tag files.',
},
emptyTagsWithAccounting: {
subtitle1: 'Your tags are currently importing from an accounting connection. Head over to ',
subtitle2: 'accounting',
subtitle3: ' to make any changes.',
subtitleHTML: `<muted-text><centered-text>Import a spreadsheet to add tags for tracking projects, locations, departments, and more. <a href="${CONST.IMPORT_TAGS_EXPENSIFY_URL}">Learn more</a> about formatting tag files.</centered-text></muted-text>`,
subtitleWithAccounting: ({accountingPageURL}: EmptyTagsSubtitleWithAccountingParams) =>
`<muted-text><centered-text>Your tags are currently importing from an accounting connection. Head over to <a href="${accountingPageURL}">accounting</a> to make any changes.</centered-text></muted-text>`,
},
deleteTag: 'Delete tag',
deleteTags: 'Delete tags',
Expand Down
20 changes: 7 additions & 13 deletions src/languages/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ import type {
EditDestinationSubtitleParams,
ElectronicFundsParams,
EmployeeInviteMessageParams,
EmptyCategoriesSubtitleWithAccountingParams,
EmptyTagsSubtitleWithAccountingParams,
EnterMagicCodeParams,
ExportAgainModalDescriptionParams,
ExportedToIntegrationParams,
Expand Down Expand Up @@ -4444,11 +4446,8 @@ const translations = {
emptyCategories: {
title: 'No has creado ninguna categoría',
subtitle: 'Añade una categoría para organizar tu gasto.',
},
emptyCategoriesWithAccounting: {
subtitle1: 'Tus categorías se están importando actualmente desde una conexión de contabilidad. Dirígete a ',
subtitle2: 'contabilidad',
subtitle3: ' para hacer cualquier cambio.',
subtitleWithAccounting: ({accountingPageURL}: EmptyCategoriesSubtitleWithAccountingParams) =>
`<muted-text><centered-text>Tus categorías se están importando actualmente desde una conexión de contabilidad. Dirígete a <a href="${accountingPageURL}">contabilidad</a> para hacer cualquier cambio.</centered-text></muted-text>`,
},
updateFailureMessage: 'Se ha producido un error al intentar eliminar la categoría. Por favor, inténtalo más tarde.',
createFailureMessage: 'Se ha producido un error al intentar crear la categoría. Por favor, inténtalo más tarde.',
Expand Down Expand Up @@ -4712,14 +4711,9 @@ const translations = {
emptyTags: {
title: 'No has creado ninguna etiqueta',
subtitle: 'Añade una etiqueta para realizar el seguimiento de proyectos, ubicaciones, departamentos y otros.',
subtitle1: 'Importa una hoja de cálculo para añadir etiquetas y organizar proyectos, ubicaciones, departamentos y más.',
subtitle2: ' Obtén más información',
subtitle3: ' sobre cómo dar formato a los archivos de etiquetas.',
},
emptyTagsWithAccounting: {
subtitle1: 'Tus etiquetas se están importando actualmente desde una conexión de contabilidad. Dirígete a ',
subtitle2: 'contabilidad',
subtitle3: ' para hacer cualquier cambio.',
subtitleHTML: `<muted-text><centered-text>Importa una hoja de cálculo para añadir etiquetas y organizar proyectos, ubicaciones, departamentos y más. <a href="${CONST.IMPORT_TAGS_EXPENSIFY_URL}">Obtén más información</a> sobre cómo dar formato a los archivos de etiquetas.</centered-text></muted-text>`,
subtitleWithAccounting: ({accountingPageURL}: EmptyTagsSubtitleWithAccountingParams) =>
`<muted-text><centered-text>Tus etiquetas se están importando actualmente desde una conexión de contabilidad. Dirígete a <a href="${accountingPageURL}">contabilidad</a> para hacer cualquier cambio.</centered-text></muted-text>`,
},
deleteTag: 'Eliminar etiqueta',
deleteTags: 'Eliminar etiquetas',
Expand Down
20 changes: 7 additions & 13 deletions src/languages/fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ import type {
EditDestinationSubtitleParams,
ElectronicFundsParams,
EmployeeInviteMessageParams,
EmptyCategoriesSubtitleWithAccountingParams,
EmptyTagsSubtitleWithAccountingParams,
EnterMagicCodeParams,
ExportAgainModalDescriptionParams,
ExportedToIntegrationParams,
Expand Down Expand Up @@ -4464,11 +4466,8 @@ const translations = {
emptyCategories: {
title: "Vous n'avez créé aucune catégorie",
subtitle: 'Ajoutez une catégorie pour organiser vos dépenses.',
},
emptyCategoriesWithAccounting: {
subtitle1: 'Vos catégories sont actuellement importées depuis une connexion comptable. Rendez-vous sur',
subtitle2: 'comptabilité',
subtitle3: 'pour apporter des modifications.',
subtitleWithAccounting: ({accountingPageURL}: EmptyCategoriesSubtitleWithAccountingParams) =>
`<muted-text><centered-text>Vos catégories sont actuellement importées à partir d'une connexion comptable. Allez dans la <a href="${accountingPageURL}">comptabilité</a> pour faire des changements.</centered-text></muted-text>`,
},
updateFailureMessage: "Une erreur s'est produite lors de la mise à jour de la catégorie, veuillez réessayer.",
createFailureMessage: "Une erreur s'est produite lors de la création de la catégorie, veuillez réessayer.",
Expand Down Expand Up @@ -4736,14 +4735,9 @@ const translations = {
title: "Vous n'avez créé aucun tag",
// We need to remove the subtitle and use the below one when we remove the canUseMultiLevelTags beta
subtitle: 'Ajoutez une étiquette pour suivre les projets, les emplacements, les départements, et plus encore.',
subtitle1: 'Importez une feuille de calcul pour ajouter des étiquettes afin de suivre les projets, les emplacements, les départements, et plus encore.',
subtitle2: 'En savoir plus',
subtitle3: 'à propos des fichiers de balises de formatage.',
},
emptyTagsWithAccounting: {
subtitle1: "Vos balises sont actuellement importées à partir d'une connexion comptable. Rendez-vous sur",
subtitle2: 'comptabilité',
subtitle3: 'pour apporter des modifications.',
subtitleHTML: `<muted-text><centered-text>Importez une feuille de calcul pour ajouter des balises permettant de suivre les projets, les lieux, les services, etc. <a href="${CONST.IMPORT_TAGS_EXPENSIFY_URL}">En savoir plus</a> sur le formatage des fichiers de balises.</centered-text></muted-text>`,
subtitleWithAccounting: ({accountingPageURL}: EmptyTagsSubtitleWithAccountingParams) =>
`<muted-text><centered-text>Vos étiquettes sont actuellement importées à partir d'une connexion comptable. Allez dans la <a href="${accountingPageURL}">comptabilité</a> pour faire des changements.</centered-text></muted-text>`,
},
deleteTag: 'Supprimer le tag',
deleteTags: 'Supprimer les balises',
Expand Down
20 changes: 7 additions & 13 deletions src/languages/it.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ import type {
EditDestinationSubtitleParams,
ElectronicFundsParams,
EmployeeInviteMessageParams,
EmptyCategoriesSubtitleWithAccountingParams,
EmptyTagsSubtitleWithAccountingParams,
EnterMagicCodeParams,
ExportAgainModalDescriptionParams,
ExportedToIntegrationParams,
Expand Down Expand Up @@ -4467,11 +4469,8 @@ const translations = {
emptyCategories: {
title: 'Non hai creato nessuna categoria',
subtitle: 'Aggiungi una categoria per organizzare le tue spese.',
},
emptyCategoriesWithAccounting: {
subtitle1: 'Le tue categorie sono attualmente in fase di importazione da una connessione contabile. Vai su',
subtitle2: 'contabilità',
subtitle3: 'per apportare qualsiasi modifica.',
subtitleWithAccounting: ({accountingPageURL}: EmptyCategoriesSubtitleWithAccountingParams) =>
`<muted-text><centered-text>Le categorie vengono attualmente importate da una connessione contabile. Passare alla <a href="${accountingPageURL}">contabilità</a> per apportare eventuali modifiche.</centered-text></muted-text>`,
},
updateFailureMessage: "Si è verificato un errore durante l'aggiornamento della categoria, riprova.",
createFailureMessage: 'Si è verificato un errore durante la creazione della categoria, per favore riprova.',
Expand Down Expand Up @@ -4736,14 +4735,9 @@ const translations = {
title: 'Non hai creato alcun tag',
// We need to remove the subtitle and use the below one when we remove the canUseMultiLevelTags beta
subtitle: 'Aggiungi un tag per tracciare progetti, sedi, reparti e altro.',
subtitle1: 'Importa un foglio di calcolo per aggiungere tag per il monitoraggio di progetti, sedi, dipartimenti e altro.',
subtitle2: 'Scopri di più',
subtitle3: 'about formatting tag files.',
},
emptyTagsWithAccounting: {
subtitle1: 'I tuoi tag sono attualmente in fase di importazione da una connessione contabile. Vai su',
subtitle2: 'contabilità',
subtitle3: 'per apportare qualsiasi modifica.',
subtitleHTML: `<muted-text><centered-text>Importare un foglio di calcolo per aggiungere tag per tracciare progetti, sedi, reparti e altro ancora. <a href="${CONST.IMPORT_TAGS_EXPENSIFY_URL}">Ulteriori informazioni</a> sulla formattazione dei file di tag.</centered-text></muted-text>`,
subtitleWithAccounting: ({accountingPageURL}: EmptyTagsSubtitleWithAccountingParams) =>
`<muted-text><centered-text>I tag vengono attualmente importati da una connessione contabile. Passare alla <a href="${accountingPageURL}">contabilità</a> per apportare eventuali modifiche.</centered-text></muted-text>`,
},
deleteTag: 'Elimina tag',
deleteTags: 'Elimina tag',
Expand Down
20 changes: 7 additions & 13 deletions src/languages/ja.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ import type {
EditDestinationSubtitleParams,
ElectronicFundsParams,
EmployeeInviteMessageParams,
EmptyCategoriesSubtitleWithAccountingParams,
EmptyTagsSubtitleWithAccountingParams,
EnterMagicCodeParams,
ExportAgainModalDescriptionParams,
ExportedToIntegrationParams,
Expand Down Expand Up @@ -4448,11 +4450,8 @@ const translations = {
emptyCategories: {
title: 'カテゴリが作成されていません',
subtitle: '支出を整理するためにカテゴリーを追加してください。',
},
emptyCategoriesWithAccounting: {
subtitle1: 'あなたのカテゴリは現在、会計接続からインポートされています。こちらに移動してください',
subtitle2: '会計',
subtitle3: '変更を加えるために。',
subtitleWithAccounting: ({accountingPageURL}: EmptyCategoriesSubtitleWithAccountingParams) =>
`<muted-text><centered-text>あなたのカテゴリーは現在、会計接続からインポートされています。<a href="${accountingPageURL}">会計</a>に移動して変更してください。</centered-text></muted-text>`,
},
updateFailureMessage: 'カテゴリの更新中にエラーが発生しました。もう一度お試しください。',
createFailureMessage: 'カテゴリの作成中にエラーが発生しました。もう一度お試しください。',
Expand Down Expand Up @@ -4715,14 +4714,9 @@ const translations = {
title: 'タグが作成されていません',
// We need to remove the subtitle and use the below one when we remove the canUseMultiLevelTags beta
subtitle: 'プロジェクト、場所、部門などを追跡するためのタグを追加します。',
subtitle1: 'スプレッドシートをインポートして、プロジェクト、場所、部門などの追跡用タグを追加します。',
subtitle2: '詳細を確認',
subtitle3: 'フォーマットタグファイルについて。',
},
emptyTagsWithAccounting: {
subtitle1: 'あなたのタグは現在、会計接続からインポートされています。こちらに移動して',
subtitle2: '会計',
subtitle3: '変更を加えるために。',
subtitleHTML: `<muted-text><centered-text>スプレッドシートをインポートして、プロジェクト、場所、部署などを追跡するためのタグを追加できます。タグファイルのフォーマットについては<a href="${CONST.IMPORT_TAGS_EXPENSIFY_URL}">こちらをご覧</a>ください。</centered-text></muted-text>`,
subtitleWithAccounting: ({accountingPageURL}: EmptyTagsSubtitleWithAccountingParams) =>
`<muted-text><centered-text>タグは現在、会計接続からインポートされています。<a href="${accountingPageURL}">アカウンティング</a>に移動して変更してください。</centered-text></muted-text>`,
},
deleteTag: 'タグを削除',
deleteTags: 'タグを削除',
Expand Down
Loading
Loading