Skip to content

Commit 7ecefcb

Browse files
authored
Merge pull request #56188 from Expensify/dangrous-updateautofrequency
Translate auto-reporting frequency changelogs
2 parents 1cef8a6 + 737648d commit 7ecefcb

File tree

8 files changed

+62
-0
lines changed

8 files changed

+62
-0
lines changed

src/languages/en.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ import type {
175175
UnapproveWithIntegrationWarningParams,
176176
UnshareParams,
177177
UntilTimeParams,
178+
UpdateAutoReportingFrequencyParams,
178179
UpdatedTheDistanceMerchantParams,
179180
UpdatedTheRequestParams,
180181
UpdateRoleParams,
@@ -2706,6 +2707,15 @@ const translations = {
27062707
return 'Member';
27072708
}
27082709
},
2710+
frequency: {
2711+
manual: 'Manually',
2712+
instant: 'Instant',
2713+
immediate: 'Daily',
2714+
trip: 'By trip',
2715+
weekly: 'Weekly',
2716+
semimonthly: 'Twice a month',
2717+
monthly: 'Monthly',
2718+
},
27092719
planType: 'Plan type',
27102720
submitExpense: 'Submit your expenses below:',
27112721
defaultCategory: 'Default category',
@@ -5079,6 +5089,8 @@ const translations = {
50795089
leftWorkspace: ({nameOrEmail}: LeftWorkspaceParams) => `${nameOrEmail} left the workspace`,
50805090
removeMember: ({email, role}: AddEmployeeParams) => `removed ${role === 'member' || role === 'user' ? 'member' : 'admin'} ${email}`,
50815091
removedConnection: ({connectionName}: ConnectionNameParams) => `removed connection to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`,
5092+
updateAutoReportingFrequency: ({oldFrequency, newFrequency}: UpdateAutoReportingFrequencyParams) =>
5093+
`updated the submission frequency to "${newFrequency}" (previously "${oldFrequency}")`,
50825094
},
50835095
},
50845096
},

src/languages/es.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ import type {
174174
UnapproveWithIntegrationWarningParams,
175175
UnshareParams,
176176
UntilTimeParams,
177+
UpdateAutoReportingFrequencyParams,
177178
UpdatedTheDistanceMerchantParams,
178179
UpdatedTheRequestParams,
179180
UpdateRoleParams,
@@ -2731,6 +2732,15 @@ const translations = {
27312732
return 'Miembro';
27322733
}
27332734
},
2735+
frequency: {
2736+
manual: 'Manualmente',
2737+
instant: 'Instantáneo',
2738+
immediate: 'Diaria',
2739+
trip: 'Por viaje',
2740+
weekly: 'Semanal',
2741+
semimonthly: 'Dos veces al mes',
2742+
monthly: 'Mensual',
2743+
},
27342744
planType: 'Tipo de plan',
27352745
submitExpense: 'Envía tus gastos a continuación:',
27362746
defaultCategory: 'Categoría predeterminada',
@@ -5132,6 +5142,8 @@ const translations = {
51325142
leftWorkspace: ({nameOrEmail}: LeftWorkspaceParams) => `${nameOrEmail} salió del espacio de trabajo`,
51335143
removeMember: ({email, role}: AddEmployeeParams) => `eliminado ${role === 'miembro' || role === 'user' ? 'miembro' : 'administrador'} ${email}`,
51345144
removedConnection: ({connectionName}: ConnectionNameParams) => `eliminó la conexión a ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`,
5145+
updateAutoReportingFrequency: ({oldFrequency, newFrequency}: UpdateAutoReportingFrequencyParams) =>
5146+
`actualizó la frecuencia de envíos a "${newFrequency}" (previamente "${oldFrequency}")`,
51355147
},
51365148
},
51375149
},

src/languages/params.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,11 @@ type ConnectionNameParams = {
349349
connectionName: AllConnectionName;
350350
};
351351

352+
type UpdateAutoReportingFrequencyParams = {
353+
oldFrequency: string;
354+
newFrequency: string;
355+
};
356+
352357
type LastSyncDateParams = {
353358
connectionName: string;
354359
formattedDate: string;
@@ -810,6 +815,7 @@ export type {
810815
UpdateRoleParams,
811816
LeftWorkspaceParams,
812817
RemoveMemberParams,
818+
UpdateAutoReportingFrequencyParams,
813819
DateParams,
814820
FiltersAmountBetweenParams,
815821
StatementPageTitleParams,

src/libs/ReportActionsUtils.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,22 @@ function getPolicyChangeLogDeleteMemberMessage(reportAction: OnyxInputOrEntry<Re
17931793
return translateLocal('report.actions.type.removeMember', {email, role});
17941794
}
17951795

1796+
function isPolicyChangeLogUpdateAutoReportingFrequencyMessage(
1797+
reportAction: OnyxInputOrEntry<ReportAction>,
1798+
): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_REPORTING_FREQUENCY> {
1799+
return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_REPORTING_FREQUENCY);
1800+
}
1801+
1802+
function getPolicyChangeLogUpdateAutoReportingFrequencyMessage(reportAction: OnyxInputOrEntry<ReportAction>): string {
1803+
if (!isPolicyChangeLogUpdateAutoReportingFrequencyMessage(reportAction)) {
1804+
return '';
1805+
}
1806+
const originalMessage = getOriginalMessage(reportAction);
1807+
const oldFrequency = translateLocal(`workspace.common.frequency.${originalMessage?.oldFrequency}` as TranslationPaths);
1808+
const newFrequency = translateLocal(`workspace.common.frequency.${originalMessage?.newFrequency}` as TranslationPaths);
1809+
return translateLocal('report.actions.type.updateAutoReportingFrequency', {oldFrequency, newFrequency});
1810+
}
1811+
17961812
function getRemovedConnectionMessage(reportAction: OnyxEntry<ReportAction>): string {
17971813
if (!isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_INTEGRATION)) {
17981814
return '';
@@ -2026,6 +2042,7 @@ export {
20262042
getPolicyChangeLogAddEmployeeMessage,
20272043
getPolicyChangeLogChangeRoleMessage,
20282044
getPolicyChangeLogDeleteMemberMessage,
2045+
getPolicyChangeLogUpdateAutoReportingFrequencyMessage,
20292046
getPolicyChangeLogEmployeeLeftMessage,
20302047
getRenamedAction,
20312048
isCardIssuedAction,

src/libs/SidebarUtils.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import {
3030
getPolicyChangeLogChangeRoleMessage,
3131
getPolicyChangeLogDeleteMemberMessage,
3232
getPolicyChangeLogEmployeeLeftMessage,
33+
getPolicyChangeLogUpdateAutoReportingFrequencyMessage,
3334
getRemovedConnectionMessage,
3435
getRenamedAction,
3536
getReportAction,
@@ -557,6 +558,8 @@ function getOptionData({
557558
result.alternateText = getReportActionMessageText(lastAction) ?? '';
558559
} else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_INTEGRATION) {
559560
result.alternateText = getRemovedConnectionMessage(lastAction);
561+
} else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_REPORTING_FREQUENCY) {
562+
result.alternateText = getPolicyChangeLogUpdateAutoReportingFrequencyMessage(lastAction);
560563
} else {
561564
result.alternateText =
562565
lastMessageTextFromReport.length > 0

src/pages/home/report/ContextMenu/ContextMenuActions.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
getPolicyChangeLogAddEmployeeMessage,
3232
getPolicyChangeLogChangeRoleMessage,
3333
getPolicyChangeLogDeleteMemberMessage,
34+
getPolicyChangeLogUpdateAutoReportingFrequencyMessage,
3435
getRemovedConnectionMessage,
3536
getRenamedAction,
3637
getReportActionMessageText,
@@ -544,6 +545,8 @@ const ContextMenuActions: ContextMenuAction[] = [
544545
setClipboardMessage(getPolicyChangeLogChangeRoleMessage(reportAction));
545546
} else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_EMPLOYEE) {
546547
setClipboardMessage(getPolicyChangeLogDeleteMemberMessage(reportAction));
548+
} else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_REPORTING_FREQUENCY) {
549+
setClipboardMessage(getPolicyChangeLogUpdateAutoReportingFrequencyMessage(reportAction));
547550
} else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.DELETED_TRANSACTION) {
548551
setClipboardMessage(getDeletedTransactionMessage(reportAction));
549552
} else if (isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.INTEGRATION_SYNC_FAILED)) {

src/pages/home/report/PureReportActionItem.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ import {
5656
getPolicyChangeLogAddEmployeeMessage,
5757
getPolicyChangeLogChangeRoleMessage,
5858
getPolicyChangeLogDeleteMemberMessage,
59+
getPolicyChangeLogUpdateAutoReportingFrequencyMessage,
5960
getRemovedConnectionMessage,
6061
getRemovedFromApprovalChainMessage,
6162
getRenamedAction,
@@ -877,6 +878,8 @@ function PureReportActionItem({
877878
children = <ReportActionItemBasicMessage message={getPolicyChangeLogChangeRoleMessage(action)} />;
878879
} else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_EMPLOYEE) {
879880
children = <ReportActionItemBasicMessage message={getPolicyChangeLogDeleteMemberMessage(action)} />;
881+
} else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_AUTO_REPORTING_FREQUENCY) {
882+
children = <ReportActionItemBasicMessage message={getPolicyChangeLogUpdateAutoReportingFrequencyMessage(action)} />;
880883
} else if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.REMOVED_FROM_APPROVAL_CHAIN)) {
881884
children = <ReportActionItemBasicMessage message={getRemovedFromApprovalChainMessage(action)} />;
882885
} else if (

src/types/onyx/OriginalMessage.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,12 @@ type OriginalMessageChangeLog = {
278278

279279
/** Name of connection */
280280
connectionName?: AllConnectionName;
281+
282+
/** Old auto-reporting frequency */
283+
oldFrequency?: string;
284+
285+
/** New auto-reporting frequency */
286+
newFrequency?: string;
281287
};
282288

283289
/** Model of `join policy changelog` report action */

0 commit comments

Comments
 (0)