Improve parity with Auth on checks for merging a transaction#97017
Draft
aldo-expensify wants to merge 1 commit into
Draft
Improve parity with Auth on checks for merging a transaction#97017aldo-expensify wants to merge 1 commit into
aldo-expensify wants to merge 1 commit into
Conversation
Contributor
🦜 Polyglot Parrot! 🦜Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues: View the translation diffdiff --git a/src/languages/de.ts b/src/languages/de.ts
index 1e5a4131ca3..8928159c06c 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -9716,6 +9716,8 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
customUnitRateOutOfDateRange: ({startDate, endDate}: {startDate: string; endDate: string}) => `Preis ist nur gültig von ${startDate} bis ${endDate}`,
customUnitRateOutOfDateRangeStartOnly: ({startDate}: {startDate: string}) => `Der Satz gilt erst ab dem ${startDate}`,
customUnitRateOutOfDateRangeEndOnly: ({endDate}: {endDate: string}) => `Satz gilt nur bis ${endDate}`,
+ cannotMergeDuplicates:
+ 'Sie können Ausgaben nur in Berichten zusammenführen, die offen sind oder auf die erste Genehmigung warten. Möglicherweise müssen Sie den Bericht zurückziehen, die Ausgaben zusammenführen und ihn dann erneut einreichen.',
},
reportViolations: {
[CONST.REPORT_VIOLATIONS.FIELD_REQUIRED]: (fieldName: string) => `${fieldName} ist erforderlich`,
diff --git a/src/languages/es.ts b/src/languages/es.ts
index e2dfef35175..26525b28d1c 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -9885,7 +9885,8 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
keepThisOne: 'Mantener éste',
confirmDetails: 'Confirma los detalles que conservas',
confirmDuplicatesInfo: 'Los duplicados que no conserves se mantendrán para que el remitente los elimine.',
- cannotMergeDuplicates: 'Solo puedes combinar gastos en informes que estén abiertos o pendientes de la primera aprobación. Es posible que debas retirar el informe, combinar los gastos y luego volver a enviarlo.',
+ cannotMergeDuplicates:
+ 'Solo puedes combinar gastos en informes que estén abiertos o pendientes de la primera aprobación. Es posible que tengas que retirar el informe, combinar los gastos y luego volver a enviarlo.',
hold: 'Este gasto está retenido',
resolvedDuplicates: 'resolvió el duplicado',
companyCardRequired: 'Se requieren compras con la tarjeta de la empresa.',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 664cee6663f..7a8fec58e79 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -9752,6 +9752,8 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
customUnitRateOutOfDateRange: ({startDate, endDate}: {startDate: string; endDate: string}) => `Le taux n’est valable que du ${startDate} au ${endDate}`,
customUnitRateOutOfDateRangeStartOnly: ({startDate}: {startDate: string}) => `Le taux n’est valable qu’à partir du ${startDate}`,
customUnitRateOutOfDateRangeEndOnly: ({endDate}: {endDate: string}) => `Le taux n’est valable que jusqu’au ${endDate}`,
+ cannotMergeDuplicates:
+ 'Vous pouvez uniquement fusionner des dépenses sur des notes de frais qui sont ouvertes ou en attente d’une première approbation. Vous devrez peut-être annuler la note de frais, fusionner les dépenses, puis la soumettre à nouveau.',
},
reportViolations: {
[CONST.REPORT_VIOLATIONS.FIELD_REQUIRED]: (fieldName: string) => `${fieldName} est obligatoire`,
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 6dc456a27c0..9920b54e474 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -9698,6 +9698,8 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
customUnitRateOutOfDateRange: ({startDate, endDate}: {startDate: string; endDate: string}) => `La tariffa è valida solo dal ${startDate} al ${endDate}`,
customUnitRateOutOfDateRangeStartOnly: ({startDate}: {startDate: string}) => `La tariffa è valida solo a partire dal ${startDate}`,
customUnitRateOutOfDateRangeEndOnly: ({endDate}: {endDate: string}) => `La tariffa è valida solo fino al ${endDate}`,
+ cannotMergeDuplicates:
+ 'Puoi unire le spese solo nei report che sono aperti o in attesa della prima approvazione. Potresti dover ritirare il report, unire le spese e poi inviarlo di nuovo.',
},
reportViolations: {
[CONST.REPORT_VIOLATIONS.FIELD_REQUIRED]: (fieldName: string) => `${fieldName} è obbligatorio`,
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 11db3c3def1..8022a937119 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -9570,6 +9570,8 @@ ${reportName}`,
customUnitRateOutOfDateRange: ({startDate, endDate}: {startDate: string; endDate: string}) => `料金は${startDate}から${endDate}までのみ有効です`,
customUnitRateOutOfDateRangeStartOnly: ({startDate}: {startDate: string}) => `料金は${startDate}からのみ有効です`,
customUnitRateOutOfDateRangeEndOnly: ({endDate}: {endDate: string}) => `料金は${endDate}までのみ有効です`,
+ cannotMergeDuplicates:
+ '経費をマージできるのは、ステータスが「オープン」または「一次承認待ち」のレポートのみです。レポートを一度取り下げてから経費をマージし、再提出する必要がある場合があります。',
},
reportViolations: {
[CONST.REPORT_VIOLATIONS.FIELD_REQUIRED]: (fieldName: string) => `${fieldName} は必須です`,
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index c774982e5ff..4f89e614a2b 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -9669,6 +9669,8 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
customUnitRateOutOfDateRange: ({startDate, endDate}: {startDate: string; endDate: string}) => `Tarief is alleen geldig van ${startDate} tot ${endDate}`,
customUnitRateOutOfDateRangeStartOnly: ({startDate}: {startDate: string}) => `Tarief is alleen geldig vanaf ${startDate}`,
customUnitRateOutOfDateRangeEndOnly: ({endDate}: {endDate: string}) => `Tarief is alleen geldig tot ${endDate}`,
+ cannotMergeDuplicates:
+ 'Je kunt alleen uitgaven samenvoegen in rapporten die open zijn of in afwachting van eerste goedkeuring. Je moet het rapport mogelijk intrekken, de uitgaven samenvoegen en het daarna opnieuw indienen.',
},
reportViolations: {
[CONST.REPORT_VIOLATIONS.FIELD_REQUIRED]: (fieldName: string) => `${fieldName} is verplicht`,
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index ac30cc2c6ef..0c15ad68ccb 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -9642,6 +9642,8 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
customUnitRateOutOfDateRange: ({startDate, endDate}: {startDate: string; endDate: string}) => `Stawka jest ważna tylko od ${startDate} do ${endDate}`,
customUnitRateOutOfDateRangeStartOnly: ({startDate}: {startDate: string}) => `Stawka jest ważna tylko od ${startDate}`,
customUnitRateOutOfDateRangeEndOnly: ({endDate}: {endDate: string}) => `Stawka jest ważna tylko do ${endDate}`,
+ cannotMergeDuplicates:
+ 'Możesz łączyć wydatki tylko w raportach, które są otwarte lub oczekują na pierwsze zatwierdzenie. Być może będziesz musiał wycofać raport, połączyć wydatki, a następnie wysłać go ponownie.',
},
reportViolations: {
[CONST.REPORT_VIOLATIONS.FIELD_REQUIRED]: (fieldName: string) => `Pole ${fieldName} jest wymagane`,
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index fe6a996bfcc..c4a1ebefa3c 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -9655,6 +9655,8 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
customUnitRateOutOfDateRange: ({startDate, endDate}: {startDate: string; endDate: string}) => `A tarifa só é válida de ${startDate} até ${endDate}`,
customUnitRateOutOfDateRangeStartOnly: ({startDate}: {startDate: string}) => `A tarifa só é válida a partir de ${startDate}`,
customUnitRateOutOfDateRangeEndOnly: ({endDate}: {endDate: string}) => `A tarifa só é válida até ${endDate}`,
+ cannotMergeDuplicates:
+ 'Você só pode mesclar despesas em relatórios que estejam abertos ou aguardando a primeira aprovação. Talvez seja necessário retirar o relatório, mesclar as despesas e depois enviá-lo novamente.',
},
reportViolations: {
[CONST.REPORT_VIOLATIONS.FIELD_REQUIRED]: (fieldName: string) => `${fieldName} é obrigatório`,
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 487d47fe761..79df9bb6384 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -9349,6 +9349,7 @@ ${reportName}`,
customUnitRateOutOfDateRange: ({startDate, endDate}: {startDate: string; endDate: string}) => `费率仅在 ${startDate} 至 ${endDate} 期间有效`,
customUnitRateOutOfDateRangeStartOnly: ({startDate}: {startDate: string}) => `费率仅自 ${startDate} 起有效`,
customUnitRateOutOfDateRangeEndOnly: ({endDate}: {endDate: string}) => `该费率仅在 ${endDate} 之前有效`,
+ cannotMergeDuplicates: '您只能在处于“打开”或“待初次审批”状态的报销单中合并报销。您可能需要先撤回报销单，合并报销后再重新提交。',
},
reportViolations: {
[CONST.REPORT_VIOLATIONS.FIELD_REQUIRED]: (fieldName: string) => `${fieldName} 为必填项`,
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
Fixed Issues
$ https://github.com/Expensify/Expensify/issues/630184
PROPOSAL:
Tests
Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectionAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari