Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/BookTravelButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function BookTravelButton({text, shouldRenderErrorMessageBelowButton = false, ac

// The primary login of the user is where Spotnana sends the emails with booking confirmations, itinerary etc. It can't be a phone number.
if (!primaryContactMethod || Str.isSMSLogin(primaryContactMethod)) {
setErrorMessage(<RenderHTML html={translate('travel.phoneError', {phoneErrorMethodsRoute})} />);
setErrorMessage(<RenderHTML html={translate('travel.phoneError', phoneErrorMethodsRoute)} />);
return;
}

Expand Down
17 changes: 7 additions & 10 deletions src/components/ReportActionItem/ChronosOOOListActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,13 @@ function ChronosOOOListActions({reportID, action}: ChronosOOOListActionsProps) {
>
<Text style={styles.flexShrink1}>
{event.lengthInDays > 0
? translate('chronos.oooEventSummaryFullDay', {
summary: event.summary,
dayCount: event.lengthInDays,
date: DateUtils.formatToLongDateWithWeekday(end),
})
: translate('chronos.oooEventSummaryPartialDay', {
summary: event.summary,
timePeriod: `${DateUtils.formatToLocalTime(start)} - ${DateUtils.formatToLocalTime(end)}`,
date: DateUtils.formatToLongDateWithWeekday(end),
})}
? translate('chronos.oooEventSummaryFullDay', event.summary, event.lengthInDays, DateUtils.formatToLongDateWithWeekday(end))
: translate(
'chronos.oooEventSummaryPartialDay',
event.summary,
`${DateUtils.formatToLocalTime(start)} - ${DateUtils.formatToLocalTime(end)}`,
DateUtils.formatToLongDateWithWeekday(end),
)}
</Text>
<Button
small
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ function MoneyRequestReportPreviewContent({
paymentVerb = 'iou.payerSpent';
payerOrApproverName = getDisplayNameForParticipant({accountID: chatReport?.ownerAccountID, shouldUseShortForm: true, formatPhoneNumber});
}
return translate(paymentVerb, {payer: payerOrApproverName});
return translate(paymentVerb, payerOrApproverName);
}, [
isScanning,
numberOfPendingRequests,
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useGetReceiptPartnersIntegrationData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function useGetReceiptPartnersIntegrationData(policyID?: string)
case CONST.POLICY.RECEIPT_PARTNERS.NAME.UBER: {
return {
title: CONST.POLICY.RECEIPT_PARTNERS.NAME_USER_FRIENDLY[CONST.POLICY.RECEIPT_PARTNERS.NAME.UBER],
description: translate('workspace.receiptPartners.uber.subtitle', {organizationName: uber?.organizationName ?? ''}),
description: translate('workspace.receiptPartners.uber.subtitle', uber?.organizationName ?? ''),
icon: icons.Uber,
errorFields: uber?.errorFields,
errors: uber?.errors,
Expand Down
78 changes: 28 additions & 50 deletions src/languages/de.ts

Large diffs are not rendered by default.

81 changes: 28 additions & 53 deletions src/languages/en.ts

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions src/languages/es.ts

Large diffs are not rendered by default.

79 changes: 28 additions & 51 deletions src/languages/fr.ts

Large diffs are not rendered by default.

79 changes: 28 additions & 51 deletions src/languages/it.ts

Large diffs are not rendered by default.

80 changes: 28 additions & 52 deletions src/languages/ja.ts

Large diffs are not rendered by default.

81 changes: 28 additions & 53 deletions src/languages/nl.ts

Large diffs are not rendered by default.

87 changes: 1 addition & 86 deletions src/languages/params.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,6 @@ type SettleExpensifyCardParams = {
formattedAmount: string;
};

type PhoneErrorRouteParams = {
phoneErrorMethodsRoute: string;
};

type WorkspacesListRouteParams = {
workspacesListRoute: string;
};
Expand All @@ -126,14 +122,10 @@ type SplitAmountParams = {amount: string};

type UserSplitParams = {amount: string};

type PayerOwesParams = {payer: string};

type ManagerApprovedParams = {manager: string};

type ManagerApprovedAmountParams = {manager: string; amount: number | string};

type PayerPaidParams = {payer: string};

type PaidElsewhereParams = {payer?: string; comment?: string};

type WaitingOnBankAccountParams = {submitterDisplayName: string};
Expand All @@ -154,16 +146,12 @@ type NotAllowedExtensionParams = {allowedExtensions: string[]};

type TransferParams = {amount: string};

type NotYouParams = {user: string};

type WeSentYouMagicSignInLinkParams = {login: string; loginType: string};

type ToValidateLoginParams = {primaryLogin: string; secondaryLogin: string};

type NoLongerHaveAccessParams = {primaryLogin: string};

type OurEmailProviderParams = {login: string};

type UntilTimeParams = {time: string};

type StepCounterParams = {step: number; total?: number; text?: string};
Expand All @@ -174,22 +162,14 @@ type NewWorkspaceNameParams = {userName: string; workspaceNumber?: number};

type RoomNameReservedErrorParams = {reservedName: string};

type RenamedRoomActionParams = {oldName: string; newName: string; isExpenseReport: boolean; actorName?: string};

type RoomRenamedToParams = {newName: string};

type OOOEventSummaryFullDayParams = {summary: string; dayCount: number; date: string};

type OOOEventSummaryPartialDayParams = {summary: string; timePeriod: string; date: string};

type ParentNavigationSummaryParams = {reportName?: string; workspaceName?: string};

type SetTheRequestParams = {valueName: string; newValueToDisplay: string};

type SetTheDistanceMerchantParams = {translatedChangedField: string; newMerchant: string; newAmountToDisplay: string};

type RemovedTheRequestParams = {valueName: string; oldValueToDisplay: string};

type UpdatedTheRequestParams = {valueName: string; newValueToDisplay: string; oldValueToDisplay: string};

type UpdatedTheDistanceMerchantParams = {translatedChangedField: string; newMerchant: string; oldMerchant: string; newAmountToDisplay: string; oldAmountToDisplay: string};
Expand Down Expand Up @@ -235,8 +215,6 @@ type ViolationsProhibitedExpenseParams = {prohibitedExpenseTypes: string | strin

type ViolationsTaxOutOfPolicyParams = {taxName?: string} | undefined;

type PaySomeoneParams = {name?: string} | undefined;

type TaskCreatedActionParams = {title: string};

type OptionalParam<T> = Partial<T>;
Expand Down Expand Up @@ -305,12 +283,6 @@ type UpdatedPolicyCustomUnitRateEnabledParams = {customUnitName: string; customU

type UpdatedPolicyReportFieldDefaultValueParams = {fieldName?: string; defaultValue?: string};

type PolicyAddedReportFieldOptionParams = {fieldName?: string; optionName: string};

type PolicyDisabledReportFieldOptionParams = {fieldName: string; optionName: string; optionEnabled: boolean};

type PolicyDisabledReportFieldAllOptionsParams = {fieldName: string; optionName: string; allEnabled: boolean; toggledOptionsCount?: number};

type UpdatedPolicyApprovalRuleParams = {oldApproverEmail: string; oldApproverName?: string; newApproverEmail: string; newApproverName?: string; field: string; name: string};

type UpdatedPolicyPreventSelfApprovalParams = {oldValue: string; newValue: string};
Expand Down Expand Up @@ -408,15 +380,6 @@ type UnshareParams = {to: string};

type StripePaidParams = {amount: string; currency: string};

type RemoveMembersWarningPrompt = {
memberName: string;
ownerName: string;
};

type RemoveMemberPromptParams = {
memberName: string;
};

type IssueVirtualCardParams = {
assignee: string;
link: string;
Expand Down Expand Up @@ -468,12 +431,8 @@ type SecondaryLoginParams = {secondaryLogin: string};

type WorkspaceMembersCountParams = {count: number};

type OwnerOwesAmountParams = {amount: string; email: string};

type WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams = {workspaceOwnerName: string};

type RenamedWorkspaceNameActionParams = {oldName: string; newName: string};

type StatementTitleParams = {year: number | string; monthName: string};

type TrialStartedTitleParams = {numOfDays: number};
Expand Down Expand Up @@ -577,14 +536,6 @@ type SettlementDateParams = {
settlementDate: string;
};

type PolicyExpenseChatNameParams = {
displayName: string;
};

type ReceiptPartnersUberSubtitleParams = {
organizationName: string;
};

type ReviewParams = {
amount: string;
};
Expand All @@ -609,21 +560,11 @@ type TotalAmountGreaterOrLessThanOriginalParams = {
amount: string;
};

type RailTicketParams = {
origin: string;
destination: string;
startDate: string;
};

type TravelTypeParams = {
type: string;
id?: string;
};

type QBDSetupErrorBodyParams = {
conciergeLink: string;
};

type SettlementAccountInfoParams = {
reconciliationAccountSettingsLink: string;
accountNumber: string;
Expand Down Expand Up @@ -666,10 +607,6 @@ type SubmittedWithMemoParams = {
memo?: string;
};

type PayAndDowngradeDescriptionParams = {
formattedAmount: string;
};

type WalletAgreementParams = {
walletAgreementUrl: string;
};
Expand Down Expand Up @@ -724,11 +661,8 @@ export type {
SubscriptionSettingsSaveUpToParams,
SubscriptionSettingsRenewsOnParams,
TrialStartedTitleParams,
RemoveMemberPromptParams,
StatementTitleParams,
RenamedWorkspaceNameActionParams,
WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
OwnerOwesAmountParams,
SecondaryLoginParams,
TaxAmountParams,
CategoryNameParams,
Expand All @@ -752,19 +686,10 @@ export type {
SignUpNewFaceCodeParams,
NoLongerHaveAccessParams,
NotAllowedExtensionParams,
NotYouParams,
OOOEventSummaryFullDayParams,
OOOEventSummaryPartialDayParams,
OurEmailProviderParams,
ParentNavigationSummaryParams,
PaySomeoneParams,
PayerOwesParams,
RoleNamesParams,
PayerPaidParams,
PaidElsewhereParams,
RemovedTheRequestParams,
MovedFromReportParams,
RenamedRoomActionParams,
ReportArchiveReasonsClosedParams,
ReportArchiveReasonsMergedParams,
ReportPolicyNameParams,
Expand Down Expand Up @@ -826,7 +751,6 @@ export type {
UpdatedPolicyFieldWithValueParams,
UnshareParams,
StripePaidParams,
RemoveMembersWarningPrompt,
ConnectionNameParams,
LastSyncDateParams,
ExportAgainModalDescriptionParams,
Expand Down Expand Up @@ -866,15 +790,10 @@ export type {
UpdatedPolicyTagNameParams,
UpdatedPolicyTagFieldParams,
UpdatedPolicyReportFieldDefaultValueParams,
PolicyAddedReportFieldOptionParams,
PolicyDisabledReportFieldOptionParams,
PolicyDisabledReportFieldAllOptionsParams,
SubmitsToParams,
SettlementDateParams,
UpdatedPolicyCustomUnitSubRateParams,
RemovedPolicyCustomUnitSubRateParams,
PolicyExpenseChatNameParams,
ReceiptPartnersUberSubtitleParams,
UpdatedPolicyCustomUnitSubRateParams,
YourPlanPriceValueParams,
AddedOrDeletedPolicyReportFieldParams,
NeedCategoryForExportToIntegrationParams,
Expand All @@ -894,15 +813,12 @@ export type {
SubscriptionSettingsSummaryParams,
ReviewParams,
WorkspaceMembersCountParams,
RailTicketParams,
TravelTypeParams,
PhoneErrorRouteParams,
WorkspacesListRouteParams,
WorkspaceRouteParams,
AddBudgetParams,
UpdatedBudgetParams,
DeleteBudgetParams,
QBDSetupErrorBodyParams,
AddOrDeletePolicyCustomUnitRateParams,
SettlementAccountInfoParams,
MergeSuccessDescriptionParams,
Expand All @@ -916,7 +832,6 @@ export type {
UpgradeSuccessMessageParams,
SubmittedWithMemoParams,
SignerInfoMessageParams,
PayAndDowngradeDescriptionParams,
WalletAgreementParams,
SubscriptionSettingsLearnMoreParams,
MergeAccountIntoParams,
Expand Down
Loading
Loading