From 66e2ac5df246ea1b746f26d72e79de89498f9582 Mon Sep 17 00:00:00 2001 From: ShareVB Date: Sun, 26 Jul 2026 10:55:55 +0200 Subject: [PATCH] fix(Units Converter): make units translatable Fix part of #484 --- src/components/UnitsConverter.vue | 15 +-- .../acceleration-converter.vue | 13 +- src/tools/angle-converter/angle-converter.vue | 12 +- src/tools/area-converter/area-converter.vue | 50 ++++---- .../energy-converter/energy-converter.vue | 60 ++++----- src/tools/force-converter/force-converter.vue | 56 ++++----- .../frequency-converter.vue | 20 +-- .../length-converter/length-converter.vue | 46 +++---- src/tools/mass-converter/mass-converter.vue | 56 ++++----- src/tools/power-converter/power-converter.vue | 34 ++--- .../pressure-converter/pressure-converter.vue | 70 +++++------ src/tools/speed-converter/speed-converter.vue | 10 +- .../volume-converter/volume-converter.vue | 116 +++++++++--------- .../volume-flow-rate-converter.vue | 81 ++++++------ 14 files changed, 325 insertions(+), 314 deletions(-) diff --git a/src/components/UnitsConverter.vue b/src/components/UnitsConverter.vue index c8f2b522..83bf70b0 100644 --- a/src/components/UnitsConverter.vue +++ b/src/components/UnitsConverter.vue @@ -4,7 +4,7 @@ import * as unitsconverter from 'units-converter'; const props = withDefaults( defineProps<{ - supportedUnits: { [key: string]: string }; + supportedUnits: { [key: string]: { value: string; label: string } }; defaultUnit: string; labelWidth?: string; unitMinWidth?: string; @@ -47,10 +47,11 @@ const SI_PREFIX_NAMES = [ const SI_PREFIX_NAMES_REGEX = new RegExp(`^(${SI_PREFIX_NAMES.join('|')})`); -const units = reactive>( +const units = reactive>( Object.entries(supportedUnits.value) - .map(([key, label]) => ({ - title: label, + .map(([key, { label, value }]) => ({ + eng_title: value, + local_title: label, unit: key, ref: 1, })) @@ -69,7 +70,7 @@ const filteredUnits = computed(() => { return Object.entries(units); } - return Object.entries(units).filter(([_, { title }]) => !SI_PREFIX_NAMES_REGEX.test(title)); + return Object.entries(units).filter(([_, { eng_title }]) => !SI_PREFIX_NAMES_REGEX.test(eng_title)); }); function update(key: string) { @@ -125,9 +126,9 @@ update(defaultUnit.value); {{ $t('tools.UnitsConverter.text.si-converter') }} - + - {{ title }} + {{ local_title }} diff --git a/src/tools/acceleration-converter/acceleration-converter.vue b/src/tools/acceleration-converter/acceleration-converter.vue index 026efa96..f1bec519 100644 --- a/src/tools/acceleration-converter/acceleration-converter.vue +++ b/src/tools/acceleration-converter/acceleration-converter.vue @@ -2,11 +2,16 @@ import UnitsConverter from '@/components/UnitsConverter.vue'; const supportedUnits = { - 'g-force': 'g-force', - 'm/s2': 'meter per second squared', -}; ; + 'g-force': { value: 'g-force', label: 'g-force' }, + 'm/s2': { value: 'meter per second squared', label: 'meter per second squared' }, +}; diff --git a/src/tools/angle-converter/angle-converter.vue b/src/tools/angle-converter/angle-converter.vue index 8c046bb9..acbee19b 100644 --- a/src/tools/angle-converter/angle-converter.vue +++ b/src/tools/angle-converter/angle-converter.vue @@ -2,12 +2,12 @@ import UnitsConverter from '@/components/UnitsConverter.vue'; const supportedUnits = { - deg: 'degree (°)', - rad: 'radian', - turn: 'turn', - gradian: 'gradian', - grad: 'grad', - gon: 'gon', + deg: { value: 'degree (°)', label: 'degree (°)' }, + rad: { value: 'radian', label: 'radian' }, + turn: { value: 'turn', label: 'turn' }, + gradian: { value: 'gradian', label: 'gradian' }, + grad: { value: 'grad', label: 'grad' }, + gon: { value: 'gon', label: 'gon' }, }; diff --git a/src/tools/area-converter/area-converter.vue b/src/tools/area-converter/area-converter.vue index bc61cb02..2a943458 100644 --- a/src/tools/area-converter/area-converter.vue +++ b/src/tools/area-converter/area-converter.vue @@ -2,31 +2,31 @@ import UnitsConverter from '@/components/UnitsConverter.vue'; const supportedUnits = { - 'm²': 'square meter', - 'Pm²': 'square petameter', - 'Tm²': 'square terameter', - 'Gm²': 'square gigameter', - 'Mm²': 'square megameter', - 'km²': 'square kilometer', - 'hm²': 'square hectometer', - 'dam²': 'square decameter', - 'dm²': 'square decimeter', - 'cm²': 'square centimeter', - 'mm²': 'square millimeter', - 'μm²': 'square micrometer', - 'nm²': 'square nanometer', - 'pm²': 'square picometer', - 'fm²': 'square femtometer', - 'ac': 'acre', - 'ca': 'centiare', - 'da': 'deciare', - 'are': 'are', - 'daa': 'decare', - 'ha': 'hectare', - 'ft²': 'square foot (/ft2/sq ft)', - 'in²': 'square inch (/in2/sq in)', - 'yd²': 'square yard (yd2/sq yd)', - 'mi²': 'square mile (mi2/sq mi)', + 'm²': { value: 'square meter', label: 'square meter' }, + 'Pm²': { value: 'square petameter', label: 'square petameter' }, + 'Tm²': { value: 'square terameter', label: 'square terameter' }, + 'Gm²': { value: 'square gigameter', label: 'square gigameter' }, + 'Mm²': { value: 'square megameter', label: 'square megameter' }, + 'km²': { value: 'square kilometer', label: 'square kilometer' }, + 'hm²': { value: 'square hectometer', label: 'square hectometer' }, + 'dam²': { value: 'square decameter', label: 'square decameter' }, + 'dm²': { value: 'square decimeter', label: 'square decimeter' }, + 'cm²': { value: 'square centimeter', label: 'square centimeter' }, + 'mm²': { value: 'square millimeter', label: 'square millimeter' }, + 'μm²': { value: 'square micrometer', label: 'square micrometer' }, + 'nm²': { value: 'square nanometer', label: 'square nanometer' }, + 'pm²': { value: 'square picometer', label: 'square picometer' }, + 'fm²': { value: 'square femtometer', label: 'square femtometer' }, + ac: { value: 'acre', label: 'acre' }, + ca: { value: 'centiare', label: 'centiare' }, + da: { value: 'deciare', label: 'deciare' }, + are: { value: 'are', label: 'are' }, + daa: { value: 'decare', label: 'decare' }, + ha: { value: 'hectare', label: 'hectare' }, + 'ft²': { value: 'square foot (/ft2/sq ft)', label: 'square foot (/ft2/sq ft)' }, + 'in²': { value: 'square inch (/in2/sq in)', label: 'square inch (/in2/sq in)' }, + 'yd²': { value: 'square yard (yd2/sq yd)', label: 'square yard (yd2/sq yd)' }, + 'mi²': { value: 'square mile (mi2/sq mi)', label: 'square mile (mi2/sq mi)' }, }; diff --git a/src/tools/energy-converter/energy-converter.vue b/src/tools/energy-converter/energy-converter.vue index fe749cf4..167fa595 100644 --- a/src/tools/energy-converter/energy-converter.vue +++ b/src/tools/energy-converter/energy-converter.vue @@ -2,36 +2,36 @@ import UnitsConverter from '@/components/UnitsConverter.vue'; const supportedUnits = { - J: 'joule', - PJ: 'petajoule', - TJ: 'terajoule', - GJ: 'gigajoule', - MJ: 'megajoule', - kJ: 'kilojoule', - hJ: 'hectojoule', - daJ: 'decajoule', - dJ: 'decijoule', - cJ: 'centijoule', - mJ: 'millijoule', - µJ: 'microjoule', - nJ: 'nanojoule', - pJ: 'picojoule', - fJ: 'femtojoule', - Wh: 'watt-hour', - PWh: 'petawatt-hour', - TWh: 'terawatt-hour', - GWh: 'gigawatt-hour', - MWh: 'megawatt-hour', - kWh: 'kilowatt-hour', - hWh: 'hectowatt-hour', - daWh: 'decawatt-hour', - dWh: 'deciwatt-hour', - cWh: 'centiwatt-hour', - mWh: 'milliwatt-hour', - µWh: 'microwatt-hour', - nWh: 'nanowatt-hour', - pWh: 'picowatt-hour', - fWh: 'femtowatt-hour', + J: { value: 'joule', label: 'joule' }, + PJ: { value: 'petajoule', label: 'petajoule' }, + TJ: { value: 'terajoule', label: 'terajoule' }, + GJ: { value: 'gigajoule', label: 'gigajoule' }, + MJ: { value: 'megajoule', label: 'megajoule' }, + kJ: { value: 'kilojoule', label: 'kilojoule' }, + hJ: { value: 'hectojoule', label: 'hectojoule' }, + daJ: { value: 'decajoule', label: 'decajoule' }, + dJ: { value: 'decijoule', label: 'decijoule' }, + cJ: { value: 'centijoule', label: 'centijoule' }, + mJ: { value: 'millijoule', label: 'millijoule' }, + µJ: { value: 'microjoule', label: 'microjoule' }, + nJ: { value: 'nanojoule', label: 'nanojoule' }, + pJ: { value: 'picojoule', label: 'picojoule' }, + fJ: { value: 'femtojoule', label: 'femtojoule' }, + Wh: { value: 'watt-hour', label: 'watt-hour' }, + PWh: { value: 'petawatt-hour', label: 'petawatt-hour' }, + TWh: { value: 'terawatt-hour', label: 'terawatt-hour' }, + GWh: { value: 'gigawatt-hour', label: 'gigawatt-hour' }, + MWh: { value: 'megawatt-hour', label: 'megawatt-hour' }, + kWh: { value: 'kilowatt-hour', label: 'kilowatt-hour' }, + hWh: { value: 'hectowatt-hour', label: 'hectowatt-hour' }, + daWh: { value: 'decawatt-hour', label: 'decawatt-hour' }, + dWh: { value: 'deciwatt-hour', label: 'deciwatt-hour' }, + cWh: { value: 'centiwatt-hour', label: 'centiwatt-hour' }, + mWh: { value: 'milliwatt-hour', label: 'milliwatt-hour' }, + µWh: { value: 'microwatt-hour', label: 'microwatt-hour' }, + nWh: { value: 'nanowatt-hour', label: 'nanowatt-hour' }, + pWh: { value: 'picowatt-hour', label: 'picowatt-hour' }, + fWh: { value: 'femtowatt-hour', label: 'femtowatt-hour' }, }; diff --git a/src/tools/force-converter/force-converter.vue b/src/tools/force-converter/force-converter.vue index a71d7add..c38b2114 100644 --- a/src/tools/force-converter/force-converter.vue +++ b/src/tools/force-converter/force-converter.vue @@ -2,34 +2,34 @@ import UnitsConverter from '@/components/UnitsConverter.vue'; const supportedUnits = { - N: 'newton', - PN: 'petanewton', - TN: 'teranewton', - GN: 'giganewton', - MN: 'meganewton', - kN: 'kilonewton', - hN: 'hectonewton', - daN: 'decanewton', - dN: 'decinewton', - cN: 'centinewton', - mN: 'millinewton', - µN: 'micronewton', - nN: 'nanonewton', - pN: 'piconewton', - fN: 'femtonewton', - dyn: 'dyne', - lbf: 'pound of force', - kip: 'kip', - klb: 'klb', - kipf: 'kipf', - klbf: 'klbf', - pdl: 'poundal', - kgf: 'kilogram-force', - kp: 'kilopond', - Mp: 'megapond', - tf: 'tonne-force', - 'metric tf': 'metric ton-force', - 'megagram-force': 'megagram-force', + N: { value: 'newton', label: 'newton' }, + PN: { value: 'petanewton', label: 'petanewton' }, + TN: { value: 'teranewton', label: 'teranewton' }, + GN: { value: 'giganewton', label: 'giganewton' }, + MN: { value: 'meganewton', label: 'meganewton' }, + kN: { value: 'kilonewton', label: 'kilonewton' }, + hN: { value: 'hectonewton', label: 'hectonewton' }, + daN: { value: 'decanewton', label: 'decanewton' }, + dN: { value: 'decinewton', label: 'decinewton' }, + cN: { value: 'centinewton', label: 'centinewton' }, + mN: { value: 'millinewton', label: 'millinewton' }, + µN: { value: 'micronewton', label: 'micronewton' }, + nN: { value: 'nanonewton', label: 'nanonewton' }, + pN: { value: 'piconewton', label: 'piconewton' }, + fN: { value: 'femtonewton', label: 'femtonewton' }, + dyn: { value: 'dyne', label: 'dyne' }, + lbf: { value: 'pound of force', label: 'pound of force' }, + kip: { value: 'kip', label: 'kip' }, + klb: { value: 'klb', label: 'klb' }, + kipf: { value: 'kipf', label: 'kipf' }, + klbf: { value: 'klbf', label: 'klbf' }, + pdl: { value: 'poundal', label: 'poundal' }, + kgf: { value: 'kilogram-force', label: 'kilogram-force' }, + kp: { value: 'kilopond', label: 'kilopond' }, + Mp: { value: 'megapond', label: 'megapond' }, + tf: { value: 'tonne-force', label: 'tonne-force' }, + 'metric tf': { value: 'metric ton-force', label: 'metric ton-force' }, + 'megagram-force': { value: 'megagram-force', label: 'megagram-force' }, }; diff --git a/src/tools/frequency-converter/frequency-converter.vue b/src/tools/frequency-converter/frequency-converter.vue index 2b75ea5d..fd84c1fe 100644 --- a/src/tools/frequency-converter/frequency-converter.vue +++ b/src/tools/frequency-converter/frequency-converter.vue @@ -2,16 +2,16 @@ import UnitsConverter from '@/components/UnitsConverter.vue'; const supportedUnits = { - 'Hz': 'hertz', - 'mHz': 'millihertz', - 'kHz': 'kilohertz', - 'MHz': 'megahertz', - 'GHz': 'gigahertz', - 'THz': 'terahertz', - 'rpm': 'revolutions per minute', - 'deg/s': 'degree per second', - 'rad/s': 'radian per second', -}; ; + Hz: { value: 'hertz', label: 'hertz' }, + mHz: { value: 'millihertz', label: 'millihertz' }, + kHz: { value: 'kilohertz', label: 'kilohertz' }, + MHz: { value: 'megahertz', label: 'megahertz' }, + GHz: { value: 'gigahertz', label: 'gigahertz' }, + THz: { value: 'terahertz', label: 'terahertz' }, + rpm: { value: 'revolutions per minute', label: 'revolutions per minute' }, + 'deg/s': { value: 'degree per second', label: 'degree per second' }, + 'rad/s': { value: 'radian per second', label: 'radian per second' }, +};