Skip to content

Commit cd80be5

Browse files
BeamanatorBeamanator
authored
Merge pull request Expensify#67959 from gijoe0295/gijoe/65756
Display `memo` in OD when submitting report
2 parents a8ed945 + 6a4bfe2 commit cd80be5

17 files changed

Lines changed: 47 additions & 16 deletions

File tree

‎src/languages/de.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ import type {
210210
StripePaidParams,
211211
SubmitsToParams,
212212
SubmittedToVacationDelegateParams,
213+
SubmittedWithMemoParams,
213214
SubscriptionCommitmentParams,
214215
SubscriptionSettingsRenewsOnParams,
215216
SubscriptionSettingsSaveUpToParams,
@@ -1170,7 +1171,7 @@ const translations = {
11701171
sendInvoice: ({amount}: RequestAmountParams) => `Sende ${amount} Rechnung`,
11711172
submitAmount: ({amount}: RequestAmountParams) => `Einreichen ${amount}`,
11721173
expenseAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `${formattedAmount}${comment ? `für ${comment}` : ''}`,
1173-
submitted: `eingereicht`,
1174+
submitted: ({memo}: SubmittedWithMemoParams) => `eingereicht${memo ? `, sagte ${memo}` : ''}`,
11741175
automaticallySubmitted: `über <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">verzögerte Einreichungen</a> eingereicht`,
11751176
trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `tracking ${formattedAmount}${comment ? `für ${comment}` : ''}`,
11761177
splitAmount: ({amount}: SplitAmountParams) => `teilen ${amount}`,

‎src/languages/en.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ import type {
199199
StripePaidParams,
200200
SubmitsToParams,
201201
SubmittedToVacationDelegateParams,
202+
SubmittedWithMemoParams,
202203
SubscriptionCommitmentParams,
203204
SubscriptionSettingsRenewsOnParams,
204205
SubscriptionSettingsSaveUpToParams,
@@ -1157,7 +1158,7 @@ const translations = {
11571158
sendInvoice: ({amount}: RequestAmountParams) => `Send ${amount} invoice`,
11581159
submitAmount: ({amount}: RequestAmountParams) => `Submit ${amount}`,
11591160
expenseAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `${formattedAmount}${comment ? ` for ${comment}` : ''}`,
1160-
submitted: `submitted`,
1161+
submitted: ({memo}: SubmittedWithMemoParams) => `submitted${memo ? `, saying ${memo}` : ''}`,
11611162
automaticallySubmitted: `submitted via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">delay submissions</a>`,
11621163
trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `tracking ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
11631164
splitAmount: ({amount}: SplitAmountParams) => `split ${amount}`,

‎src/languages/es.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ import type {
197197
StripePaidParams,
198198
SubmitsToParams,
199199
SubmittedToVacationDelegateParams,
200+
SubmittedWithMemoParams,
200201
SubscriptionCommitmentParams,
201202
SubscriptionSettingsRenewsOnParams,
202203
SubscriptionSettingsSaveUpToParams,
@@ -1151,7 +1152,7 @@ const translations = {
11511152
sendInvoice: ({amount}: RequestAmountParams) => `Enviar factura de ${amount}`,
11521153
submitAmount: ({amount}: RequestAmountParams) => `Solicitar ${amount}`,
11531154
expenseAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `${formattedAmount}${comment ? ` para ${comment}` : ''}`,
1154-
submitted: `enviado`,
1155+
submitted: ({memo}: SubmittedWithMemoParams) => `enviado${memo ? `, dijo ${memo}` : ''}`,
11551156
automaticallySubmitted: `envió mediante <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">retrasar envíos</a>`,
11561157
trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `realizó un seguimiento de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
11571158
splitAmount: ({amount}: SplitAmountParams) => `dividir ${amount}`,

‎src/languages/fr.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ import type {
210210
StripePaidParams,
211211
SubmitsToParams,
212212
SubmittedToVacationDelegateParams,
213+
SubmittedWithMemoParams,
213214
SubscriptionCommitmentParams,
214215
SubscriptionSettingsRenewsOnParams,
215216
SubscriptionSettingsSaveUpToParams,
@@ -1174,7 +1175,7 @@ const translations = {
11741175
sendInvoice: ({amount}: RequestAmountParams) => `Envoyer une facture de ${amount}`,
11751176
submitAmount: ({amount}: RequestAmountParams) => `Soumettre ${amount}`,
11761177
expenseAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `${formattedAmount}${comment ? `pour ${comment}` : ''}`,
1177-
submitted: `soumis`,
1178+
submitted: ({memo}: SubmittedWithMemoParams) => `soumis${memo ? `, en disant ${memo}` : ''}`,
11781179
automaticallySubmitted: `soumis via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">soumissions différées</a>`,
11791180
trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `suivi ${formattedAmount}${comment ? `pour ${comment}` : ''}`,
11801181
splitAmount: ({amount}: SplitAmountParams) => `diviser ${amount}`,

‎src/languages/it.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ import type {
210210
StripePaidParams,
211211
SubmitsToParams,
212212
SubmittedToVacationDelegateParams,
213+
SubmittedWithMemoParams,
213214
SubscriptionCommitmentParams,
214215
SubscriptionSettingsRenewsOnParams,
215216
SubscriptionSettingsSaveUpToParams,
@@ -1168,7 +1169,7 @@ const translations = {
11681169
sendInvoice: ({amount}: RequestAmountParams) => `Invia fattura di ${amount}`,
11691170
submitAmount: ({amount}: RequestAmountParams) => `Invia ${amount}`,
11701171
expenseAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `${formattedAmount}${comment ? `per ${comment}` : ''}`,
1171-
submitted: `inviato`,
1172+
submitted: ({memo}: SubmittedWithMemoParams) => `inviato${memo ? `, dicendo: ${memo}` : ''}`,
11721173
automaticallySubmitted: `inviato tramite <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">invio ritardato</a>`,
11731174
trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `tracking ${formattedAmount}${comment ? `per ${comment}` : ''}`,
11741175
splitAmount: ({amount}: SplitAmountParams) => `dividi ${amount}`,

‎src/languages/ja.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ import type {
210210
StripePaidParams,
211211
SubmitsToParams,
212212
SubmittedToVacationDelegateParams,
213+
SubmittedWithMemoParams,
213214
SubscriptionCommitmentParams,
214215
SubscriptionSettingsRenewsOnParams,
215216
SubscriptionSettingsSaveUpToParams,
@@ -1170,7 +1171,7 @@ const translations = {
11701171
sendInvoice: ({amount}: RequestAmountParams) => `${amount} 請求書を送信`,
11711172
submitAmount: ({amount}: RequestAmountParams) => `${amount}を提出`,
11721173
expenseAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `${formattedAmount}${comment ? `${comment} のために` : ''}`,
1173-
submitted: `提出済み`,
1174+
submitted: ({memo}: SubmittedWithMemoParams) => `提出済み${memo ? `、次のように言って ${memo}` : ''}`,
11741175
automaticallySubmitted: `<a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">送信の遅延</a>を通じて送信されました`,
11751176
trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `tracking ${formattedAmount}${comment ? `${comment} のために` : ''}`,
11761177
splitAmount: ({amount}: SplitAmountParams) => `${amount} を分割`,

‎src/languages/nl.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ import type {
210210
StripePaidParams,
211211
SubmitsToParams,
212212
SubmittedToVacationDelegateParams,
213+
SubmittedWithMemoParams,
213214
SubscriptionCommitmentParams,
214215
SubscriptionSettingsRenewsOnParams,
215216
SubscriptionSettingsSaveUpToParams,
@@ -1169,7 +1170,7 @@ const translations = {
11691170
sendInvoice: ({amount}: RequestAmountParams) => `Verstuur ${amount} factuur`,
11701171
submitAmount: ({amount}: RequestAmountParams) => `Verstuur ${amount}`,
11711172
expenseAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `${formattedAmount}${comment ? `voor ${comment}` : ''}`,
1172-
submitted: `ingediend`,
1173+
submitted: ({memo}: SubmittedWithMemoParams) => `ingediend${memo ? `, zegt ${memo}` : ''}`,
11731174
automaticallySubmitted: `ingediend via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">vertraging indieningen</a>`,
11741175
trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `volgt ${formattedAmount}${comment ? `voor ${comment}` : ''}`,
11751176
splitAmount: ({amount}: SplitAmountParams) => `splitsen ${amount}`,

‎src/languages/params.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,6 +849,10 @@ type MergeFailureDescriptionGenericParams = {
849849
email: string;
850850
};
851851

852+
type SubmittedWithMemoParams = {
853+
memo?: string;
854+
};
855+
852856
export type {
853857
ContactMethodsRouteParams,
854858
ContactMethodParams,
@@ -1138,4 +1142,5 @@ export type {
11381142
MergeSuccessDescriptionParams,
11391143
MergeFailureUncreatedAccountDescriptionParams,
11401144
MergeFailureDescriptionGenericParams,
1145+
SubmittedWithMemoParams,
11411146
};

‎src/languages/pl.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ import type {
210210
StripePaidParams,
211211
SubmitsToParams,
212212
SubmittedToVacationDelegateParams,
213+
SubmittedWithMemoParams,
213214
SubscriptionCommitmentParams,
214215
SubscriptionSettingsRenewsOnParams,
215216
SubscriptionSettingsSaveUpToParams,
@@ -1167,7 +1168,7 @@ const translations = {
11671168
sendInvoice: ({amount}: RequestAmountParams) => `Wyślij fakturę na kwotę ${amount}`,
11681169
submitAmount: ({amount}: RequestAmountParams) => `Zatwierdź ${amount}`,
11691170
expenseAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `${formattedAmount}${comment ? `dla ${comment}` : ''}`,
1170-
submitted: `przesłano`,
1171+
submitted: ({memo}: SubmittedWithMemoParams) => `przesłano${memo ? `, mówiąc ${memo}` : ''}`,
11711172
automaticallySubmitted: `przesłane za pomocą <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">opóźnij zgłoszenia</a>`,
11721173
trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `śledzenie ${formattedAmount}${comment ? `dla ${comment}` : ''}`,
11731174
splitAmount: ({amount}: SplitAmountParams) => `podziel ${amount}`,

‎src/languages/pt-BR.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ import type {
210210
StripePaidParams,
211211
SubmitsToParams,
212212
SubmittedToVacationDelegateParams,
213+
SubmittedWithMemoParams,
213214
SubscriptionCommitmentParams,
214215
SubscriptionSettingsRenewsOnParams,
215216
SubscriptionSettingsSaveUpToParams,
@@ -1169,7 +1170,7 @@ const translations = {
11691170
sendInvoice: ({amount}: RequestAmountParams) => `Enviar fatura de ${amount}`,
11701171
submitAmount: ({amount}: RequestAmountParams) => `Enviar ${amount}`,
11711172
expenseAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `${formattedAmount}${comment ? `para ${comment}` : ''}`,
1172-
submitted: `enviado`,
1173+
submitted: ({memo}: SubmittedWithMemoParams) => `enviado${memo ? `, dizendo ${memo}` : ''}`,
11731174
automaticallySubmitted: `enviado via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">adiar envios</a>`,
11741175
trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `rastreamento ${formattedAmount}${comment ? `para ${comment}` : ''}`,
11751176
splitAmount: ({amount}: SplitAmountParams) => `dividir ${amount}`,

0 commit comments

Comments
 (0)