Skip to content

Commit 691982f

Browse files
mollfprmollfpr
authored
Merge pull request Expensify#80706 from Expensify/scott-showReimbursedReportAction
Remove REIMBURSED from the deprecatedOldReportActions list
2 parents f15d06c + e4954ac commit 691982f

17 files changed

Lines changed: 642 additions & 5 deletions

File tree

‎src/languages/de.ts‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1373,6 +1373,45 @@ const translations: TranslationDeepObject<typeof en> = {
13731373
paidWithExpensify: (payer?: string) => `${payer ? `${payer} ` : ''}mit Wallet bezahlt`,
13741374
automaticallyPaidWithExpensify: (payer?: string) =>
13751375
`${payer ? `${payer} ` : ''}mit Expensify über <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">Workspace-Regeln</a> bezahlt`,
1376+
reimbursedThisReport: 'diesen Bericht erstattet',
1377+
paidThisBill: 'diese Rechnung bezahlt',
1378+
reimbursedOnBehalfOf: (actor: string) => `im Namen von ${actor}`,
1379+
reimbursedFromBankAccount: (debitBankAccount: string) => `vom Bankkonto mit der Endung ${debitBankAccount}`,
1380+
reimbursedSubmitterAddedBankAccount: (submitter: string) =>
1381+
`${submitter} hat ein Bankkonto hinzugefügt und den Bericht aus der Warteschleife genommen. Die Erstattung wurde eingeleitet`,
1382+
reimbursedWithFastACH: ({
1383+
isCurrentUser,
1384+
submitterLogin,
1385+
creditBankAccount,
1386+
expectedDate,
1387+
}: {
1388+
isCurrentUser: boolean;
1389+
submitterLogin: string;
1390+
creditBankAccount: string;
1391+
expectedDate: string;
1392+
}) =>
1393+
isCurrentUser
1394+
? `. Das Geld ist auf dem Weg zu Ihrem ${creditBankAccount ? `Bankkonto mit der Endung ${creditBankAccount}` : 'Konto'}. Die Erstattung wird voraussichtlich bis zum ${expectedDate} abgeschlossen.`
1395+
: `. Das Geld ist auf dem Weg zum Bankkonto von ${submitterLogin}${creditBankAccount ? ` mit der Endung ${creditBankAccount}` : ''}. Die Erstattung wird voraussichtlich am ${expectedDate} abgeschlossen.`,
1396+
reimbursedWithCheck: ' per Scheck.',
1397+
reimbursedWithStripeConnect: ({
1398+
isCurrentUser,
1399+
submitterLogin,
1400+
creditBankAccount,
1401+
isCard,
1402+
}: {
1403+
isCurrentUser: boolean;
1404+
submitterLogin: string;
1405+
creditBankAccount: string;
1406+
isCard: boolean;
1407+
}) => {
1408+
const paymentMethod = isCard ? 'Karte' : 'Bankkonto';
1409+
return isCurrentUser
1410+
? `. Das Geld ist auf dem Weg zu Ihrem ${creditBankAccount ? `Bankkonto mit der Endung ${creditBankAccount}` : 'Konto'} (bezahlt über ${paymentMethod}). Dies kann bis zu 10 Werktage dauern.`
1411+
: `. Das Geld ist auf dem Weg zum Bankkonto von ${submitterLogin}${creditBankAccount ? ` mit der Endung ${creditBankAccount}` : ''} (bezahlt über ${paymentMethod}). Dies kann bis zu 10 Werktage dauern.`;
1412+
},
1413+
reimbursedWithACH: ({creditBankAccount, expectedDate}: {creditBankAccount?: string; expectedDate?: string}) =>
1414+
` mit Direkteinzahlung (ACH)${creditBankAccount ? ` auf das Bankkonto mit der Endziffer ${creditBankAccount}.` : '. '}${expectedDate ? `Die Rückerstattung wird voraussichtlich bis zum ${expectedDate} abgeschlossen sein.` : 'Dies dauert in der Regel 4–5 Werktage.'}`,
13761415
noReimbursableExpenses: 'Dieser Bericht enthält einen ungültigen Betrag',
13771416
pendingConversionMessage: 'Die Gesamtsumme wird aktualisiert, sobald du wieder online bist',
13781417
changedTheExpense: 'hat die Ausgabe geändert',

‎src/languages/en.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,6 +1427,44 @@ const translations = {
14271427
paidWithExpensify: (payer?: string) => `${payer ? `${payer} ` : ''}paid with wallet`,
14281428
automaticallyPaidWithExpensify: (payer?: string) =>
14291429
`${payer ? `${payer} ` : ''}paid with Expensify via <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">workspace rules</a>`,
1430+
reimbursedThisReport: 'reimbursed this report',
1431+
paidThisBill: 'paid this bill',
1432+
reimbursedOnBehalfOf: (actor: string) => `on behalf of ${actor}`,
1433+
reimbursedFromBankAccount: (debitBankAccount: string) => `from the bank account ending in ${debitBankAccount}`,
1434+
reimbursedSubmitterAddedBankAccount: (submitter: string) => `${submitter} added a bank account, taking report off hold. Reimbursement is initiated`,
1435+
reimbursedWithFastACH: ({
1436+
isCurrentUser,
1437+
submitterLogin,
1438+
creditBankAccount,
1439+
expectedDate,
1440+
}: {
1441+
isCurrentUser: boolean;
1442+
submitterLogin: string;
1443+
creditBankAccount: string;
1444+
expectedDate: string;
1445+
}) =>
1446+
isCurrentUser
1447+
? `. Money is on its way to your${creditBankAccount ? ` bank account ending in ${creditBankAccount}` : ' account'}. Reimbursement estimated to complete on ${expectedDate}.`
1448+
: `. Money is on its way to ${submitterLogin}'s${creditBankAccount ? ` bank account ending in ${creditBankAccount}` : ' account'}. Reimbursement estimated to complete on ${expectedDate}.`,
1449+
reimbursedWithCheck: ' via check.',
1450+
reimbursedWithStripeConnect: ({
1451+
isCurrentUser,
1452+
submitterLogin,
1453+
creditBankAccount,
1454+
isCard,
1455+
}: {
1456+
isCurrentUser: boolean;
1457+
submitterLogin: string;
1458+
creditBankAccount: string;
1459+
isCard: boolean;
1460+
}) => {
1461+
const paymentMethod = isCard ? 'card' : 'bank account';
1462+
return isCurrentUser
1463+
? `. Money is on its way to your${creditBankAccount ? ` bank account ending in ${creditBankAccount}` : ' account'} (paid via ${paymentMethod}). This could take up to 10 business days.`
1464+
: `. Money is on its way to ${submitterLogin}'s${creditBankAccount ? ` bank account ending in ${creditBankAccount}` : ' account'} (paid via ${paymentMethod}). This could take up to 10 business days.`;
1465+
},
1466+
reimbursedWithACH: ({creditBankAccount, expectedDate}: {creditBankAccount?: string; expectedDate?: string}) =>
1467+
` with direct deposit (ACH)${creditBankAccount ? ` to the bank account ending in ${creditBankAccount}. ` : '. '}${expectedDate ? `The reimbursement is estimated to complete by ${expectedDate}.` : 'This generally takes 4-5 business days.'}`,
14301468
noReimbursableExpenses: 'This report has an invalid amount',
14311469
pendingConversionMessage: "Total will update when you're back online",
14321470
changedTheExpense: 'changed the expense',

‎src/languages/es.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,6 +1309,44 @@ const translations: TranslationDeepObject<typeof en> = {
13091309
paidWithExpensify: (payer) => `${payer ? `${payer} ` : ''}pagó con la billetera`,
13101310
automaticallyPaidWithExpensify: (payer) =>
13111311
`${payer ? `${payer} ` : ''}pagó con Expensify via <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">reglas del espacio de trabajo</a>`,
1312+
reimbursedThisReport: 'reembolsó este informe',
1313+
paidThisBill: 'pagó esta factura',
1314+
reimbursedOnBehalfOf: (actor: string) => `en nombre de ${actor}`,
1315+
reimbursedFromBankAccount: (debitBankAccount: string) => `desde la cuenta bancaria terminada en ${debitBankAccount}`,
1316+
reimbursedSubmitterAddedBankAccount: (submitter: string) => `${submitter} añadió una cuenta bancaria, quitando el informe de espera. El reembolso se ha iniciado`,
1317+
reimbursedWithFastACH: ({
1318+
isCurrentUser,
1319+
submitterLogin,
1320+
creditBankAccount,
1321+
expectedDate,
1322+
}: {
1323+
isCurrentUser: boolean;
1324+
submitterLogin: string;
1325+
creditBankAccount: string;
1326+
expectedDate: string;
1327+
}) =>
1328+
isCurrentUser
1329+
? `. El dinero está en camino a tu${creditBankAccount ? ` cuenta bancaria terminada en ${creditBankAccount}` : ' cuenta'}. Se estima que el reembolso se completará el ${expectedDate}.`
1330+
: `. El dinero está en camino a la cuenta bancaria de ${submitterLogin}${creditBankAccount ? ` terminada en ${creditBankAccount}` : ''}. Se estima que el reembolso se completará el ${expectedDate}.`,
1331+
reimbursedWithCheck: ' mediante cheque.',
1332+
reimbursedWithStripeConnect: ({
1333+
isCurrentUser,
1334+
submitterLogin,
1335+
creditBankAccount,
1336+
isCard,
1337+
}: {
1338+
isCurrentUser: boolean;
1339+
submitterLogin: string;
1340+
creditBankAccount: string;
1341+
isCard: boolean;
1342+
}) => {
1343+
const paymentMethod = isCard ? 'tarjeta' : 'cuenta bancaria';
1344+
return isCurrentUser
1345+
? `. El dinero está en camino a tu${creditBankAccount ? ` cuenta bancaria terminada en ${creditBankAccount}` : ' cuenta'} (pagado mediante ${paymentMethod}). Esto puede tardar hasta 10 días hábiles.`
1346+
: `. El dinero está en camino a la cuenta bancaria de ${submitterLogin}${creditBankAccount ? ` terminada en ${creditBankAccount}` : ''} (pagado mediante ${paymentMethod}). Esto puede tardar hasta 10 días hábiles.`;
1347+
},
1348+
reimbursedWithACH: ({creditBankAccount, expectedDate}: {creditBankAccount?: string; expectedDate?: string}) =>
1349+
` con depósito directo (ACH)${creditBankAccount ? ` a la cuenta bancaria terminada en ${creditBankAccount}. ` : '. '}${expectedDate ? `Se estima que el reembolso se completará para el ${expectedDate}.` : 'Esto generalmente toma de 4 a 5 días hábiles.'}`,
13121350
noReimbursableExpenses: 'El importe de este informe no es válido',
13131351
pendingConversionMessage: 'El total se actualizará cuando estés online',
13141352
changedTheExpense: 'cambió el gasto',

‎src/languages/fr.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,6 +1376,44 @@ const translations: TranslationDeepObject<typeof en> = {
13761376
paidWithExpensify: (payer?: string) => `${payer ? `${payer} ` : ''}payé avec le portefeuille`,
13771377
automaticallyPaidWithExpensify: (payer?: string) =>
13781378
`${payer ? `${payer} ` : ''}payé avec Expensify via les <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">règles de l’espace de travail</a>`,
1379+
reimbursedThisReport: 'a remboursé cette note de frais',
1380+
paidThisBill: 'a payé cette facture',
1381+
reimbursedOnBehalfOf: (actor: string) => `au nom de ${actor}`,
1382+
reimbursedFromBankAccount: (debitBankAccount: string) => `à partir du compte bancaire se terminant par ${debitBankAccount}`,
1383+
reimbursedSubmitterAddedBankAccount: (submitter: string) => `${submitter} a ajouté un compte bancaire, retirant la note de frais de la mise en attente. Le remboursement est lancé`,
1384+
reimbursedWithFastACH: ({
1385+
isCurrentUser,
1386+
submitterLogin,
1387+
creditBankAccount,
1388+
expectedDate,
1389+
}: {
1390+
isCurrentUser: boolean;
1391+
submitterLogin: string;
1392+
creditBankAccount: string;
1393+
expectedDate: string;
1394+
}) =>
1395+
isCurrentUser
1396+
? `. L’argent est en route vers votre ${creditBankAccount ? `compte bancaire se terminant par ${creditBankAccount}` : 'compte'}. Remboursement estimé pour être terminé le ${expectedDate}.`
1397+
: `. L’argent est en route vers le compte bancaire de ${submitterLogin}${creditBankAccount ? ` se terminant par ${creditBankAccount}` : ''}. Remboursement estimé pour le ${expectedDate}.`,
1398+
reimbursedWithCheck: ' par chèque.',
1399+
reimbursedWithStripeConnect: ({
1400+
isCurrentUser,
1401+
submitterLogin,
1402+
creditBankAccount,
1403+
isCard,
1404+
}: {
1405+
isCurrentUser: boolean;
1406+
submitterLogin: string;
1407+
creditBankAccount: string;
1408+
isCard: boolean;
1409+
}) => {
1410+
const paymentMethod = isCard ? 'carte' : 'compte bancaire';
1411+
return isCurrentUser
1412+
? `. L’argent est en route vers votre ${creditBankAccount ? `compte bancaire se terminant par ${creditBankAccount}` : 'compte'} (payé via ${paymentMethod}). Cela peut prendre jusqu’à 10 jours ouvrables.`
1413+
: `. L’argent est en route vers le compte bancaire de ${submitterLogin}${creditBankAccount ? ` se terminant par ${creditBankAccount}` : ''} (payé via ${paymentMethod}). Cela peut prendre jusqu’à 10 jours ouvrés.`;
1414+
},
1415+
reimbursedWithACH: ({creditBankAccount, expectedDate}: {creditBankAccount?: string; expectedDate?: string}) =>
1416+
` par dépôt direct (ACH)${creditBankAccount ? ` vers le compte bancaire se terminant par ${creditBankAccount}.` : '. '}${expectedDate ? `Le remboursement devrait être terminé d'ici le ${expectedDate}.` : 'Cela prend généralement 4 à 5 jours ouvrables.'}`,
13791417
noReimbursableExpenses: 'Cette note de frais a un montant non valide',
13801418
pendingConversionMessage: 'Le total sera mis à jour quand vous serez de nouveau en ligne',
13811419
changedTheExpense: 'a modifié la dépense',

‎src/languages/it.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,6 +1372,44 @@ const translations: TranslationDeepObject<typeof en> = {
13721372
paidWithExpensify: (payer?: string) => `${payer ? `${payer} ` : ''}pagato con portafoglio`,
13731373
automaticallyPaidWithExpensify: (payer?: string) =>
13741374
`${payer ? `${payer} ` : ''}pagato con Expensify tramite le <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">regole dello spazio di lavoro</a>`,
1375+
reimbursedThisReport: 'ha rimborsato questo resoconto',
1376+
paidThisBill: 'ha pagato questa fattura',
1377+
reimbursedOnBehalfOf: (actor: string) => `per conto di ${actor}`,
1378+
reimbursedFromBankAccount: (debitBankAccount: string) => `dal conto bancario che termina con ${debitBankAccount}`,
1379+
reimbursedSubmitterAddedBankAccount: (submitter: string) => `${submitter} ha aggiunto un conto bancario, rimuovendo il blocco sul resoconto. Il rimborso è stato avviato`,
1380+
reimbursedWithFastACH: ({
1381+
isCurrentUser,
1382+
submitterLogin,
1383+
creditBankAccount,
1384+
expectedDate,
1385+
}: {
1386+
isCurrentUser: boolean;
1387+
submitterLogin: string;
1388+
creditBankAccount: string;
1389+
expectedDate: string;
1390+
}) =>
1391+
isCurrentUser
1392+
? `. Il denaro è in arrivo sul tuo ${creditBankAccount ? `conto bancario che termina con ${creditBankAccount}` : 'conto'}. Rimborso previsto per il ${expectedDate}.`
1393+
: `. Il denaro è in arrivo sul conto bancario di ${submitterLogin}${creditBankAccount ? ` che termina con ${creditBankAccount}` : ''}. Rimborso previsto per il ${expectedDate}.`,
1394+
reimbursedWithCheck: ' tramite assegno.',
1395+
reimbursedWithStripeConnect: ({
1396+
isCurrentUser,
1397+
submitterLogin,
1398+
creditBankAccount,
1399+
isCard,
1400+
}: {
1401+
isCurrentUser: boolean;
1402+
submitterLogin: string;
1403+
creditBankAccount: string;
1404+
isCard: boolean;
1405+
}) => {
1406+
const paymentMethod = isCard ? 'carta' : 'conto bancario';
1407+
return isCurrentUser
1408+
? `. Il denaro è in arrivo sul tuo ${creditBankAccount ? `conto bancario che termina con ${creditBankAccount}` : 'conto'} (pagato tramite ${paymentMethod}). Questo potrebbe richiedere fino a 10 giorni lavorativi.`
1409+
: `. Il denaro è in arrivo sul conto bancario di ${submitterLogin}${creditBankAccount ? ` che termina con ${creditBankAccount}` : ''} (pagato tramite ${paymentMethod}). Potrebbero volerci fino a 10 giorni lavorativi.`;
1410+
},
1411+
reimbursedWithACH: ({creditBankAccount, expectedDate}: {creditBankAccount?: string; expectedDate?: string}) =>
1412+
` con accredito diretto (ACH)${creditBankAccount ? ` al conto bancario che termina con ${creditBankAccount}.` : '. '}${expectedDate ? `Il rimborso dovrebbe essere completato entro il ${expectedDate}.` : 'In genere richiede 4-5 giorni lavorativi.'}`,
13751413
noReimbursableExpenses: 'Questo rendiconto contiene un importo non valido',
13761414
pendingConversionMessage: 'Il totale verrà aggiornato quando torni online',
13771415
changedTheExpense: 'ha modificato la spesa',

‎src/languages/ja.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,6 +1354,44 @@ const translations: TranslationDeepObject<typeof en> = {
13541354
paidWithExpensify: (payer?: string) => `${payer ? `${payer} ` : ''}ウォレットで支払い済み`,
13551355
automaticallyPaidWithExpensify: (payer?: string) =>
13561356
`${payer ? `${payer} ` : ''}は<a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">ワークスペースルール</a>経由でExpensifyにより支払われました`,
1357+
reimbursedThisReport: 'このレポートを精算しました',
1358+
paidThisBill: 'この請求書を支払いました',
1359+
reimbursedOnBehalfOf: (actor: string) => `${actor}に代わって`,
1360+
reimbursedFromBankAccount: (debitBankAccount: string) => `末尾が ${debitBankAccount} の銀行口座から`,
1361+
reimbursedSubmitterAddedBankAccount: (submitter: string) => `${submitter} さんが銀行口座を追加し、レポートの保留を解除しました。払い戻しを開始しました。`,
1362+
reimbursedWithFastACH: ({
1363+
isCurrentUser,
1364+
submitterLogin,
1365+
creditBankAccount,
1366+
expectedDate,
1367+
}: {
1368+
isCurrentUser: boolean;
1369+
submitterLogin: string;
1370+
creditBankAccount: string;
1371+
expectedDate: string;
1372+
}) =>
1373+
isCurrentUser
1374+
? `. ${creditBankAccount ? `預金口座（末尾番号 ${creditBankAccount}）` : 'アカウント'} にお金を送金中です。払い戻しは ${expectedDate} に完了する見込みです。`
1375+
: `. ${submitterLogin} さんへの${creditBankAccount ? `預金口座（末尾番号 ${creditBankAccount}）` : 'アカウント'}への送金中です。払い戻しの完了予定日は ${expectedDate} です。`,
1376+
reimbursedWithCheck: '小切手で',
1377+
reimbursedWithStripeConnect: ({
1378+
isCurrentUser,
1379+
submitterLogin,
1380+
creditBankAccount,
1381+
isCard,
1382+
}: {
1383+
isCurrentUser: boolean;
1384+
submitterLogin: string;
1385+
creditBankAccount: string;
1386+
isCard: boolean;
1387+
}) => {
1388+
const paymentMethod = isCard ? 'カード' : '銀行口座';
1389+
return isCurrentUser
1390+
? `. ${paymentMethod}で支払われた資金が、お客様の${creditBankAccount ? `預金口座（末尾番号 ${creditBankAccount}）` : 'アカウント'}に向けて送金中です。最大で10営業日かかる場合があります。`
1391+
: `. ${submitterLogin} さんの ${creditBankAccount ? `預金口座（末尾番号 ${creditBankAccount}）` : 'アカウント'} へ送金中です（${paymentMethod} で支払われます）。最大 10 営業日かかる場合があります。`;
1392+
},
1393+
reimbursedWithACH: ({creditBankAccount, expectedDate}: {creditBankAccount?: string; expectedDate?: string}) =>
1394+
`直接入金（ACH）で${creditBankAccount ? `${creditBankAccount}で終わる銀行口座へ。` : '. '}${expectedDate ? `払戻しは${expectedDate}までに完了する見込みです。` : '通常、営業日で4～5日かかります。'}`,
13571395
noReimbursableExpenses: 'このレポートには無効な金額が含まれています',
13581396
pendingConversionMessage: 'オンラインに戻ると合計が更新されます',
13591397
changedTheExpense: '経費を変更しました',

0 commit comments

Comments
 (0)