Skip to content

Commit 9ce294d

Browse files
GonalsGonals
authored
Merge pull request #98350 from fedirjh/fix/98284-distance-unit-labels
Fix distance row unit labels
2 parents abf5ffb + bf6235b commit 9ce294d

16 files changed

Lines changed: 232 additions & 18 deletions

File tree

‎src/components/MoneyRequestConfirmationList/sections/DistanceField.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function DistanceField({
5252

5353
const displayUnit = unit ?? customUnit?.distanceUnit;
5454
const commuterExclusionData = DistanceRequestUtils.getCommuterExclusionDisplayData(customUnit, displayUnit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES);
55-
const displayTitle = DistanceRequestUtils.getDistanceForDisplay(hasRoute, distance, unit, translate, true, isManualDistanceRequest, commuterExclusionData);
55+
const displayTitle = DistanceRequestUtils.getDistanceForDisplay(hasRoute, distance, unit, translate, false, isManualDistanceRequest, commuterExclusionData);
5656
const {distanceToDisplayDescription, distanceToDisplayHintText} = DistanceRequestUtils.getDistanceDisplayDetailsWithCommuter(commuterExclusionData, displayUnit, translate);
5757

5858
return (

‎src/components/ReportActionItem/MoneyRequestView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ function MoneyRequestView({
614614
const commuterExclusionData = transaction?.comment?.originalTransactionID
615615
? null
616616
: DistanceRequestUtils.getCommuterExclusionDisplayData(transaction?.comment?.customUnit, distanceUnitValue);
617-
const distanceToDisplay = DistanceRequestUtils.getDistanceForDisplay(hasRoute, distance, unit, translate, true, isManualDistanceRequest, commuterExclusionData);
617+
const distanceToDisplay = DistanceRequestUtils.getDistanceForDisplay(hasRoute, distance, unit, translate, false, isManualDistanceRequest, commuterExclusionData);
618618
const {distanceToDisplayDescription, distanceToDisplayHintText} = DistanceRequestUtils.getDistanceDisplayDetailsWithCommuter(commuterExclusionData, distanceUnitValue, translate);
619619

620620
let merchantTitle = isEmptyMerchant ? '' : transactionMerchant;

‎src/languages/de.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9555,7 +9555,16 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
95559555
},
95569556
commuterExclusion: {
95579557
original: ({formattedDistance}: {formattedDistance: string}) => `Original: ${formattedDistance}`,
9558-
removedCommuterDistance: ({distance, unit}: {distance: string; unit: string}) => `${distance} Pendel-${unit} entfernt`,
9558+
removedCommuterDistance: {
9559+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES]: ({distance}: {distance: string}) => ({
9560+
one: `${distance} Pendelmeile entfernt`,
9561+
other: `${distance} Pendelmeilen entfernt`,
9562+
}),
9563+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]: ({distance}: {distance: string}) => ({
9564+
one: `${distance} Pendelkilometer entfernt`,
9565+
other: `${distance} Pendelkilometer entfernt`,
9566+
}),
9567+
},
95599568
systemMessage: ({distance, unit, workspaceDistanceSettingsLink}: {distance: string; unit: string; workspaceDistanceSettingsLink: string}) =>
95609569
`${distance} Pendl${unit} basierend auf ${workspaceDistanceSettingsLink ? `<a href="${workspaceDistanceSettingsLink}">Entfernungseinstellungen des Arbeitsbereichs</a>` : 'Arbeitsbereich-Entfernungseinstellungen'} entfernt.`,
95619570
},

‎src/languages/el.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9778,7 +9778,16 @@ ${reportName}`,
97789778
},
97799779
commuterExclusion: {
97809780
original: ({formattedDistance}: {formattedDistance: string}) => `Αρχικό: ${formattedDistance}`,
9781-
removedCommuterDistance: ({distance, unit}: {distance: string; unit: string}) => `Αφαιρέθηκαν ${distance} διαδρομές εκτός έδρας (${unit})`,
9781+
removedCommuterDistance: {
9782+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES]: ({distance}: {distance: string}) => ({
9783+
one: `Αφαιρέθηκε ${distance} μίλι μετακίνησης`,
9784+
other: `Αφαιρέθηκαν ${distance} μίλια μετακίνησης`,
9785+
}),
9786+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]: ({distance}: {distance: string}) => ({
9787+
one: `Αφαιρέθηκε ${distance} χιλιόμετρο μετακίνησης`,
9788+
other: `Καταργήθηκαν ${distance} χιλιόμετρα μετακίνησης`,
9789+
}),
9790+
},
97829791
systemMessage: ({distance, unit, workspaceDistanceSettingsLink}: {distance: string; unit: string; workspaceDistanceSettingsLink: string}) =>
97839792
`Αφαιρέθηκαν ${distance} διαδρομές μετακίνησης ${unit} βάσει του ${workspaceDistanceSettingsLink ? `<a href="${workspaceDistanceSettingsLink}">ρυθμίσεις απόστασης χώρου εργασίας</a>` : 'ρυθμίσεις απόστασης χώρου εργασίας'}.`,
97849793
},

‎src/languages/en.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9668,7 +9668,16 @@ const translations = {
96689668
},
96699669
commuterExclusion: {
96709670
original: ({formattedDistance}: {formattedDistance: string}) => `Original: ${formattedDistance}`,
9671-
removedCommuterDistance: ({distance, unit}: {distance: string; unit: string}) => `Removed ${distance} commuter ${unit}`,
9671+
removedCommuterDistance: {
9672+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES]: ({distance}: {distance: string}) => ({
9673+
one: `Removed ${distance} commuter mile`,
9674+
other: `Removed ${distance} commuter miles`,
9675+
}),
9676+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]: ({distance}: {distance: string}) => ({
9677+
one: `Removed ${distance} commuter kilometer`,
9678+
other: `Removed ${distance} commuter kilometers`,
9679+
}),
9680+
},
96729681
systemMessage: ({distance, unit, workspaceDistanceSettingsLink}: {distance: string; unit: string; workspaceDistanceSettingsLink: string}) =>
96739682
`Removed ${distance} commuter ${unit} based on ${workspaceDistanceSettingsLink ? `<a href="${workspaceDistanceSettingsLink}">workspace distance settings</a>` : 'workspace distance settings'}.`,
96749683
},

‎src/languages/es.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9842,7 +9842,16 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
98429842
},
98439843
commuterExclusion: {
98449844
original: ({formattedDistance}: {formattedDistance: string}) => `Original: ${formattedDistance}`,
9845-
removedCommuterDistance: ({distance, unit}: {distance: string; unit: string}) => `Se eliminaron ${distance} ${unit} de viaje diario`,
9845+
removedCommuterDistance: {
9846+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES]: ({distance}: {distance: string}) => ({
9847+
one: `Se eliminó ${distance} milla de trayecto al trabajo`,
9848+
other: `Eliminó ${distance} millas de trayecto al trabajo`,
9849+
}),
9850+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]: ({distance}: {distance: string}) => ({
9851+
one: `Se eliminó ${distance} kilómetro de desplazamiento laboral`,
9852+
other: `Eliminó ${distance} kilómetros de desplazamiento`,
9853+
}),
9854+
},
98469855
systemMessage: ({distance, unit, workspaceDistanceSettingsLink}: {distance: string; unit: string; workspaceDistanceSettingsLink: string}) =>
98479856
`Se eliminaron ${distance} ${unit} de desplazamiento en base a ${workspaceDistanceSettingsLink ? `<a href="${workspaceDistanceSettingsLink}">configuración de distancias del espacio de trabajo</a>` : 'ajustes de distancia del espacio de trabajo'}.`,
98489857
},

‎src/languages/fr.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9591,7 +9591,16 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
95919591
},
95929592
commuterExclusion: {
95939593
original: ({formattedDistance}: {formattedDistance: string}) => `Original : ${formattedDistance}`,
9594-
removedCommuterDistance: ({distance, unit}: {distance: string; unit: string}) => `${distance} unité(s) de trajet domicile-travail ${unit} supprimée(s)`,
9594+
removedCommuterDistance: {
9595+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES]: ({distance}: {distance: string}) => ({
9596+
one: `Suppression de ${distance} mile de trajet domicile-travail`,
9597+
other: `${distance} miles de trajet domicile-travail supprimés`,
9598+
}),
9599+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]: ({distance}: {distance: string}) => ({
9600+
one: `${distance} kilomètre de trajet domicile-travail supprimé`,
9601+
other: `${distance} kilomètres de trajet domicile-travail supprimés`,
9602+
}),
9603+
},
95959604
systemMessage: ({distance, unit, workspaceDistanceSettingsLink}: {distance: string; unit: string; workspaceDistanceSettingsLink: string}) =>
95969605
`${distance} ${unit} de trajet domicile-travail supprimé(s) en fonction de ${workspaceDistanceSettingsLink ? `<a href="${workspaceDistanceSettingsLink}">paramètres de distance de l’espace de travail</a>` : 'paramètres de distance de l’espace de travail'}.`,
95979606
},

‎src/languages/it.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9527,7 +9527,16 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
95279527
},
95289528
commuterExclusion: {
95299529
original: ({formattedDistance}: {formattedDistance: string}) => `Originale: ${formattedDistance}`,
9530-
removedCommuterDistance: ({distance, unit}: {distance: string; unit: string}) => `Rimossi ${distance} spostamenti pendolari in ${unit}`,
9530+
removedCommuterDistance: {
9531+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES]: ({distance}: {distance: string}) => ({
9532+
one: `Rimosso ${distance} miglio di tragitto pendolare`,
9533+
other: `Rimosse ${distance} miglia di pendolarismo`,
9534+
}),
9535+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]: ({distance}: {distance: string}) => ({
9536+
one: `Rimosso ${distance} chilometro di tragitto pendolare`,
9537+
other: `Rimossi ${distance} chilometri di pendolarismo`,
9538+
}),
9539+
},
95319540
systemMessage: ({distance, unit, workspaceDistanceSettingsLink}: {distance: string; unit: string; workspaceDistanceSettingsLink: string}) =>
95329541
`Rimossi ${distance} ${unit} per il pendolarismo in base a ${workspaceDistanceSettingsLink ? `<a href="${workspaceDistanceSettingsLink}">impostazioni distanza spazio di lavoro</a>` : 'impostazioni distanza spazio di lavoro'}.`,
95339542
},

‎src/languages/ja.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9402,7 +9402,16 @@ ${reportName}`,
94029402
},
94039403
commuterExclusion: {
94049404
original: ({formattedDistance}: {formattedDistance: string}) => `元の距離: ${formattedDistance}`,
9405-
removedCommuterDistance: ({distance, unit}: {distance: string; unit: string}) => `${distance} の通勤${unit}を削除しました`,
9405+
removedCommuterDistance: {
9406+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES]: ({distance}: {distance: string}) => ({
9407+
one: `${distance}マイルの通勤距離を削除しました`,
9408+
other: `${distance}マイルの通勤距離を削除しました`,
9409+
}),
9410+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]: ({distance}: {distance: string}) => ({
9411+
one: `${distance}キロメートルの通勤距離を削除しました`,
9412+
other: `${distance}キロメートルの通勤距離を削除しました`,
9413+
}),
9414+
},
94069415
systemMessage: ({distance, unit, workspaceDistanceSettingsLink}: {distance: string; unit: string; workspaceDistanceSettingsLink: string}) =>
94079416
`${workspaceDistanceSettingsLink ? `<a href="${workspaceDistanceSettingsLink}">ワークスペースの距離設定</a>` : 'ワークスペース距離設定'} に基づき、通勤距離 ${distance} ${unit} を削除しました。`,
94089417
},

‎src/languages/nl.ts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ const translations: TranslationDeepObject<typeof en> = {
299299
replace: 'Vervangen',
300300
distance: 'Afstand',
301301
mile: 'mijl',
302-
miles: 'mijl',
302+
miles: 'mijlen',
303303
kilometer: 'kilometer',
304304
kilometers: 'kilometers',
305305
recent: 'Recent',
@@ -9498,7 +9498,16 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
94989498
},
94999499
commuterExclusion: {
95009500
original: ({formattedDistance}: {formattedDistance: string}) => `Origineel: ${formattedDistance}`,
9501-
removedCommuterDistance: ({distance, unit}: {distance: string; unit: string}) => `${distance} woon-werk${unit} verwijderd`,
9501+
removedCommuterDistance: {
9502+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES]: ({distance}: {distance: string}) => ({
9503+
one: `${distance} woon-werkmijl verwijderd`,
9504+
other: `${distance} woon-werkmijlen verwijderd`,
9505+
}),
9506+
[CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS]: ({distance}: {distance: string}) => ({
9507+
one: `${distance} woon-werk kilometer verwijderd`,
9508+
other: `${distance} woon-werkkilometers verwijderd`,
9509+
}),
9510+
},
95029511
systemMessage: ({distance, unit, workspaceDistanceSettingsLink}: {distance: string; unit: string; workspaceDistanceSettingsLink: string}) =>
95039512
`${distance} woon-werk-${unit} verwijderd op basis van ${workspaceDistanceSettingsLink ? `<a href="${workspaceDistanceSettingsLink}">werkruimte-afstandsinstellingen</a>` : 'instelling voor werkruimte-afstand'}.`,
95049513
},

0 commit comments

Comments
 (0)