-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Adjust copy for various report actions #60171
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 1 commit
1b96e67
3aa87ed
6a2c41e
2c13b4e
05acc5b
33201c7
e86d44f
83de0da
e91fc4e
78870b6
93224bf
4a47a52
1e2cc81
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -1003,7 +1003,7 @@ const translations = { | |||||
submitAmount: ({amount}: RequestAmountParams) => `Submit ${amount}`, | ||||||
submittedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `submitted ${formattedAmount}${comment ? ` for ${comment}` : ''}`, | ||||||
automaticallySubmittedAmount: ({formattedAmount}: RequestedAmountMessageParams) => | ||||||
`automatically submitted ${formattedAmount} via <a href="${CONST.DELAYED_SUBMISSION_HELP_URL}">delayed submission</a>`, | ||||||
`submitted ${formattedAmount} via <a href="${CONST.SELECT_WORKFLOWS_HELP_URL}">delayed submissions</a>`, | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you also update the Spanish translation and the translation post on slack? |
||||||
trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `tracking ${formattedAmount}${comment ? ` for ${comment}` : ''}`, | ||||||
splitAmount: ({amount}: SplitAmountParams) => `split ${amount}`, | ||||||
didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `split ${formattedAmount}${comment ? ` for ${comment}` : ''}`, | ||||||
|
@@ -1018,12 +1018,10 @@ const translations = { | |||||
managerApprovedAmount: ({manager, amount}: ManagerApprovedAmountParams) => `${manager} approved ${amount}`, | ||||||
payerSettled: ({amount}: PayerSettledParams) => `paid ${amount}`, | ||||||
payerSettledWithMissingBankAccount: ({amount}: PayerSettledParams) => `paid ${amount}. Add a bank account to receive your payment.`, | ||||||
automaticallyApprovedAmount: ({amount}: ApprovedAmountParams) => | ||||||
`automatically approved ${amount} via <a href="${CONST.CONFIGURE_REIMBURSEMENT_SETTINGS_HELP_URL}">workspace rules</a>`, | ||||||
automaticallyApprovedAmount: ({amount}: ApprovedAmountParams) => `approved ${amount} via <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">workspace rules</a>`, | ||||||
approvedAmount: ({amount}: ApprovedAmountParams) => `approved ${amount}`, | ||||||
unapprovedAmount: ({amount}: UnapprovedParams) => `unapproved ${amount}`, | ||||||
automaticallyForwardedAmount: ({amount}: ForwardedAmountParams) => | ||||||
`automatically approved ${amount} via <a href="${CONST.CONFIGURE_REIMBURSEMENT_SETTINGS_HELP_URL}">workspace rules</a>`, | ||||||
automaticallyForwardedAmount: ({amount}: ForwardedAmountParams) => `approved ${amount} via <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">workspace rules</a>`, | ||||||
forwardedAmount: ({amount}: ForwardedAmountParams) => `approved ${amount}`, | ||||||
rejectedThisReport: 'rejected this report', | ||||||
waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `started settling up. Payment is on hold until ${submitterDisplayName} adds a bank account.`, | ||||||
|
@@ -1035,7 +1033,7 @@ const translations = { | |||||
paidElsewhereWithAmount: ({payer, amount}: PaidElsewhereWithAmountParams) => `${payer ? `${payer} ` : ''}paid ${amount} elsewhere`, | ||||||
paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer ? `${payer} ` : ''}paid ${amount} with Expensify`, | ||||||
automaticallyPaidWithExpensify: ({payer, amount}: PaidWithExpensifyWithAmountParams) => | ||||||
`${payer ? `${payer} ` : ''}automatically paid ${amount} with Expensify via <a href="${CONST.CONFIGURE_REIMBURSEMENT_SETTINGS_HELP_URL}">workspace rules</a>`, | ||||||
`${payer ? `${payer} ` : ''}paid ${amount} with Expensify via <a href="${CONST.CONFIGURE_EXPENSE_REPORT_RULES_HELP_URL}">workspace rules</a>`, | ||||||
noReimbursableExpenses: 'This report has an invalid amount', | ||||||
pendingConversionMessage: "Total will update when you're back online", | ||||||
changedTheExpense: 'changed the expense', | ||||||
|
@@ -5287,14 +5285,16 @@ const translations = { | |||||
`changed the workspace to ${toPolicyName}${fromPolicyName ? ` (previously ${fromPolicyName})` : ''}`, | ||||||
changeType: ({oldType, newType}: ChangeTypeParams) => `changed type from ${oldType} to ${newType}`, | ||||||
delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `sent this report to ${delegateUser} since ${originalManager} is on vacation`, | ||||||
exportedToCSV: `exported this report to CSV`, | ||||||
exportedToCSV: `exported to CSV`, | ||||||
exportedToIntegration: { | ||||||
automatic: ({label}: ExportedToIntegrationParams) => `exported this report to ${label}.`, | ||||||
automaticActionOne: ({label}: ExportedToIntegrationParams) => `automatically exported this report to ${label} via`, | ||||||
automaticActionTwo: 'accounting settings.', | ||||||
automatic: ({label}: ExportedToIntegrationParams) => `exported to ${label}`, | ||||||
automaticActionOne: ({label}: ExportedToIntegrationParams) => `exported to ${label} via`, | ||||||
automaticActionTwo: 'accounting settings', | ||||||
manual: ({label}: ExportedToIntegrationParams) => `marked this report as manually exported to ${label}.`, | ||||||
reimburseableLink: 'View out-of-pocket expenses.', | ||||||
nonReimbursableLink: 'View company card expenses.', | ||||||
automaticActionThree: 'and successfully created a record for', | ||||||
and: 'and', | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Lets use 'and' from a different string. We can use or make a common string for this. |
||||||
reimburseableLink: 'out-of-pocket expenses', | ||||||
nonReimbursableLink: 'company card expenses.', | ||||||
pending: ({label}: ExportedToIntegrationParams) => `started exporting this report to ${label}...`, | ||||||
}, | ||||||
integrationsMessage: ({errorMessage, label, linkText, linkURL}: IntegrationSyncFailedParams) => | ||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1795,14 +1795,25 @@ function getExportIntegrationActionFragments(reportAction: OnyxEntry<ReportActio | |
url: '', | ||
}); | ||
} | ||
|
||
if (!isPending) { | ||
result.push({ | ||
text: translateLocal('report.actions.type.exportedToIntegration.automaticActionThree'), | ||
url: '', | ||
}); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the condition |
||
if (reimbursableUrls.length === 1) { | ||
const shouldAddPeriod = nonReimbursableUrls.length === 0; | ||
result.push({ | ||
text: translateLocal('report.actions.type.exportedToIntegration.reimburseableLink'), | ||
text: translateLocal('report.actions.type.exportedToIntegration.reimburseableLink') + (shouldAddPeriod ? '.' : ''), | ||
url: reimbursableUrls.at(0) ?? '', | ||
}); | ||
} | ||
|
||
if (reimbursableUrls.length === 1 && nonReimbursableUrls.length) { | ||
result.push({ | ||
text: translateLocal('report.actions.type.exportedToIntegration.and'), | ||
url: '', | ||
}); | ||
} | ||
if (nonReimbursableUrls.length) { | ||
const text = translateLocal('report.actions.type.exportedToIntegration.nonReimbursableLink'); | ||
let url = ''; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think
DELAYED_SUBMISSION_HELP_URL
will be unused after declaring this, let's remove it if it is unused.