Skip to content

Commit 9db7193

Browse files
authored
Merge pull request Expensify#67732 from shubham1206agra/merge-translation-11
Merge workspace.(qbd/qbo).deepDiveExpensifyCard translations
2 parents e6f89b4 + 787c86b commit 9db7193

14 files changed

Lines changed: 41 additions & 67 deletions

File tree

src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Str} from 'expensify-common';
22
import React, {useMemo} from 'react';
33
import type {StyleProp, TextStyle} from 'react-native';
4-
import type {CustomRendererProps, TBlock} from 'react-native-render-html';
4+
import type {CustomRendererProps, TPhrasing, TText} from 'react-native-render-html';
55
import {TNodeChildrenRenderer} from 'react-native-render-html';
66
import AnchorForAttachmentsOnly from '@components/AnchorForAttachmentsOnly';
77
import AnchorForCommentsOnly from '@components/AnchorForCommentsOnly';
@@ -16,7 +16,7 @@ import {getInternalExpensifyPath, getInternalNewExpensifyPath, openLink} from '@
1616
import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
1717
import CONST from '@src/CONST';
1818

19-
type AnchorRendererProps = CustomRendererProps<TBlock> & {
19+
type AnchorRendererProps = CustomRendererProps<TText | TPhrasing> & {
2020
/** Key of the element */
2121
key?: string;
2222
};
@@ -71,6 +71,11 @@ function AnchorRenderer({tnode, style, key}: AnchorRendererProps) {
7171
];
7272
}
7373

74+
// Special handling for links in RBR to maintain consistent font size
75+
if (HTMLEngineUtils.isChildOfMutedTextLabel(tnode)) {
76+
linkStyle = [styles.mutedNormalTextLabel, styles.link];
77+
}
78+
7479
if (tnode.classes.includes('no-style-link')) {
7580
// If the link has a class of a no-style-link, we don't apply any styles
7681
linkStyle = {...(style as TextStyle)};

src/components/HTMLEngineProvider/htmlEngineUtils.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,17 @@ function getFontSizeOfRBRChild(tnode: TNode): number {
9898
return 0;
9999
}
100100

101-
export {computeEmbeddedMaxWidth, isChildOfComment, isChildOfH1, isDeletedNode, isChildOfTaskTitle, isChildOfRBR, isCommentTag, getFontSizeOfRBRChild};
101+
/**
102+
* @returns Whether the node is a child of muted-text-label
103+
*/
104+
function isChildOfMutedTextLabel(tnode: TNode): boolean {
105+
if (!tnode.parent) {
106+
return false;
107+
}
108+
if (tnode.parent.tagName === 'muted-text-label') {
109+
return true;
110+
}
111+
return isChildOfMutedTextLabel(tnode.parent);
112+
}
113+
114+
export {computeEmbeddedMaxWidth, isChildOfComment, isChildOfH1, isDeletedNode, isChildOfTaskTitle, isChildOfRBR, isCommentTag, getFontSizeOfRBRChild, isChildOfMutedTextLabel};

src/languages/de.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3511,6 +3511,7 @@ const translations = {
35113511
defaultCategory: 'Standardkategorie',
35123512
viewTransactions: 'Transaktionen anzeigen',
35133513
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `Ausgaben von ${displayName}`,
3514+
deepDiveExpensifyCard: `<muted-text-label>Expensify Card-Transaktionen werden automatisch in ein mit <a href="${CONST.DEEP_DIVE_EXPENSIFY_CARD}">unserer Integration</a> erstelltes „Expensify Card Liability Account“ exportiert.</muted-text-label>`,
35143515
},
35153516
perDiem: {
35163517
subtitle: 'Setzen Sie Tagespauschalen, um die täglichen Ausgaben der Mitarbeiter zu kontrollieren.',
@@ -3575,8 +3576,6 @@ const translations = {
35753576
exportJournalEntryDescription: 'Wir werden für jeden Expensify-Bericht einen detaillierten Journaleintrag erstellen und ihn auf das untenstehende Konto buchen.',
35763577
exportVendorBillDescription:
35773578
'Wir erstellen eine detaillierte Lieferantenrechnung für jeden Expensify-Bericht und fügen sie dem unten stehenden Konto hinzu. Wenn dieser Zeitraum geschlossen ist, buchen wir zum 1. des nächsten offenen Zeitraums.',
3578-
deepDiveExpensifyCard: 'Expensify-Kartentransaktionen werden automatisch in ein "Expensify Card Liability Account" exportiert, das erstellt wurde mit',
3579-
deepDiveExpensifyCardIntegration: 'unsere Integration.',
35803579
outOfPocketTaxEnabledDescription:
35813580
'QuickBooks Desktop unterstützt keine Steuern bei Journalbuchungsexporten. Da Sie Steuern in Ihrem Arbeitsbereich aktiviert haben, ist diese Exportoption nicht verfügbar.',
35823581
outOfPocketTaxEnabledError: 'Journalbuchungen sind nicht verfügbar, wenn Steuern aktiviert sind. Bitte wählen Sie eine andere Exportoption.',
@@ -3658,8 +3657,6 @@ const translations = {
36583657
date: 'Exportdatum',
36593658
exportInvoices: 'Rechnungen exportieren nach',
36603659
exportExpensifyCard: 'Expensify Card-Transaktionen exportieren als',
3661-
deepDiveExpensifyCard: 'Expensify-Kartentransaktionen werden automatisch in ein "Expensify Card Liability Account" exportiert, das erstellt wurde mit',
3662-
deepDiveExpensifyCardIntegration: 'unsere Integration.',
36633660
exportDate: {
36643661
label: 'Exportdatum',
36653662
description: 'Verwenden Sie dieses Datum beim Exportieren von Berichten nach QuickBooks Online.',

src/languages/en.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3504,6 +3504,7 @@ const translations = {
35043504
defaultCategory: 'Default category',
35053505
viewTransactions: 'View transactions',
35063506
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `${displayName}'s expenses`,
3507+
deepDiveExpensifyCard: `<muted-text-label>Expensify Card transactions will automatically export to an "Expensify Card Liability Account" created with <a href="${CONST.DEEP_DIVE_EXPENSIFY_CARD}">our integration</a>.</muted-text-label>`,
35073508
},
35083509
perDiem: {
35093510
subtitle: 'Set per diem rates to control daily employee spend. ',
@@ -3568,8 +3569,6 @@ const translations = {
35683569
exportJournalEntryDescription: "We'll create an itemized journal entry for each Expensify report and post it to the account below.",
35693570
exportVendorBillDescription:
35703571
"We'll create an itemized vendor bill for each Expensify report and add it to the account below. If this period is closed, we'll post to the 1st of the next open period.",
3571-
deepDiveExpensifyCard: 'Expensify Card transactions will automatically export to an "Expensify Card Liability Account" created with',
3572-
deepDiveExpensifyCardIntegration: 'our integration.',
35733572
outOfPocketTaxEnabledDescription:
35743573
"QuickBooks Desktop doesn't support taxes on journal entry exports. As you have taxes enabled on your workspace, this export option is unavailable.",
35753574
outOfPocketTaxEnabledError: 'Journal entries are unavailable when taxes are enabled. Please choose a different export option.',
@@ -3652,8 +3651,6 @@ const translations = {
36523651
date: 'Export date',
36533652
exportInvoices: 'Export invoices to',
36543653
exportExpensifyCard: 'Export Expensify Card transactions as',
3655-
deepDiveExpensifyCard: 'Expensify Card transactions will automatically export to an "Expensify Card Liability Account" created with',
3656-
deepDiveExpensifyCardIntegration: 'our integration.',
36573654
exportDate: {
36583655
label: 'Export date',
36593656
description: 'Use this date when exporting reports to QuickBooks Online.',

src/languages/es.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3496,6 +3496,7 @@ const translations = {
34963496
defaultCategory: 'Categoría predeterminada',
34973497
viewTransactions: 'Ver transacciones',
34983498
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `${displayName}'s gastos`,
3499+
deepDiveExpensifyCard: `<muted-text-label>Las transacciones de la Tarjeta Expensify se exportan automáticamente a una "Cuenta de Responsabilidad de la Tarjeta Expensify" creada con <a href="${CONST.DEEP_DIVE_EXPENSIFY_CARD}">nuestra integración</a>.</muted-text-label>`,
34993500
},
35003501
perDiem: {
35013502
subtitle: 'Establece las tasas per diem para controlar los gastos diarios de los empleados. ',
@@ -3560,8 +3561,6 @@ const translations = {
35603561
exportJournalEntryDescription: 'Crearemos una entrada contable desglosada para cada informe de Expensify y lo contabilizaremos en la cuenta a continuación.',
35613562
exportVendorBillDescription:
35623563
'Crearemos una factura de proveedor desglosada para cada informe de Expensify y la añadiremos a la cuenta a continuación. Si este periodo está cerrado, lo contabilizaremos el 1º del siguiente periodo abierto.',
3563-
deepDiveExpensifyCard: 'Las transacciones de la Tarjeta Expensify se exportarán automáticamente a una "Cuenta de Responsabilidad de la Tarjeta Expensify" creada con',
3564-
deepDiveExpensifyCardIntegration: 'nuestra integración.',
35653564
outOfPocketTaxEnabledDescription:
35663565
'QuickBooks Desktop no admite impuestos en las exportaciones de asientos contables. Como tienes impuestos habilitados en tu espacio de trabajo, esta opción de exportación no está disponible.',
35673566
outOfPocketTaxEnabledError: 'Los asientos contables no están disponibles cuando los impuestos están habilitados. Por favor, selecciona otra opción de exportación.',
@@ -3645,8 +3644,6 @@ const translations = {
36453644
exportInvoices: 'Exportar facturas a',
36463645
exportDescription: 'Configura cómo se exportan los datos de Expensify a QuickBooks Online.',
36473646
date: 'Fecha de exportación',
3648-
deepDiveExpensifyCard: 'Las transacciones de la Tarjeta Expensify se exportan automáticamente a una "Cuenta de Responsabilidad de la Tarjeta Expensify" creada con',
3649-
deepDiveExpensifyCardIntegration: 'nuestra integración.',
36503647
exportExpensifyCard: 'Exportar las transacciones de las tarjetas Expensify como',
36513648
exportDate: {
36523649
label: 'Fecha de exportación',

src/languages/fr.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3520,6 +3520,7 @@ const translations = {
35203520
defaultCategory: 'Catégorie par défaut',
35213521
viewTransactions: 'Voir les transactions',
35223522
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `Les dépenses de ${displayName}`,
3523+
deepDiveExpensifyCard: `<muted-text-label>Les transactions Expensify Card seront automatiquement exportées vers un « Expensify Card Liability Account » créé avec <a href="${CONST.DEEP_DIVE_EXPENSIFY_CARD}">notre intégration</a>.</muted-text-label>`,
35233524
},
35243525
perDiem: {
35253526
subtitle: 'Définissez des taux de per diem pour contrôler les dépenses quotidiennes des employés.',
@@ -3584,8 +3585,6 @@ const translations = {
35843585
exportJournalEntryDescription: 'Nous créerons une écriture de journal détaillée pour chaque rapport Expensify et la publierons sur le compte ci-dessous.',
35853586
exportVendorBillDescription:
35863587
"Nous créerons une facture détaillée pour chaque rapport Expensify et l'ajouterons au compte ci-dessous. Si cette période est clôturée, nous la publierons au 1er de la prochaine période ouverte.",
3587-
deepDiveExpensifyCard: 'Les transactions de la carte Expensify seront automatiquement exportées vers un "Compte de responsabilité de carte Expensify" créé avec',
3588-
deepDiveExpensifyCardIntegration: 'notre intégration.',
35893588
outOfPocketTaxEnabledDescription:
35903589
"QuickBooks Desktop ne prend pas en charge les taxes sur les exportations d'écritures de journal. Comme vous avez activé les taxes dans votre espace de travail, cette option d'exportation n'est pas disponible.",
35913590
outOfPocketTaxEnabledError: "Les écritures de journal ne sont pas disponibles lorsque les taxes sont activées. Veuillez choisir une autre option d'exportation.",
@@ -3668,8 +3667,6 @@ const translations = {
36683667
date: "Date d'exportation",
36693668
exportInvoices: 'Exporter les factures vers',
36703669
exportExpensifyCard: 'Exporter les transactions de la carte Expensify en tant que',
3671-
deepDiveExpensifyCard: 'Les transactions de la carte Expensify seront automatiquement exportées vers un "Compte de responsabilité de carte Expensify" créé avec',
3672-
deepDiveExpensifyCardIntegration: 'notre intégration.',
36733670
exportDate: {
36743671
label: "Date d'exportation",
36753672
description: "Utilisez cette date lors de l'exportation des rapports vers QuickBooks Online.",

src/languages/it.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3525,6 +3525,7 @@ const translations = {
35253525
defaultCategory: 'Categoria predefinita',
35263526
viewTransactions: 'Visualizza transazioni',
35273527
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `Spese di ${displayName}`,
3528+
deepDiveExpensifyCard: `<muted-text-label>Le transazioni della carta Expensify verranno esportate automaticamente in un “Conto di responsabilità della carta Expensify” creato con la <a href="${CONST.DEEP_DIVE_EXPENSIFY_CARD}">nostra integrazione</a>.</muted-text-label>`,
35283529
},
35293530
perDiem: {
35303531
subtitle: 'Imposta le tariffe di diaria per controllare la spesa giornaliera dei dipendenti.',
@@ -3589,8 +3590,6 @@ const translations = {
35893590
exportJournalEntryDescription: "Creeremo una registrazione contabile dettagliata per ogni report di Expensify e la pubblicheremo sull'account qui sotto.",
35903591
exportVendorBillDescription:
35913592
"Creeremo una fattura dettagliata del fornitore per ogni report di Expensify e la aggiungeremo all'account sottostante. Se questo periodo è chiuso, la registreremo al 1° del prossimo periodo aperto.",
3592-
deepDiveExpensifyCard: 'Le transazioni della Expensify Card verranno esportate automaticamente in un "Conto di responsabilità della Expensify Card" creato con',
3593-
deepDiveExpensifyCardIntegration: 'la nostra integrazione.',
35943593
outOfPocketTaxEnabledDescription:
35953594
'QuickBooks Desktop non supporta le tasse sulle esportazioni delle registrazioni contabili. Poiché hai le tasse abilitate nel tuo spazio di lavoro, questa opzione di esportazione non è disponibile.',
35963595
outOfPocketTaxEnabledError: "Le registrazioni contabili non sono disponibili quando le tasse sono abilitate. Si prega di scegliere un'opzione di esportazione diversa.",
@@ -3672,8 +3671,6 @@ const translations = {
36723671
date: 'Data di esportazione',
36733672
exportInvoices: 'Esporta fatture su',
36743673
exportExpensifyCard: 'Esporta le transazioni della Expensify Card come',
3675-
deepDiveExpensifyCard: 'Le transazioni della Expensify Card verranno esportate automaticamente in un "Conto di responsabilità della Expensify Card" creato con',
3676-
deepDiveExpensifyCardIntegration: 'la nostra integrazione.',
36773674
exportDate: {
36783675
label: 'Data di esportazione',
36793676
description: 'Usa questa data quando esporti i rapporti su QuickBooks Online.',

src/languages/ja.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3525,6 +3525,7 @@ const translations = {
35253525
defaultCategory: 'デフォルトカテゴリ',
35263526
viewTransactions: '取引を表示',
35273527
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `${displayName}の経費`,
3528+
deepDiveExpensifyCard: `<muted-text-label>Expensify Cardの取引は、<a href="${CONST.DEEP_DIVE_EXPENSIFY_CARD}">弊社の統合</a>で作成された 「Expensify Card Liability Account 」に自動的にエクスポートされます。</muted-text-label>`,
35283529
},
35293530
perDiem: {
35303531
subtitle: '日当料金を設定して、従業員の1日の支出を管理します。',
@@ -3589,8 +3590,6 @@ const translations = {
35893590
exportJournalEntryDescription: '各Expensifyレポートに対して項目別の仕訳を作成し、以下のアカウントに投稿します。',
35903591
exportVendorBillDescription:
35913592
'私たちは、各Expensifyレポートのために項目別のベンダー請求書を作成し、以下のアカウントに追加します。この期間が閉じている場合、次の開いている期間の1日に投稿します。',
3592-
deepDiveExpensifyCard: 'Expensifyカードの取引は、作成された「Expensifyカード負債勘定」に自動的にエクスポートされます。',
3593-
deepDiveExpensifyCardIntegration: '私たちの統合。',
35943593
outOfPocketTaxEnabledDescription:
35953594
'QuickBooks Desktopは、仕訳帳エクスポートで税金をサポートしていません。ワークスペースで税金が有効になっているため、このエクスポートオプションは利用できません。',
35963595
outOfPocketTaxEnabledError: '税金が有効になっている場合、仕訳帳は利用できません。別のエクスポートオプションを選択してください。',
@@ -3669,8 +3668,6 @@ const translations = {
36693668
date: 'エクスポート日付',
36703669
exportInvoices: '請求書をエクスポート',
36713670
exportExpensifyCard: 'Expensifyカードの取引をエクスポートする',
3672-
deepDiveExpensifyCard: 'Expensifyカードの取引は、作成された「Expensifyカード負債勘定」に自動的にエクスポートされます。',
3673-
deepDiveExpensifyCardIntegration: '私たちの統合。',
36743671
exportDate: {
36753672
label: 'エクスポート日付',
36763673
description: 'この日付を使用してレポートをQuickBooks Onlineにエクスポートしてください。',

src/languages/nl.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3532,6 +3532,7 @@ const translations = {
35323532
defaultCategory: 'Standaardcategorie',
35333533
viewTransactions: 'Transacties bekijken',
35343534
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `Uitgaven van ${displayName}`,
3535+
deepDiveExpensifyCard: `<muted-text-label>Expensify Card transacties worden automatisch geëxporteerd naar een “Expensify Card Liability Account” die is aangemaakt met <a href="${CONST.DEEP_DIVE_EXPENSIFY_CARD}">onze integratie</a>.</muted-text-label>`,
35353536
},
35363537
perDiem: {
35373538
subtitle: 'Stel dagvergoedingen in om de dagelijkse uitgaven van werknemers te beheersen.',
@@ -3597,8 +3598,6 @@ const translations = {
35973598
exportJournalEntryDescription: 'We zullen een gespecificeerde journaalpost maken voor elk Expensify-rapport en deze naar de onderstaande rekening boeken.',
35983599
exportVendorBillDescription:
35993600
'We maken een gespecificeerde leveranciersfactuur voor elk Expensify-rapport en voegen deze toe aan de onderstaande rekening. Als deze periode is gesloten, boeken we naar de 1e van de volgende open periode.',
3600-
deepDiveExpensifyCard: 'Expensify Card-transacties worden automatisch geëxporteerd naar een "Expensify Card Liability Account" die is aangemaakt met',
3601-
deepDiveExpensifyCardIntegration: 'onze integratie.',
36023601
outOfPocketTaxEnabledDescription:
36033602
'QuickBooks Desktop ondersteunt geen belastingen bij het exporteren van journaalposten. Aangezien u belastingen heeft ingeschakeld in uw werkruimte, is deze exportoptie niet beschikbaar.',
36043603
outOfPocketTaxEnabledError: 'Journaalposten zijn niet beschikbaar wanneer belastingen zijn ingeschakeld. Kies een andere exportoptie.',
@@ -3678,8 +3677,6 @@ const translations = {
36783677
date: 'Exportdatum',
36793678
exportInvoices: 'Facturen exporteren naar',
36803679
exportExpensifyCard: 'Exporteer Expensify Card-transacties als',
3681-
deepDiveExpensifyCard: 'Expensify Card-transacties worden automatisch geëxporteerd naar een "Expensify Card Liability Account" die is aangemaakt met',
3682-
deepDiveExpensifyCardIntegration: 'onze integratie.',
36833680
exportDate: {
36843681
label: 'Exportdatum',
36853682
description: 'Gebruik deze datum bij het exporteren van rapporten naar QuickBooks Online.',

0 commit comments

Comments
 (0)