Skip to content

Commit 787c86b

Browse files
Merge workspace.(qbd/qbo).deepDiveExpensifyCard translations
1 parent a8175e0 commit 787c86b

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
@@ -3513,6 +3513,7 @@ const translations = {
35133513
defaultCategory: 'Standardkategorie',
35143514
viewTransactions: 'Transaktionen anzeigen',
35153515
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `Ausgaben von ${displayName}`,
3516+
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>`,
35163517
},
35173518
perDiem: {
35183519
subtitle: 'Setzen Sie Tagespauschalen, um die täglichen Ausgaben der Mitarbeiter zu kontrollieren.',
@@ -3577,8 +3578,6 @@ const translations = {
35773578
exportJournalEntryDescription: 'Wir werden für jeden Expensify-Bericht einen detaillierten Journaleintrag erstellen und ihn auf das untenstehende Konto buchen.',
35783579
exportVendorBillDescription:
35793580
'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.',
3580-
deepDiveExpensifyCard: 'Expensify-Kartentransaktionen werden automatisch in ein "Expensify Card Liability Account" exportiert, das erstellt wurde mit',
3581-
deepDiveExpensifyCardIntegration: 'unsere Integration.',
35823581
outOfPocketTaxEnabledDescription:
35833582
'QuickBooks Desktop unterstützt keine Steuern bei Journalbuchungsexporten. Da Sie Steuern in Ihrem Arbeitsbereich aktiviert haben, ist diese Exportoption nicht verfügbar.',
35843583
outOfPocketTaxEnabledError: 'Journalbuchungen sind nicht verfügbar, wenn Steuern aktiviert sind. Bitte wählen Sie eine andere Exportoption.',
@@ -3660,8 +3659,6 @@ const translations = {
36603659
date: 'Exportdatum',
36613660
exportInvoices: 'Rechnungen exportieren nach',
36623661
exportExpensifyCard: 'Expensify Card-Transaktionen exportieren als',
3663-
deepDiveExpensifyCard: 'Expensify-Kartentransaktionen werden automatisch in ein "Expensify Card Liability Account" exportiert, das erstellt wurde mit',
3664-
deepDiveExpensifyCardIntegration: 'unsere Integration.',
36653662
exportDate: {
36663663
label: 'Exportdatum',
36673664
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
@@ -3506,6 +3506,7 @@ const translations = {
35063506
defaultCategory: 'Default category',
35073507
viewTransactions: 'View transactions',
35083508
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `${displayName}'s expenses`,
3509+
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>`,
35093510
},
35103511
perDiem: {
35113512
subtitle: 'Set per diem rates to control daily employee spend. ',
@@ -3570,8 +3571,6 @@ const translations = {
35703571
exportJournalEntryDescription: "We'll create an itemized journal entry for each Expensify report and post it to the account below.",
35713572
exportVendorBillDescription:
35723573
"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.",
3573-
deepDiveExpensifyCard: 'Expensify Card transactions will automatically export to an "Expensify Card Liability Account" created with',
3574-
deepDiveExpensifyCardIntegration: 'our integration.',
35753574
outOfPocketTaxEnabledDescription:
35763575
"QuickBooks Desktop doesn't support taxes on journal entry exports. As you have taxes enabled on your workspace, this export option is unavailable.",
35773576
outOfPocketTaxEnabledError: 'Journal entries are unavailable when taxes are enabled. Please choose a different export option.',
@@ -3654,8 +3653,6 @@ const translations = {
36543653
date: 'Export date',
36553654
exportInvoices: 'Export invoices to',
36563655
exportExpensifyCard: 'Export Expensify Card transactions as',
3657-
deepDiveExpensifyCard: 'Expensify Card transactions will automatically export to an "Expensify Card Liability Account" created with',
3658-
deepDiveExpensifyCardIntegration: 'our integration.',
36593656
exportDate: {
36603657
label: 'Export date',
36613658
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
@@ -3498,6 +3498,7 @@ const translations = {
34983498
defaultCategory: 'Categoría predeterminada',
34993499
viewTransactions: 'Ver transacciones',
35003500
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `${displayName}'s gastos`,
3501+
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>`,
35013502
},
35023503
perDiem: {
35033504
subtitle: 'Establece las tasas per diem para controlar los gastos diarios de los empleados. ',
@@ -3562,8 +3563,6 @@ const translations = {
35623563
exportJournalEntryDescription: 'Crearemos una entrada contable desglosada para cada informe de Expensify y lo contabilizaremos en la cuenta a continuación.',
35633564
exportVendorBillDescription:
35643565
'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.',
3565-
deepDiveExpensifyCard: 'Las transacciones de la Tarjeta Expensify se exportarán automáticamente a una "Cuenta de Responsabilidad de la Tarjeta Expensify" creada con',
3566-
deepDiveExpensifyCardIntegration: 'nuestra integración.',
35673566
outOfPocketTaxEnabledDescription:
35683567
'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.',
35693568
outOfPocketTaxEnabledError: 'Los asientos contables no están disponibles cuando los impuestos están habilitados. Por favor, selecciona otra opción de exportación.',
@@ -3647,8 +3646,6 @@ const translations = {
36473646
exportInvoices: 'Exportar facturas a',
36483647
exportDescription: 'Configura cómo se exportan los datos de Expensify a QuickBooks Online.',
36493648
date: 'Fecha de exportación',
3650-
deepDiveExpensifyCard: 'Las transacciones de la Tarjeta Expensify se exportan automáticamente a una "Cuenta de Responsabilidad de la Tarjeta Expensify" creada con',
3651-
deepDiveExpensifyCardIntegration: 'nuestra integración.',
36523649
exportExpensifyCard: 'Exportar las transacciones de las tarjetas Expensify como',
36533650
exportDate: {
36543651
label: 'Fecha de exportación',

src/languages/fr.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3522,6 +3522,7 @@ const translations = {
35223522
defaultCategory: 'Catégorie par défaut',
35233523
viewTransactions: 'Voir les transactions',
35243524
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `Les dépenses de ${displayName}`,
3525+
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>`,
35253526
},
35263527
perDiem: {
35273528
subtitle: 'Définissez des taux de per diem pour contrôler les dépenses quotidiennes des employés.',
@@ -3586,8 +3587,6 @@ const translations = {
35863587
exportJournalEntryDescription: 'Nous créerons une écriture de journal détaillée pour chaque rapport Expensify et la publierons sur le compte ci-dessous.',
35873588
exportVendorBillDescription:
35883589
"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.",
3589-
deepDiveExpensifyCard: 'Les transactions de la carte Expensify seront automatiquement exportées vers un "Compte de responsabilité de carte Expensify" créé avec',
3590-
deepDiveExpensifyCardIntegration: 'notre intégration.',
35913590
outOfPocketTaxEnabledDescription:
35923591
"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.",
35933592
outOfPocketTaxEnabledError: "Les écritures de journal ne sont pas disponibles lorsque les taxes sont activées. Veuillez choisir une autre option d'exportation.",
@@ -3670,8 +3669,6 @@ const translations = {
36703669
date: "Date d'exportation",
36713670
exportInvoices: 'Exporter les factures vers',
36723671
exportExpensifyCard: 'Exporter les transactions de la carte Expensify en tant que',
3673-
deepDiveExpensifyCard: 'Les transactions de la carte Expensify seront automatiquement exportées vers un "Compte de responsabilité de carte Expensify" créé avec',
3674-
deepDiveExpensifyCardIntegration: 'notre intégration.',
36753672
exportDate: {
36763673
label: "Date d'exportation",
36773674
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
@@ -3527,6 +3527,7 @@ const translations = {
35273527
defaultCategory: 'Categoria predefinita',
35283528
viewTransactions: 'Visualizza transazioni',
35293529
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `Spese di ${displayName}`,
3530+
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>`,
35303531
},
35313532
perDiem: {
35323533
subtitle: 'Imposta le tariffe di diaria per controllare la spesa giornaliera dei dipendenti.',
@@ -3591,8 +3592,6 @@ const translations = {
35913592
exportJournalEntryDescription: "Creeremo una registrazione contabile dettagliata per ogni report di Expensify e la pubblicheremo sull'account qui sotto.",
35923593
exportVendorBillDescription:
35933594
"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.",
3594-
deepDiveExpensifyCard: 'Le transazioni della Expensify Card verranno esportate automaticamente in un "Conto di responsabilità della Expensify Card" creato con',
3595-
deepDiveExpensifyCardIntegration: 'la nostra integrazione.',
35963595
outOfPocketTaxEnabledDescription:
35973596
'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.',
35983597
outOfPocketTaxEnabledError: "Le registrazioni contabili non sono disponibili quando le tasse sono abilitate. Si prega di scegliere un'opzione di esportazione diversa.",
@@ -3674,8 +3673,6 @@ const translations = {
36743673
date: 'Data di esportazione',
36753674
exportInvoices: 'Esporta fatture su',
36763675
exportExpensifyCard: 'Esporta le transazioni della Expensify Card come',
3677-
deepDiveExpensifyCard: 'Le transazioni della Expensify Card verranno esportate automaticamente in un "Conto di responsabilità della Expensify Card" creato con',
3678-
deepDiveExpensifyCardIntegration: 'la nostra integrazione.',
36793676
exportDate: {
36803677
label: 'Data di esportazione',
36813678
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
@@ -3527,6 +3527,7 @@ const translations = {
35273527
defaultCategory: 'デフォルトカテゴリ',
35283528
viewTransactions: '取引を表示',
35293529
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `${displayName}の経費`,
3530+
deepDiveExpensifyCard: `<muted-text-label>Expensify Cardの取引は、<a href="${CONST.DEEP_DIVE_EXPENSIFY_CARD}">弊社の統合</a>で作成された 「Expensify Card Liability Account 」に自動的にエクスポートされます。</muted-text-label>`,
35303531
},
35313532
perDiem: {
35323533
subtitle: '日当料金を設定して、従業員の1日の支出を管理します。',
@@ -3591,8 +3592,6 @@ const translations = {
35913592
exportJournalEntryDescription: '各Expensifyレポートに対して項目別の仕訳を作成し、以下のアカウントに投稿します。',
35923593
exportVendorBillDescription:
35933594
'私たちは、各Expensifyレポートのために項目別のベンダー請求書を作成し、以下のアカウントに追加します。この期間が閉じている場合、次の開いている期間の1日に投稿します。',
3594-
deepDiveExpensifyCard: 'Expensifyカードの取引は、作成された「Expensifyカード負債勘定」に自動的にエクスポートされます。',
3595-
deepDiveExpensifyCardIntegration: '私たちの統合。',
35963595
outOfPocketTaxEnabledDescription:
35973596
'QuickBooks Desktopは、仕訳帳エクスポートで税金をサポートしていません。ワークスペースで税金が有効になっているため、このエクスポートオプションは利用できません。',
35983597
outOfPocketTaxEnabledError: '税金が有効になっている場合、仕訳帳は利用できません。別のエクスポートオプションを選択してください。',
@@ -3671,8 +3670,6 @@ const translations = {
36713670
date: 'エクスポート日付',
36723671
exportInvoices: '請求書をエクスポート',
36733672
exportExpensifyCard: 'Expensifyカードの取引をエクスポートする',
3674-
deepDiveExpensifyCard: 'Expensifyカードの取引は、作成された「Expensifyカード負債勘定」に自動的にエクスポートされます。',
3675-
deepDiveExpensifyCardIntegration: '私たちの統合。',
36763673
exportDate: {
36773674
label: 'エクスポート日付',
36783675
description: 'この日付を使用してレポートをQuickBooks Onlineにエクスポートしてください。',

src/languages/nl.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3534,6 +3534,7 @@ const translations = {
35343534
defaultCategory: 'Standaardcategorie',
35353535
viewTransactions: 'Transacties bekijken',
35363536
policyExpenseChatName: ({displayName}: PolicyExpenseChatNameParams) => `Uitgaven van ${displayName}`,
3537+
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>`,
35373538
},
35383539
perDiem: {
35393540
subtitle: 'Stel dagvergoedingen in om de dagelijkse uitgaven van werknemers te beheersen.',
@@ -3599,8 +3600,6 @@ const translations = {
35993600
exportJournalEntryDescription: 'We zullen een gespecificeerde journaalpost maken voor elk Expensify-rapport en deze naar de onderstaande rekening boeken.',
36003601
exportVendorBillDescription:
36013602
'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.',
3602-
deepDiveExpensifyCard: 'Expensify Card-transacties worden automatisch geëxporteerd naar een "Expensify Card Liability Account" die is aangemaakt met',
3603-
deepDiveExpensifyCardIntegration: 'onze integratie.',
36043603
outOfPocketTaxEnabledDescription:
36053604
'QuickBooks Desktop ondersteunt geen belastingen bij het exporteren van journaalposten. Aangezien u belastingen heeft ingeschakeld in uw werkruimte, is deze exportoptie niet beschikbaar.',
36063605
outOfPocketTaxEnabledError: 'Journaalposten zijn niet beschikbaar wanneer belastingen zijn ingeschakeld. Kies een andere exportoptie.',
@@ -3680,8 +3679,6 @@ const translations = {
36803679
date: 'Exportdatum',
36813680
exportInvoices: 'Facturen exporteren naar',
36823681
exportExpensifyCard: 'Exporteer Expensify Card-transacties als',
3683-
deepDiveExpensifyCard: 'Expensify Card-transacties worden automatisch geëxporteerd naar een "Expensify Card Liability Account" die is aangemaakt met',
3684-
deepDiveExpensifyCardIntegration: 'onze integratie.',
36853682
exportDate: {
36863683
label: 'Exportdatum',
36873684
description: 'Gebruik deze datum bij het exporteren van rapporten naar QuickBooks Online.',

0 commit comments

Comments
 (0)