Skip to content

Commit 4c22c76

Browse files
tgolentgolen
authored
Merge pull request Expensify#75117 from nyomanjyotisa/issue-74752
Move enforcement settings to Workflows section
2 parents 469d0a4 + e8d922a commit 4c22c76

23 files changed

Lines changed: 107 additions & 52 deletions

‎src/CONST/index.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7038,6 +7038,30 @@ const CONST = {
70387038
name: undefined,
70397039
icon: undefined,
70407040
},
7041+
preventSelfApproval: {
7042+
id: 'preventSelfApproval' as const,
7043+
alias: 'prevent-self-approval',
7044+
name: 'Advanced Approvals' as const,
7045+
title: `workspace.upgrade.approvals.title` as const,
7046+
description: `workspace.upgrade.approvals.description` as const,
7047+
icon: 'AdvancedApprovalsSquare',
7048+
},
7049+
autoApproveCompliantReports: {
7050+
id: 'autoApproveCompliantReports' as const,
7051+
alias: 'auto-approve-compliant-reports',
7052+
name: 'Advanced Approvals' as const,
7053+
title: `workspace.upgrade.approvals.title` as const,
7054+
description: `workspace.upgrade.approvals.description` as const,
7055+
icon: 'AdvancedApprovalsSquare',
7056+
},
7057+
autoPayApprovedReports: {
7058+
id: 'autoPayApprovedReports' as const,
7059+
alias: 'auto-pay-approved-reports',
7060+
name: 'Advanced Approvals' as const,
7061+
title: `workspace.upgrade.approvals.title` as const,
7062+
description: `workspace.upgrade.approvals.description` as const,
7063+
icon: 'AdvancedApprovalsSquare',
7064+
},
70417065
categories: {
70427066
id: 'categories' as const,
70437067
alias: 'categories',

‎src/languages/de.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6217,7 +6217,7 @@ Fordere Spesendetails wie Belege und Beschreibungen an, lege Limits und Standard
62176217
adultEntertainment: 'Unterhaltung für Erwachsene',
62186218
},
62196219
expenseReportRules: {
6220-
title: 'Spesenabrechnungen',
6220+
title: 'Fortgeschritten',
62216221
subtitle: 'Automatisieren Sie die Einhaltung von Spesenrichtlinien, Genehmigungen und Zahlungen.',
62226222
preventSelfApprovalsTitle: 'Selbstgenehmigungen verhindern',
62236223
preventSelfApprovalsSubtitle: 'Verhindern Sie, dass Workspace-Mitglieder ihre eigenen Spesenberichte genehmigen.',
@@ -6234,8 +6234,7 @@ Fordere Spesendetails wie Belege und Beschreibungen an, lege Limits und Standard
62346234
autoPayApprovedReportsLockedSubtitle: 'Gehen Sie zu „Weitere Funktionen“ und aktivieren Sie „Workflows“, dann fügen Sie „Zahlungen“ hinzu, um diese Funktion freizuschalten.',
62356235
autoPayReportsUnderTitle: 'Berichte automatisch bezahlen unter',
62366236
autoPayReportsUnderDescription: 'Vollständig konforme Spesenabrechnungen unter diesem Betrag werden automatisch bezahlt.',
6237-
unlockFeatureEnableWorkflowsSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
6238-
`Gehe zu [weitere Funktionen](${moreFeaturesLink}) und aktiviere Workflows, dann füge ${featureName} hinzu, um diese Funktion freizuschalten.`,
6237+
unlockFeatureEnableWorkflowsSubtitle: ({featureName}: FeatureNameParams) => `Fügen Sie ${featureName} hinzu, um diese Funktion freizuschalten.`,
62396238
enableFeatureSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
62406239
`Gehe zu [Weitere Funktionen](${moreFeaturesLink}) und aktiviere ${featureName}, um diese Funktion freizuschalten.`,
62416240
},

‎src/languages/en.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6073,7 +6073,7 @@ const translations = {
60736073
adultEntertainment: 'Adult entertainment',
60746074
},
60756075
expenseReportRules: {
6076-
title: 'Expense reports',
6076+
title: 'Advanced',
60776077
subtitle: 'Automate expense report compliance, approvals, and payment.',
60786078
preventSelfApprovalsTitle: 'Prevent self-approvals',
60796079
preventSelfApprovalsSubtitle: 'Prevent workspace members from approving their own expense reports.',
@@ -6089,8 +6089,7 @@ const translations = {
60896089
autoPayApprovedReportsLockedSubtitle: 'Go to more features and enable workflows, then add payments to unlock this feature.',
60906090
autoPayReportsUnderTitle: 'Auto-pay reports under',
60916091
autoPayReportsUnderDescription: 'Fully compliant expense reports under this amount will be automatically paid.',
6092-
unlockFeatureEnableWorkflowsSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
6093-
`Go to [more features](${moreFeaturesLink}) and enable workflows, then add ${featureName} to unlock this feature.`,
6092+
unlockFeatureEnableWorkflowsSubtitle: ({featureName}: FeatureNameParams) => `Add ${featureName} to unlock this feature.`,
60946093
enableFeatureSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) => `Go to [more features](${moreFeaturesLink}) and enable ${featureName} to unlock this feature.`,
60956094
},
60966095
categoryRules: {

‎src/languages/es.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5730,7 +5730,7 @@ ${amount} para ${merchant} - ${date}`,
57305730
adultEntertainment: 'Entretenimiento para adultos',
57315731
},
57325732
expenseReportRules: {
5733-
title: 'Informes de gastos',
5733+
title: 'Avanzado',
57345734
subtitle: 'Automatiza el cumplimiento, la aprobación y el pago de los informes de gastos.',
57355735
preventSelfApprovalsTitle: 'Evitar autoaprobaciones',
57365736
preventSelfApprovalsSubtitle: 'Evita que los miembros del espacio de trabajo aprueben sus propios informes de gastos.',
@@ -5746,8 +5746,7 @@ ${amount} para ${merchant} - ${date}`,
57465746
autoPayApprovedReportsLockedSubtitle: 'Ve a más funciones y habilita flujos de trabajo, luego agrega pagos para desbloquear esta función.',
57475747
autoPayReportsUnderTitle: 'Pagar automáticamente informes por debajo de',
57485748
autoPayReportsUnderDescription: 'Los informes de gastos totalmente conformes por debajo de esta cantidad se pagarán automáticamente.',
5749-
unlockFeatureEnableWorkflowsSubtitle: ({featureName, moreFeaturesLink}) =>
5750-
`Ir a [más características](${moreFeaturesLink}) y habilita flujos de trabajo, luego agrega ${featureName} para desbloquear esta función.`,
5749+
unlockFeatureEnableWorkflowsSubtitle: ({featureName}) => `Añade ${featureName} para desbloquear esta función.`,
57515750
enableFeatureSubtitle: ({featureName, moreFeaturesLink}) => `Ir a [más características](${moreFeaturesLink}) y habilita ${featureName} para desbloquear esta función.`,
57525751
},
57535752
categoryRules: {

‎src/languages/fr.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6224,7 +6224,7 @@ Exigez des informations de dépense comme les reçus et les descriptions, défin
62246224
adultEntertainment: 'Divertissements pour adultes',
62256225
},
62266226
expenseReportRules: {
6227-
title: 'Notes de frais',
6227+
title: 'Avancé',
62286228
subtitle: 'Automatisez la conformité, les validations et le paiement des notes de frais.',
62296229
preventSelfApprovalsTitle: 'Empêcher les auto-approbations',
62306230
preventSelfApprovalsSubtitle: 'Empêcher les membres de l’espace de travail d’approuver leurs propres notes de frais.',
@@ -6240,8 +6240,7 @@ Exigez des informations de dépense comme les reçus et les descriptions, défin
62406240
autoPayApprovedReportsLockedSubtitle: 'Allez dans « Plus de fonctionnalités » et activez les workflows, puis ajoutez les paiements pour déverrouiller cette fonctionnalité.',
62416241
autoPayReportsUnderTitle: 'Rapports de paiement automatique sous',
62426242
autoPayReportsUnderDescription: 'Les notes de frais entièrement conformes en dessous de ce montant seront automatiquement réglées.',
6243-
unlockFeatureEnableWorkflowsSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
6244-
`Allez dans [plus de fonctionnalités](${moreFeaturesLink}) et activez les workflows, puis ajoutez ${featureName} pour déverrouiller cette fonctionnalité.`,
6243+
unlockFeatureEnableWorkflowsSubtitle: ({featureName}: FeatureNameParams) => `Ajoutez ${featureName} pour débloquer cette fonctionnalité.`,
62456244
enableFeatureSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
62466245
`Allez dans [plus de fonctionnalités](${moreFeaturesLink}) et activez ${featureName} pour déverrouiller cette fonctionnalité.`,
62476246
},

‎src/languages/it.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6195,7 +6195,7 @@ Richiedi dettagli di spesa come ricevute e descrizioni, imposta limiti e valori
61956195
adultEntertainment: 'Intrattenimento per adulti',
61966196
},
61976197
expenseReportRules: {
6198-
title: 'Note spese',
6198+
title: 'Avanzato',
61996199
subtitle: 'Automatizza la conformità delle note spese, le approvazioni e i pagamenti.',
62006200
preventSelfApprovalsTitle: 'Impedisci autoapprovazioni',
62016201
preventSelfApprovalsSubtitle: 'Impedisci ai membri dello spazio di lavoro di approvare i propri report spese.',
@@ -6211,8 +6211,7 @@ Richiedi dettagli di spesa come ricevute e descrizioni, imposta limiti e valori
62116211
autoPayApprovedReportsLockedSubtitle: 'Vai su Altre funzionalità e abilita i workflow, quindi aggiungi i pagamenti per sbloccare questa funzionalità.',
62126212
autoPayReportsUnderTitle: 'Pagamento automatico dei report inferiori a',
62136213
autoPayReportsUnderDescription: 'Le note spese completamente conformi inferiori a questo importo verranno rimborsate automaticamente.',
6214-
unlockFeatureEnableWorkflowsSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
6215-
`Vai a [altre funzionalità](${moreFeaturesLink}) e abilita i flussi di lavoro, quindi aggiungi ${featureName} per sbloccare questa funzionalità.`,
6214+
unlockFeatureEnableWorkflowsSubtitle: ({featureName}: FeatureNameParams) => `Aggiungi ${featureName} per sbloccare questa funzionalità.`,
62166215
enableFeatureSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
62176216
`Vai a [altre funzionalità](${moreFeaturesLink}) e abilita ${featureName} per sbloccare questa funzione.`,
62186217
},

‎src/languages/ja.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6158,7 +6158,7 @@ ${reportName}
61586158
adultEntertainment: 'アダルトエンターテインメント',
61596159
},
61606160
expenseReportRules: {
6161-
title: '経費精算書',
6161+
title: '上級',
61626162
subtitle: '経費精算レポートのコンプライアンス、承認、支払いを自動化します。',
61636163
preventSelfApprovalsTitle: '自己承認を防ぐ',
61646164
preventSelfApprovalsSubtitle: 'ワークスペースメンバーが自分自身の経費精算レポートを承認できないようにします。',
@@ -6174,8 +6174,7 @@ ${reportName}
61746174
autoPayApprovedReportsLockedSubtitle: '「その他の機能」に移動してワークフローを有効にし、その後「支払い」を追加してこの機能を有効化してください。',
61756175
autoPayReportsUnderTitle: '以下のレポートを自動支払い',
61766176
autoPayReportsUnderDescription: 'この金額以下の、要件を完全に満たした経費精算書は自動的に支払われます。',
6177-
unlockFeatureEnableWorkflowsSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
6178-
`[その他の機能](${moreFeaturesLink}) に移動してワークフローを有効にし、その後 ${featureName} を追加してこの機能を有効化してください。`,
6177+
unlockFeatureEnableWorkflowsSubtitle: ({featureName}: FeatureNameParams) => `${featureName} を追加して、この機能を有効にしてください。`,
61796178
enableFeatureSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
61806179
`[その他の機能](${moreFeaturesLink})に移動し、${featureName} を有効にしてこの機能をアンロックしてください。`,
61816180
},

‎src/languages/nl.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6183,7 +6183,7 @@ Vraag verplichte uitgavedetails zoals bonnetjes en beschrijvingen, stel limieten
61836183
adultEntertainment: 'Volwassenenentertainment',
61846184
},
61856185
expenseReportRules: {
6186-
title: 'Onkostendeclaraties',
6186+
title: 'Geavanceerd',
61876187
subtitle: 'Automatiseer naleving, goedkeuringen en betalingen van onkostendeclaraties.',
61886188
preventSelfApprovalsTitle: 'Zelfgoedkeuringen voorkomen',
61896189
preventSelfApprovalsSubtitle: 'Voorkom dat werkruimtedeelnemers hun eigen onkostendeclaraties goedkeuren.',
@@ -6199,8 +6199,7 @@ Vraag verplichte uitgavedetails zoals bonnetjes en beschrijvingen, stel limieten
61996199
autoPayApprovedReportsLockedSubtitle: 'Ga naar Meer functies en schakel Workflows in, voeg vervolgens Betalingen toe om deze functie te ontgrendelen.',
62006200
autoPayReportsUnderTitle: 'Rapporten automatisch betalen onder',
62016201
autoPayReportsUnderDescription: 'Volledig conforme onkostendeclaraties onder dit bedrag worden automatisch betaald.',
6202-
unlockFeatureEnableWorkflowsSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
6203-
`Ga naar [meer functies](${moreFeaturesLink}) en schakel workflows in, voeg vervolgens ${featureName} toe om deze functie te ontgrendelen.`,
6202+
unlockFeatureEnableWorkflowsSubtitle: ({featureName}: FeatureNameParams) => `Voeg ${featureName} toe om deze functie te ontgrendelen.`,
62046203
enableFeatureSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
62056204
`Ga naar [meer functies](${moreFeaturesLink}) en schakel ${featureName} in om deze functie te ontgrendelen.`,
62066205
},

‎src/languages/params.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ type AssignedCardParams = {
640640

641641
type FeatureNameParams = {
642642
featureName: string;
643-
moreFeaturesLink: string;
643+
moreFeaturesLink?: string;
644644
};
645645

646646
type AutoPayApprovedReportsLimitErrorParams = {

‎src/languages/pl.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6177,7 +6177,7 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
61776177
adultEntertainment: 'Rozrywka dla dorosłych',
61786178
},
61796179
expenseReportRules: {
6180-
title: 'Raporty wydatków',
6180+
title: 'Zaawansowany',
61816181
subtitle: 'Zautomatyzuj zgodność raportów wydatków, proces zatwierdzania i płatności.',
61826182
preventSelfApprovalsTitle: 'Zapobiegaj samodzielnym zatwierdzeniom',
61836183
preventSelfApprovalsSubtitle: 'Uniemożliwiaj członkom przestrzeni roboczej zatwierdzanie własnych raportów wydatków.',
@@ -6193,8 +6193,7 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
61936193
autoPayApprovedReportsLockedSubtitle: 'Przejdź do „Więcej funkcji” i włącz „Workflowy”, a następnie dodaj „Płatności”, aby odblokować tę funkcję.',
61946194
autoPayReportsUnderTitle: 'Automatycznie opłacaj raporty poniżej',
61956195
autoPayReportsUnderDescription: 'W pełni zgodne raporty wydatków poniżej tej kwoty zostaną automatycznie opłacone.',
6196-
unlockFeatureEnableWorkflowsSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
6197-
`Przejdź do [więcej funkcji](${moreFeaturesLink}) i włącz przepływy pracy, a następnie dodaj ${featureName}, aby odblokować tę funkcję.`,
6196+
unlockFeatureEnableWorkflowsSubtitle: ({featureName}: FeatureNameParams) => `Dodaj ${featureName}, aby odblokować tę funkcję.`,
61986197
enableFeatureSubtitle: ({featureName, moreFeaturesLink}: FeatureNameParams) =>
61996198
`Przejdź do [więcej funkcji](${moreFeaturesLink}) i włącz ${featureName}, aby odblokować tę funkcję.`,
62006199
},

0 commit comments

Comments
 (0)