Skip to content

Commit cea6e72

Browse files
grgiagrgia
authored
Merge pull request Expensify#65503 from FitseTLT/fix-changed-workspace-copy-to-add-variation-without-policyName
Fix - Expense- "changed the workspace to" message becomes incomplete after leaving workspaces
2 parents 9f5c45d + 6f01462 commit cea6e72

10 files changed

Lines changed: 60 additions & 19 deletions

File tree

‎src/languages/de.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6153,8 +6153,12 @@ const translations = {
61536153
type: {
61546154
changeField: ({oldValue, newValue, fieldName}: ChangeFieldParams) => `geändert ${fieldName} von ${oldValue} zu ${newValue}`,
61556155
changeFieldEmpty: ({newValue, fieldName}: ChangeFieldParams) => `${fieldName} in ${newValue} geändert`,
6156-
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) =>
6157-
`hat den Arbeitsbereich in ${toPolicyName}${fromPolicyName ? `(vorher ${fromPolicyName})` : ''} geändert`,
6156+
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) => {
6157+
if (!toPolicyName) {
6158+
return `Arbeitsbereich geändert${fromPolicyName ? ` (zuvor ${fromPolicyName})` : ''}`;
6159+
}
6160+
return `Arbeitsbereich geändert zu ${toPolicyName}${fromPolicyName ? ` (zuvor ${fromPolicyName})` : ''}`;
6161+
},
61586162
changeType: ({oldType, newType}: ChangeTypeParams) => `Typ von ${oldType} zu ${newType} geändert`,
61596163
delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `diesen Bericht an ${delegateUser} gesendet, da ${originalManager} im Urlaub ist`,
61606164
exportedToCSV: `in CSV exportiert`,

‎src/languages/en.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6123,8 +6123,12 @@ const translations = {
61236123
type: {
61246124
changeField: ({oldValue, newValue, fieldName}: ChangeFieldParams) => `changed ${fieldName} from ${oldValue} to ${newValue}`,
61256125
changeFieldEmpty: ({newValue, fieldName}: ChangeFieldParams) => `changed ${fieldName} to ${newValue}`,
6126-
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) =>
6127-
`changed the workspace to ${toPolicyName}${fromPolicyName ? ` (previously ${fromPolicyName})` : ''}`,
6126+
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) => {
6127+
if (!toPolicyName) {
6128+
return `changed the workspace${fromPolicyName ? ` (previously ${fromPolicyName})` : ''}`;
6129+
}
6130+
return `changed the workspace to ${toPolicyName}${fromPolicyName ? ` (previously ${fromPolicyName})` : ''}`;
6131+
},
61286132
changeType: ({oldType, newType}: ChangeTypeParams) => `changed type from ${oldType} to ${newType}`,
61296133
delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `sent this report to ${delegateUser} since ${originalManager} is on vacation`,
61306134
exportedToCSV: `exported to CSV`,

‎src/languages/es.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6146,8 +6146,12 @@ const translations = {
61466146
type: {
61476147
changeField: ({oldValue, newValue, fieldName}: ChangeFieldParams) => `cambió ${fieldName} de ${oldValue} a ${newValue}`,
61486148
changeFieldEmpty: ({newValue, fieldName}: ChangeFieldParams) => `cambió ${fieldName} a ${newValue}`,
6149-
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) =>
6150-
`cambió el espacio de trabajo a ${toPolicyName}${fromPolicyName ? ` (previamente ${fromPolicyName})` : ''}`,
6149+
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) => {
6150+
if (!toPolicyName) {
6151+
return `cambió el espacio de trabajo${fromPolicyName ? ` (previamente ${fromPolicyName})` : ''}`;
6152+
}
6153+
return `cambió el espacio de trabajo a ${toPolicyName}${fromPolicyName ? ` (previamente ${fromPolicyName})` : ''}`;
6154+
},
61516155
changeType: ({oldType, newType}: ChangeTypeParams) => `cambió type de ${oldType} a ${newType}`,
61526156
delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `envié este informe a ${delegateUser} ya que ${originalManager} está de vacaciones`,
61536157
exportedToCSV: `exportado a CSV`,

‎src/languages/fr.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6164,8 +6164,12 @@ const translations = {
61646164
type: {
61656165
changeField: ({oldValue, newValue, fieldName}: ChangeFieldParams) => `modifié ${fieldName} de ${oldValue} à ${newValue}`,
61666166
changeFieldEmpty: ({newValue, fieldName}: ChangeFieldParams) => `changé ${fieldName} en ${newValue}`,
6167-
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) =>
6168-
`a changé l'espace de travail en ${toPolicyName}${fromPolicyName ? `(anciennement ${fromPolicyName})` : ''}`,
6167+
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) => {
6168+
if (!toPolicyName) {
6169+
return `Espace de travail modifié${fromPolicyName ? ` (auparavant ${fromPolicyName})` : ''}`;
6170+
}
6171+
return `Espace de travail modifié en ${toPolicyName}${fromPolicyName ? ` (auparavant ${fromPolicyName})` : ''}`;
6172+
},
61696173
changeType: ({oldType, newType}: ChangeTypeParams) => `changé le type de ${oldType} à ${newType}`,
61706174
delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `a envoyé ce rapport à ${delegateUser} puisque ${originalManager} est en vacances`,
61716175
exportedToCSV: `exporté en CSV`,

‎src/languages/it.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6167,8 +6167,12 @@ const translations = {
61676167
type: {
61686168
changeField: ({oldValue, newValue, fieldName}: ChangeFieldParams) => `modificato ${fieldName} da ${oldValue} a ${newValue}`,
61696169
changeFieldEmpty: ({newValue, fieldName}: ChangeFieldParams) => `modificato ${fieldName} in ${newValue}`,
6170-
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) =>
6171-
`cambiato l'area di lavoro in ${toPolicyName}${fromPolicyName ? `(in precedenza ${fromPolicyName})` : ''}`,
6170+
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) => {
6171+
if (!toPolicyName) {
6172+
return `Spazio di lavoro modificato${fromPolicyName ? ` (precedentemente ${fromPolicyName})` : ''}`;
6173+
}
6174+
return `Spazio di lavoro modificato in ${toPolicyName}${fromPolicyName ? ` (precedentemente ${fromPolicyName})` : ''}`;
6175+
},
61726176
changeType: ({oldType, newType}: ChangeTypeParams) => `cambiato tipo da ${oldType} a ${newType}`,
61736177
delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `inviato questo rapporto a ${delegateUser} poiché ${originalManager} è in vacanza`,
61746178
exportedToCSV: `esportato in CSV`,

‎src/languages/ja.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6126,8 +6126,12 @@ const translations = {
61266126
type: {
61276127
changeField: ({oldValue, newValue, fieldName}: ChangeFieldParams) => `${fieldName}を${oldValue}から${newValue}に変更しました`,
61286128
changeFieldEmpty: ({newValue, fieldName}: ChangeFieldParams) => `${fieldName}を${newValue}に変更しました`,
6129-
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) =>
6130-
`ワークスペースを${toPolicyName}${fromPolicyName ? `（以前は${fromPolicyName}）` : ''}に変更しました。`,
6129+
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) => {
6130+
if (!toPolicyName) {
6131+
return `ワークスペースを変更しました${fromPolicyName ? `（以前は ${fromPolicyName}）` : ''}`;
6132+
}
6133+
return `ワークスペースを${toPolicyName}に変更しました${fromPolicyName ? `（以前は ${fromPolicyName}）` : ''}`;
6134+
},
61316135
changeType: ({oldType, newType}: ChangeTypeParams) => `${oldType} から ${newType} にタイプを変更しました`,
61326136
delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `${originalManager}が休暇中のため、このレポートを${delegateUser}に送信しました。`,
61336137
exportedToCSV: `CSVにエクスポートされました`,

‎src/languages/nl.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6159,8 +6159,12 @@ const translations = {
61596159
type: {
61606160
changeField: ({oldValue, newValue, fieldName}: ChangeFieldParams) => `veranderde ${fieldName} van ${oldValue} naar ${newValue}`,
61616161
changeFieldEmpty: ({newValue, fieldName}: ChangeFieldParams) => `veranderd ${fieldName} naar ${newValue}`,
6162-
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) =>
6163-
`veranderde de werkruimte naar ${toPolicyName}${fromPolicyName ? `(vroeger ${fromPolicyName})` : ''}`,
6162+
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) => {
6163+
if (!toPolicyName) {
6164+
return `Werkruimte gewijzigd${fromPolicyName ? ` (voorheen ${fromPolicyName})` : ''}`;
6165+
}
6166+
return `Werkruimte gewijzigd naar ${toPolicyName}${fromPolicyName ? ` (voorheen ${fromPolicyName})` : ''}`;
6167+
},
61646168
changeType: ({oldType, newType}: ChangeTypeParams) => `veranderde type van ${oldType} naar ${newType}`,
61656169
delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `heeft dit rapport naar ${delegateUser} gestuurd omdat ${originalManager} op vakantie is.`,
61666170
exportedToCSV: `geëxporteerd naar CSV`,

‎src/languages/pl.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6144,8 +6144,12 @@ const translations = {
61446144
type: {
61456145
changeField: ({oldValue, newValue, fieldName}: ChangeFieldParams) => `zmieniono ${fieldName} z ${oldValue} na ${newValue}`,
61466146
changeFieldEmpty: ({newValue, fieldName}: ChangeFieldParams) => `zmieniono ${fieldName} na ${newValue}`,
6147-
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) =>
6148-
`zmieniono przestrzeń roboczą na ${toPolicyName}${fromPolicyName ? `(uprzednio ${fromPolicyName})` : ''}`,
6147+
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) => {
6148+
if (!toPolicyName) {
6149+
return `Zmieniono przestrzeń roboczą${fromPolicyName ? ` (wcześniej ${fromPolicyName})` : ''}`;
6150+
}
6151+
return `Zmieniono przestrzeń roboczą na ${toPolicyName}${fromPolicyName ? ` (wcześniej ${fromPolicyName})` : ''}`;
6152+
},
61496153
changeType: ({oldType, newType}: ChangeTypeParams) => `zmieniono typ z ${oldType} na ${newType}`,
61506154
delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `wysłał ten raport do ${delegateUser}, ponieważ ${originalManager} jest na urlopie`,
61516155
exportedToCSV: `wyeksportowano do CSV`,

‎src/languages/pt-BR.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6157,8 +6157,12 @@ const translations = {
61576157
type: {
61586158
changeField: ({oldValue, newValue, fieldName}: ChangeFieldParams) => `alterado ${fieldName} de ${oldValue} para ${newValue}`,
61596159
changeFieldEmpty: ({newValue, fieldName}: ChangeFieldParams) => `alterado ${fieldName} para ${newValue}`,
6160-
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) =>
6161-
`alterou o espaço de trabalho para ${toPolicyName}${fromPolicyName ? `(anteriormente ${fromPolicyName})` : ''}`,
6160+
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) => {
6161+
if (!toPolicyName) {
6162+
return `Espaço de trabalho alterado${fromPolicyName ? ` (anteriormente ${fromPolicyName})` : ''}`;
6163+
}
6164+
return `Espaço de trabalho alterado para ${toPolicyName}${fromPolicyName ? ` (anteriormente ${fromPolicyName})` : ''}`;
6165+
},
61626166
changeType: ({oldType, newType}: ChangeTypeParams) => `alterado o tipo de ${oldType} para ${newType}`,
61636167
delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `enviei este relatório para ${delegateUser} já que ${originalManager} está de férias`,
61646168
exportedToCSV: `exportado para CSV`,

‎src/languages/zh-hans.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6049,7 +6049,12 @@ const translations = {
60496049
type: {
60506050
changeField: ({oldValue, newValue, fieldName}: ChangeFieldParams) => `将${fieldName}从${oldValue}更改为${newValue}`,
60516051
changeFieldEmpty: ({newValue, fieldName}: ChangeFieldParams) => `将${fieldName}更改为${newValue}`,
6052-
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) => `将工作区更改为${toPolicyName}${fromPolicyName ? `（之前为 ${fromPolicyName}）` : ''}`,
6052+
changeReportPolicy: ({fromPolicyName, toPolicyName}: ChangeReportPolicyParams) => {
6053+
if (!toPolicyName) {
6054+
return `已更改工作区${fromPolicyName ? `（之前为 ${fromPolicyName}）` : ''}`;
6055+
}
6056+
return `已将工作区更改为 ${toPolicyName}${fromPolicyName ? `（之前为 ${fromPolicyName}）` : ''}`;
6057+
},
60536058
changeType: ({oldType, newType}: ChangeTypeParams) => `类型从${oldType}更改为${newType}`,
60546059
delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `由于${originalManager}正在休假，已将此报告发送给${delegateUser}。`,
60556060
exportedToCSV: `导出为CSV`,

0 commit comments

Comments
 (0)