Skip to content

Commit 292605f

Browse files
authored
Merge pull request #36851 from Expensify/monil-fixHOLDTranslate
[CP Staging] Handle translations in hold money request workflow
2 parents eb26916 + b336cd3 commit 292605f

File tree

6 files changed

+20
-7
lines changed

6 files changed

+20
-7
lines changed

src/languages/en.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import type {
2626
FormattedMaxLengthParams,
2727
GoBackMessageParams,
2828
GoToRoomParams,
29+
HeldRequestParams,
2930
InstantSummaryParams,
3031
LocalTimeParams,
3132
LoggedInAsParams,
@@ -666,8 +667,10 @@ export default {
666667
waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Started settling up, payment is held until ${submitterDisplayName} enables their Wallet`,
667668
enableWallet: 'Enable Wallet',
668669
hold: 'Hold',
669-
holdRequest: 'Hold Request',
670-
unholdRequest: 'Unhold Request',
670+
holdRequest: 'Hold request',
671+
unholdRequest: 'Unhold request',
672+
heldRequest: ({comment}: HeldRequestParams) => `held this request with the comment: ${comment}`,
673+
unheldRequest: 'unheld this request',
671674
explainHold: "Explain why you're holding this request.",
672675
reason: 'Reason',
673676
holdReasonRequired: 'A reason is required when holding.',

src/languages/es.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import type {
2525
FormattedMaxLengthParams,
2626
GoBackMessageParams,
2727
GoToRoomParams,
28+
HeldRequestParams,
2829
InstantSummaryParams,
2930
LocalTimeParams,
3031
LoggedInAsParams,
@@ -660,8 +661,10 @@ export default {
660661
},
661662
waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Inició el pago, pero no se procesará hasta que ${submitterDisplayName} active su Billetera`,
662663
enableWallet: 'Habilitar Billetera',
663-
holdRequest: 'Bloquear solicitud de dinero',
664-
unholdRequest: 'Desbloquear solicitud de dinero',
664+
holdRequest: 'Bloquear solicitud',
665+
unholdRequest: 'Desbloquear solicitud',
666+
heldRequest: ({comment}: HeldRequestParams) => `bloqueó esta solicitud con el comentario: ${comment}`,
667+
unheldRequest: 'desbloqueó esta solicitud',
665668
explainHold: 'Explica la razón para bloquear esta solicitud.',
666669
reason: 'Razón',
667670
holdReasonRequired: 'Se requiere una razón para bloquear.',

src/languages/types.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,8 @@ type ElectronicFundsParams = {percentage: string; amount: string};
293293

294294
type LogSizeParams = {size: number};
295295

296+
type HeldRequestParams = {comment: string};
297+
296298
export type {
297299
AdminCanceledRequestParams,
298300
ApprovedAmountParams,
@@ -395,4 +397,5 @@ export type {
395397
WelcomeToRoomParams,
396398
ZipCodeExampleFormatParams,
397399
LogSizeParams,
400+
HeldRequestParams,
398401
};

src/libs/ReportUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3529,7 +3529,7 @@ function buildOptimisticHoldReportAction(comment: string, created = DateUtils.ge
35293529
{
35303530
type: CONST.REPORT.MESSAGE.TYPE.TEXT,
35313531
style: 'normal',
3532-
text: `held this money request with the comment: ${comment}`,
3532+
text: Localize.translateLocal('iou.heldRequest', {comment}),
35333533
},
35343534
{
35353535
type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
@@ -3564,7 +3564,7 @@ function buildOptimisticUnHoldReportAction(created = DateUtils.getDBTime()): Opt
35643564
{
35653565
type: CONST.REPORT.MESSAGE.TYPE.TEXT,
35663566
style: 'normal',
3567-
text: `unheld this money request`,
3567+
text: Localize.translateLocal('iou.unheldRequest'),
35683568
},
35693569
],
35703570
person: [

src/pages/home/report/ReportActionItem.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,10 @@ function ReportActionItem(props) {
466466
children = <ReportActionItemBasicMessage message={ModifiedExpenseMessage.getForReportAction(props.report.reportID, props.action)} />;
467467
} else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.MARKEDREIMBURSED) {
468468
children = <ReportActionItemBasicMessage message={ReportActionsUtils.getMarkedReimbursedMessage(props.action)} />;
469+
} else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
470+
children = <ReportActionItemBasicMessage message={props.translate('iou.heldRequest', {comment: lodashGet(props, 'action.message[1].text', '')})} />;
471+
} else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
472+
children = <ReportActionItemBasicMessage message={props.translate('iou.unheldRequest')} />;
469473
} else {
470474
const hasBeenFlagged =
471475
!_.contains([CONST.MODERATION.MODERATOR_DECISION_APPROVED, CONST.MODERATION.MODERATOR_DECISION_PENDING], moderationDecision) &&

src/pages/iou/HoldReasonPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ function HoldReasonPage({route}: HoldReasonPageProps) {
8484
valueType="string"
8585
name="comment"
8686
defaultValue={undefined}
87-
label="Reason"
87+
label={translate('iou.reason')}
8888
accessibilityLabel={translate('iou.reason')}
8989
autoFocus
9090
/>

0 commit comments

Comments
 (0)