Skip to content

Commit bd95143

Browse files
amyevansamyevans
authored
Merge pull request Expensify#74152 from mohammadjafarinejad/fix/73417
Tags - Missing tag violation doesn't show tag name in error
2 parents a52088e + 44b4136 commit bd95143

16 files changed

Lines changed: 55 additions & 20 deletions

File tree

‎src/CONST/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3273,6 +3273,7 @@ const CONST = {
32733273
tags: {},
32743274
},
32753275
} as PolicyTagLists,
3276+
DEFAULT_TAG_NAME: 'Tag',
32763277
REQUIRE_RECEIPTS_OVER_OPTIONS: {
32773278
DEFAULT: 'default',
32783279
NEVER: 'never',

‎src/languages/de.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ import type {
235235
SubscriptionSettingsSummaryParams,
236236
SubscriptionSizeParams,
237237
SyncStageNameConnectionsParams,
238+
TagSelectionParams,
238239
TaskCreatedActionParams,
239240
TaxAmountParams,
240241
TermsParams,
@@ -1344,7 +1345,7 @@ const translations: TranslationDeepObject<typeof en> = {
13441345
movedFromPersonalSpace: ({workspaceName, reportName}: MovedFromPersonalSpaceParams) =>
13451346
`verschobene Ausgabe von persönlichem Bereich zu ${workspaceName ?? `chatten mit ${reportName}`}`,
13461347
movedToPersonalSpace: 'Ausgabe in den persönlichen Bereich verschoben',
1347-
tagSelection: 'Wählen Sie ein Tag aus, um Ihre Ausgaben besser zu organisieren.',
1348+
tagSelection: ({policyTagListName}: TagSelectionParams = {}) => `Wählen Sie ${policyTagListName ?? 'ein Tag'}, um Ihre Ausgaben besser zu organisieren.`,
13481349
categorySelection: 'Wählen Sie eine Kategorie, um Ihre Ausgaben besser zu organisieren.',
13491350
error: {
13501351
invalidCategoryLength: 'Der Kategoriename überschreitet 255 Zeichen. Bitte kürzen Sie ihn oder wählen Sie eine andere Kategorie.',

‎src/languages/en.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ import type {
224224
SubscriptionSettingsSummaryParams,
225225
SubscriptionSizeParams,
226226
SyncStageNameConnectionsParams,
227+
TagSelectionParams,
227228
TaskCreatedActionParams,
228229
TaxAmountParams,
229230
TermsParams,
@@ -1325,7 +1326,11 @@ const translations = {
13251326
threadPaySomeoneReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
13261327
movedFromPersonalSpace: ({workspaceName, reportName}: MovedFromPersonalSpaceParams) => `moved expense from personal space to ${workspaceName ?? `chat with ${reportName}`}`,
13271328
movedToPersonalSpace: 'moved expense to personal space',
1328-
tagSelection: 'Select a tag to better organize your spend.',
1329+
tagSelection: ({policyTagListName}: TagSelectionParams = {}) => {
1330+
const article = policyTagListName && StringUtils.startsWithVowel(policyTagListName) ? 'an' : 'a';
1331+
const tag = policyTagListName ?? 'tag';
1332+
return `Select ${article} ${tag} to better organize your spend.`;
1333+
},
13291334
categorySelection: 'Select a category to better organize your spend.',
13301335
error: {
13311336
invalidCategoryLength: 'The category name exceeds 255 characters. Please shorten it or choose a different category.',

‎src/languages/es.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {CONST as COMMON_CONST} from 'expensify-common';
22
import dedent from '@libs/StringUtils/dedent';
33
import CONST from '@src/CONST';
44
import type en from './en';
5-
import type {ViolationsRterParams} from './params';
5+
import type {TagSelectionParams, ViolationsRterParams} from './params';
66
import type {TranslationDeepObject} from './types';
77

88
/* eslint-disable max-len */
@@ -987,7 +987,7 @@ const translations: TranslationDeepObject<typeof en> = {
987987
threadPaySomeoneReportName: ({formattedAmount, comment}) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
988988
movedFromPersonalSpace: ({workspaceName, reportName}) => `movió el gasto desde su espacio personal a ${workspaceName ?? `un chat con ${reportName}`}`,
989989
movedToPersonalSpace: 'movió el gasto a su espacio personal',
990-
tagSelection: 'Selecciona una etiqueta para organizar mejor tus gastos.',
990+
tagSelection: ({policyTagListName}: TagSelectionParams = {}) => `Selecciona ${policyTagListName ?? 'una etiqueta'} para organizar mejor tus gastos.`,
991991
categorySelection: 'Selecciona una categoría para organizar mejor tus gastos.',
992992
error: {
993993
invalidCategoryLength: 'La longitud de la categoría escogida excede el máximo permitido (255). Por favor, escoge otra categoría o acorta la categoría primero.',

‎src/languages/fr.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ import type {
235235
SubscriptionSettingsSummaryParams,
236236
SubscriptionSizeParams,
237237
SyncStageNameConnectionsParams,
238+
TagSelectionParams,
238239
TaskCreatedActionParams,
239240
TaxAmountParams,
240241
TermsParams,
@@ -1348,7 +1349,7 @@ const translations: TranslationDeepObject<typeof en> = {
13481349
movedFromPersonalSpace: ({workspaceName, reportName}: MovedFromPersonalSpaceParams) =>
13491350
`déplacé la dépense de l'espace personnel vers ${workspaceName ?? `discuter avec ${reportName}`}`,
13501351
movedToPersonalSpace: "a déplacé la dépense vers l'espace personnel",
1351-
tagSelection: 'Sélectionnez une étiquette pour mieux organiser vos dépenses.',
1352+
tagSelection: ({policyTagListName}: TagSelectionParams = {}) => `Sélectionnez ${policyTagListName ?? 'une étiquette'} pour mieux organiser vos dépenses.`,
13521353
categorySelection: 'Sélectionnez une catégorie pour mieux organiser vos dépenses.',
13531354
error: {
13541355
invalidCategoryLength: 'Le nom de la catégorie dépasse 255 caractères. Veuillez le raccourcir ou choisir une autre catégorie.',

‎src/languages/it.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ import type {
235235
SubscriptionSettingsSummaryParams,
236236
SubscriptionSizeParams,
237237
SyncStageNameConnectionsParams,
238+
TagSelectionParams,
238239
TaskCreatedActionParams,
239240
TaxAmountParams,
240241
TermsParams,
@@ -1341,7 +1342,7 @@ const translations: TranslationDeepObject<typeof en> = {
13411342
threadPaySomeoneReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} inviato${comment ? `per ${comment}` : ''}`,
13421343
movedFromPersonalSpace: ({workspaceName, reportName}: MovedFromPersonalSpaceParams) => `spostato la spesa dallo spazio personale a ${workspaceName ?? `chatta con ${reportName}`}`,
13431344
movedToPersonalSpace: 'spesa spostata nello spazio personale',
1344-
tagSelection: 'Seleziona un tag per organizzare meglio le tue spese.',
1345+
tagSelection: ({policyTagListName}: TagSelectionParams = {}) => `Seleziona ${policyTagListName ?? 'un tag'} per organizzare meglio le tue spese.`,
13451346
categorySelection: 'Seleziona una categoria per organizzare meglio le tue spese.',
13461347
error: {
13471348
invalidCategoryLength: 'Il nome della categoria supera i 255 caratteri. Si prega di accorciarlo o scegliere una categoria diversa.',

‎src/languages/ja.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ import type {
235235
SubscriptionSettingsSummaryParams,
236236
SubscriptionSizeParams,
237237
SyncStageNameConnectionsParams,
238+
TagSelectionParams,
238239
TaskCreatedActionParams,
239240
TaxAmountParams,
240241
TermsParams,
@@ -1343,7 +1344,7 @@ const translations: TranslationDeepObject<typeof en> = {
13431344
threadPaySomeoneReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} 送信済み${comment ? `${comment} のために` : ''}`,
13441345
movedFromPersonalSpace: ({workspaceName, reportName}: MovedFromPersonalSpaceParams) => `個人スペースから${workspaceName ?? `${reportName}とチャットする`}に経費を移動しました。`,
13451346
movedToPersonalSpace: '経費を個人スペースに移動しました',
1346-
tagSelection: '支出をより整理するためにタグを選択してください。',
1347+
tagSelection: ({policyTagListName}: TagSelectionParams = {}) => `支出をより適切に整理するために、${policyTagListName ?? 'aタグ'} を選択してください。`,
13471348
categorySelection: '支出をより整理するためにカテゴリを選択してください。',
13481349
error: {
13491350
invalidCategoryLength: 'カテゴリ名が255文字を超えています。短くするか、別のカテゴリを選んでください。',

‎src/languages/nl.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ import type {
235235
SubscriptionSettingsSummaryParams,
236236
SubscriptionSizeParams,
237237
SyncStageNameConnectionsParams,
238+
TagSelectionParams,
238239
TaskCreatedActionParams,
239240
TaxAmountParams,
240241
TermsParams,
@@ -1342,7 +1343,7 @@ const translations: TranslationDeepObject<typeof en> = {
13421343
movedFromPersonalSpace: ({workspaceName, reportName}: MovedFromPersonalSpaceParams) =>
13431344
`verplaatste uitgave van persoonlijke ruimte naar ${workspaceName ?? `chat met ${reportName}`}`,
13441345
movedToPersonalSpace: 'verplaatste uitgave naar persoonlijke ruimte',
1345-
tagSelection: 'Selecteer een tag om uw uitgaven beter te organiseren.',
1346+
tagSelection: ({policyTagListName}: TagSelectionParams = {}) => `Selecteer ${policyTagListName ?? 'een tag'} om je uitgaven beter te organiseren.`,
13461347
categorySelection: 'Selecteer een categorie om uw uitgaven beter te organiseren.',
13471348
error: {
13481349
invalidCategoryLength: 'De categorienaam overschrijdt 255 tekens. Verkort deze of kies een andere categorie.',

‎src/languages/params.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ import type {DelegateRole} from '@src/types/onyx/Account';
55
import type {AllConnectionName, ConnectionName, PolicyConnectionSyncStage, SageIntacctMappingName} from '@src/types/onyx/Policy';
66
import type {ViolationDataType} from '@src/types/onyx/TransactionViolation';
77

8+
type TagSelectionParams = {
9+
policyTagListName?: string;
10+
};
11+
812
type AddressLineParams = {
913
lineNumber: number;
1014
};
@@ -1281,4 +1285,5 @@ export type {
12811285
NextStepParams,
12821286
ReportFieldParams,
12831287
FocusModeUpdateParams,
1288+
TagSelectionParams,
12841289
};

‎src/languages/pl.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ import type {
235235
SubscriptionSettingsSummaryParams,
236236
SubscriptionSizeParams,
237237
SyncStageNameConnectionsParams,
238+
TagSelectionParams,
238239
TaskCreatedActionParams,
239240
TaxAmountParams,
240241
TermsParams,
@@ -1340,8 +1341,8 @@ const translations: TranslationDeepObject<typeof en> = {
13401341
threadPaySomeoneReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} wysłano${comment ? `dla ${comment}` : ''}`,
13411342
movedFromPersonalSpace: ({workspaceName, reportName}: MovedFromPersonalSpaceParams) => `przeniesiono wydatek z przestrzeni osobistej do ${workspaceName ?? `czat z ${reportName}`}`,
13421343
movedToPersonalSpace: 'przeniesiono wydatek do przestrzeni osobistej',
1343-
tagSelection: 'Wybierz tag, aby lepiej zorganizować swoje wydatki.',
1344-
categorySelection: 'Wybierz kategorię, aby lepiej zorganizować swoje wydatki.',
1344+
tagSelection: ({policyTagListName}: TagSelectionParams = {}) => `Wybierz ${policyTagListName ?? 'tag'}, aby lepiej uporządkować swoje wydatki.`,
1345+
categorySelection: 'Wybierz kategorię, aby lepiej uporządkować swoje wydatki.',
13451346
error: {
13461347
invalidCategoryLength: 'Nazwa kategorii przekracza 255 znaków. Proszę ją skrócić lub wybrać inną kategorię.',
13471348
invalidTagLength: 'Nazwa tagu przekracza 255 znaków. Proszę skrócić ją lub wybrać inny tag.',

0 commit comments

Comments
 (0)