Skip to content

Open Infrastructure Map, a view of infrastructure data in OpenStreetMap

Rework translation keys to avoid plural format

Russ Garrett65da034af901
diff --git a/web/locales/en/translation.json b/web/locales/en/translation.json
index fc969ce..967603c 100644
--- a/web/locales/en/translation.json
+++ b/web/locales/en/translation.json
@@ -16,41 +16,41 @@
"tower": "Power tower",
"pole": "Power pole",
"generator": "Generator",
- "generator_solar": "Solar generator",
- "wind_turbine": "Wind turbine",
+ "generator-solar": "Solar generator",
+ "wind-turbine": "Wind turbine",
"substation": "Substation",
"switch": "Switch",
"compensator": "Compensator",
"converter": "DC converter substation",
"cable": "Cable",
"line": "Power line",
- "line_underground": "Underground power line",
- "line_case": "Underground power line",
- "line_label": "Power line",
- "solar_panel": "Solar panel",
+ "line-underground": "Underground power line",
+ "line-case": "Underground power line",
+ "line-label": "Power line",
+ "solar-panel": "Solar panel",
"plant": "Power plant",
"hvdc": "HVDC",
- "line_reference": "Line reference",
- "solar_panel_node": "Solar panel (node)",
- "other_generator": "Other generator",
- "tower_pylon": "Tower/Pylon",
- "tower_transition": "Transition tower",
- "pole_transition": "Transition pole",
- "transformer_3": "Transformer (3 windings)",
- "switch_disconnector": "Disconnector",
- "switch_breaker": "Circuit breaker",
- "switch_other": "Other switch",
- "reactor_series": "Series reactor",
- "reactor_shunt": "Shunt reactor",
- "capacitor_series": "Series capacitor",
- "capacitor_shunt": "Shunt capacitor",
+ "line-reference": "Line reference",
+ "solar-panel-node": "Solar panel (node)",
+ "other-generator": "Other generator",
+ "tower-pylon": "Tower/Pylon",
+ "tower-transition": "Transition tower",
+ "pole-transition": "Transition pole",
+ "transformer-3": "Transformer (3 windings)",
+ "switch-disconnector": "Disconnector",
+ "switch-breaker": "Circuit breaker",
+ "switch-other": "Other switch",
+ "reactor-series": "Series reactor",
+ "reactor-shunt": "Shunt reactor",
+ "capacitor-series": "Series capacitor",
+ "capacitor-shunt": "Shunt capacitor",
"filter": "Filter",
- "compensator_other": "Other compensator"
+ "compensator-other": "Other compensator"
},
"telecoms": {
- "communication_line": "Telecoms line",
+ "communication-line": "Telecoms line",
"mast": "Telecoms mast",
- "data_center": "Telecoms building",
+ "data-center": "Telecoms building",
"exchange": "Telephone exchange",
"cabinet": "Telecoms cabinet"
},
@@ -61,17 +61,17 @@
},
"water": {
"pipeline": "Water pipeline",
- "sewage_treatment_plant": "Sewage treatment plant",
- "treatment_plant": "Water treatment plant",
- "pumping_station": "Pumping station",
+ "sewage-treatment-plant": "Sewage treatment plant",
+ "treatment-plant": "Water treatment plant",
+ "pumping-station": "Pumping station",
"well": "Water well",
"reservoir": "Water reservoir",
- "water_pumping_station": "Water pumping station",
- "sewage_pumping_station": "Sewage pumping station"
+ "water-pumping-station": "Water pumping station",
+ "sewage-pumping-station": "Sewage pumping station"
},
"cable": "Cable",
"telecom": {
- "tower_mast": "Tower/Mast",
+ "tower-mast": "Tower/Mast",
"datacenter": "Datacenter",
"exchange": "Exchange"
},
@@ -79,16 +79,16 @@
"substance": {
"oil": "Oil",
"gas": "Gas",
- "petroleum_intermediate": "Petroleum intermediate",
+ "petroleum-intermediate": "Petroleum intermediate",
"fuel": "Fuel",
"hydrogen": "Hydrogen",
"co2": "CO<sub>2</sub>",
- "fresh_water": "Fresh water",
- "hot_water": "Hot water",
+ "fresh-water": "Fresh water",
+ "hot-water": "Hot water",
"steam": "Steam",
"wastewater": "Wastewater"
},
- "other_pumping_station": "Other pumping station"
+ "other-pumping-station": "Other pumping station"
},
"units": {
"kV": "kV",
@@ -102,18 +102,18 @@
},
"info": {
"website": "Website",
- "view_openstreetmap": "View on OpenStreetMap"
+ "view-openstreetmap": "View on OpenStreetMap"
},
"more_info": "More info",
"wikipedia": "Wikipedia",
- "wikimedia_commons": "Wikimedia Commons",
+ "wikimedia-commons": "Wikimedia Commons",
"wikidata": "Wikidata",
"key": {
"name": "Key",
- "power_lines": "Power Lines",
- "power_plants": "Power Plants",
- "power_generators": "Power Generators",
- "power_line_supports": "Power Line Supports",
+ "power-lines": "Power Lines",
+ "power-plants": "Power Plants",
+ "power-generators": "Power Generators",
+ "power-line-supports": "Power Line Supports",
"switchgear": "Switchgear",
"telecoms": "Telecoms",
"petroleum": "Petroleum",
@@ -127,7 +127,7 @@
"geothermal": "Geothermal",
"hydro": "Hydroelectric",
"nuclear": "Nuclear",
- "oil_gas": "Oil/Gas",
+ "oil-gas": "Oil/Gas",
"solar": "Solar",
"wind": "Wind",
"biomass": "Biomass",
diff --git a/web/src/friendlynames.ts b/web/src/friendlynames.ts
index d672a1f..919db1a 100644
--- a/web/src/friendlynames.ts
+++ b/web/src/friendlynames.ts
@@ -8,30 +8,30 @@ export default function friendlyNames(): { [key: string]: string } {
power_tower: t('names.power.tower', 'Power tower'),
power_pole: t('names.power.pole', 'Power pole'),
power_generator: t('names.power.generator', 'Generator'),
- power_generator_solar: t('names.power.generator_solar', 'Solar generator'),
- power_wind_turbine: t('names.power.wind_turbine', 'Wind turbine'),
+ power_generator_solar: t('names.power.generator-solar', 'Solar generator'),
+ power_wind_turbine: t('names.power.wind-turbine', 'Wind turbine'),
power_substation: t('names.power.substation', 'Substation'),
power_switch: t('names.power.switch', 'Switch'),
power_compensator: t('names.power.compensator', 'Compensator'),
power_converter: t('names.power.converter', 'DC converter'),
power_cable: t('names.power.cable', 'Power cable'),
power_line: t('names.power.line', 'Power line'),
- power_line_underground: t('names.power.line_underground', 'Underground power line'),
- power_line_case: t('names.power.line_case', 'Underground power line'),
- power_line_label: t('names.power.line_label', 'Power line'),
- power_solar_panel: t('names.power.solar_panel', 'Solar panel'),
+ power_line_underground: t('names.power.line-underground', 'Underground power line'),
+ power_line_case: t('names.power.line-case', 'Underground power line'),
+ power_line_label: t('names.power.line-label', 'Power line'),
+ power_solar_panel: t('names.power.solar-panel', 'Solar panel'),
power_plant: t('names.power.plant', 'Power plant'),
- telecoms_communication_line: t('names.telecoms.communication_line', 'Telecoms line'),
+ telecoms_communication_line: t('names.telecoms.communication-line', 'Telecoms line'),
telecoms_mast: t('names.telecoms.mast', 'Telecoms mast'),
- telecoms_data_center: t('names.telecoms.data_center', 'Telecoms building'),
+ telecoms_data_center: t('names.telecoms.data-center', 'Telecoms building'),
telecoms_exchange: t('names.telecoms.exchange', 'Telephone exchange'),
telecoms_cabinet: t('names.telecoms.cabinet', 'Telecoms cabinet'),
petroleum_pipeline: t('names.petroleum.pipeline', 'Pipeline'),
petroleum_well: t('names.petroleum.well', 'Well'),
water_pipeline: t('names.water.pipeline', 'Water pipeline'),
- water_sewage_treatment_plant: t('names.water.sewage_treatment_plant', 'Sewage treatment plant'),
- water_treatment_plant: t('names.water.treatment_plant', 'Water treatment plant'),
- water_pumping_station: t('names.water.pumping_station', 'Pumping station'),
+ water_sewage_treatment_plant: t('names.water.sewage-treatment-plant', 'Sewage treatment plant'),
+ water_treatment_plant: t('names.water.treatment-plant', 'Water treatment plant'),
+ water_pumping_station: t('names.water.pumping-station', 'Pumping station'),
water_well: t('names.water.well', 'Water well'),
water_reservoir: t('names.water.reservoir', 'Water reservoir')
}
diff --git a/web/src/key/key.ts b/web/src/key/key.ts
index 46afc0f..3aa97f9 100644
--- a/web/src/key/key.ts
+++ b/web/src/key/key.ts
@@ -108,13 +108,13 @@ class KeyControl implements IControl {
mount(this._container, this.header())
const pane = el('.oim-key-pane')
- pane.appendChild(el('h3', t('key.power_lines', 'Power Lines')))
+ pane.appendChild(el('h3', t('key.power-lines', 'Power Lines')))
mount(pane, await this.voltageTable())
- pane.appendChild(el('h3', t('key.power_plants', 'Power Plants')))
+ pane.appendChild(el('h3', t('key.power-plants', 'Power Plants')))
mount(pane, await this.plantTable())
- pane.appendChild(el('h3', t('key.power_generators', 'Power Generators')))
+ pane.appendChild(el('h3', t('key.power-generators', 'Power Generators')))
mount(pane, await this.generatorTable())
- pane.appendChild(el('h3', t('key.power_line_supports', 'Power Line Supports')))
+ pane.appendChild(el('h3', t('key.power-line-supports', 'Power Line Supports')))
mount(pane, await this.towerTable())
pane.appendChild(el('h3', t('key.switchgear', 'Switchgear')))
mount(pane, await this.switchgearTable())
@@ -148,7 +148,7 @@ class KeyControl implements IControl {
rows = rows.map((row) => [row[0], svgLine(row[1], line_thickness)])
rows.push([t('underground', 'Underground'), svgLine('#7A7A85', line_thickness, '3 2')])
- rows.push([t('names.power.line_reference', 'Line reference'), await this.sprite('power_line_ref')])
+ rows.push([t('names.power.line-reference', 'Line reference'), await this.sprite('power_line_ref')])
const table = list('table', Tr)
table.update(rows)
@@ -172,7 +172,7 @@ class KeyControl implements IControl {
plant_entries[t('power.source.geothermal')] = 'power_plant_geothermal'
plant_entries[t('power.source.hydro')] = 'power_plant_hydro'
plant_entries[t('power.source.nuclear')] = 'power_plant_nuclear'
- plant_entries[t('power.source.oil_gas')] = 'power_plant_oilgas'
+ plant_entries[t('power.source.oil-gas')] = 'power_plant_oilgas'
plant_entries[t('power.source.solar')] = 'power_plant_solar'
plant_entries[t('power.source.wind')] = 'power_plant_wind'
plant_entries[t('power.source.biomass')] = 'power_plant_biomass'
@@ -190,10 +190,10 @@ class KeyControl implements IControl {
async generatorTable() {
const rows = [
- [t('names.power.wind_turbine'), await this.sprite('power_wind', 14)],
- [t('names.power.solar_panel'), svgRectFromLayer(power_layers(), 'power_solar_panel')],
- [t('names.power.solar_panel_node', 'Solar panel (node)'), await this.sprite('power_generator_solar')],
- [t('names.power.other_generator', 'Other generator'), await this.sprite('power_generator')]
+ [t('names.power.wind-turbine'), await this.sprite('power_wind', 14)],
+ [t('names.power.solar-panel'), svgRectFromLayer(power_layers(), 'power_solar_panel')],
+ [t('names.power.solar-panel-node', 'Solar panel (node)'), await this.sprite('power_generator_solar')],
+ [t('names.power.other-generator', 'Other generator'), await this.sprite('power_generator')]
]
const table = list('table', Tr)
table.update(rows)
@@ -202,13 +202,13 @@ class KeyControl implements IControl {
async towerTable() {
const rows = [
- [t('names.power.tower_pylon', 'Tower/Pylon'), await this.sprite('power_tower', 10)],
+ [t('names.power.tower-pylon', 'Tower/Pylon'), await this.sprite('power_tower', 10)],
[
- t('names.power.tower_transition', 'Transition tower'),
+ t('names.power.tower-transition', 'Transition tower'),
await this.sprite('power_tower_transition', 10)
],
[t('names.power.pole'), await this.sprite('power_pole', 8)],
- [t('names.power.pole_transition', 'Transition pole'), await this.sprite('power_pole_transition', 8)]
+ [t('names.power.pole-transition', 'Transition pole'), await this.sprite('power_pole_transition', 8)]
]
const table = list('table', Tr)
table.update(rows)
@@ -219,18 +219,18 @@ class KeyControl implements IControl {
const rows = [
[t('names.power.transformer'), await this.sprite('power_transformer')],
[
- t('names.power.transformer_3', 'Transformer (3 windings)'),
+ t('names.power.transformer-3', 'Transformer (3 windings)'),
await this.sprite('power_transformer_3_winding')
],
- [t('names.power.switch_disconnector', 'Disconnector'), await this.sprite('power_switch_disconnector')],
- [t('names.power.switch_breaker', 'Circuit breaker'), await this.sprite('power_switch_circuit_breaker')],
- [t('names.power.switch_other', 'Other switch'), await this.sprite('power_switch')],
- [t('names.power.reactor_series', 'Series reactor'), await this.sprite('power_reactor')],
- [t('names.power.reactor_shunt', 'Shunt reactor'), await this.sprite('power_reactor_shunt')],
- [t('names.power.capacitor_series', 'Series capacitor'), await this.sprite('power_capacitor')],
- [t('names.power.capacitor_shunt', 'Shunt capacitor'), await this.sprite('power_capacitor_shunt')],
+ [t('names.power.switch-disconnector', 'Disconnector'), await this.sprite('power_switch_disconnector')],
+ [t('names.power.switch-breaker', 'Circuit breaker'), await this.sprite('power_switch_circuit_breaker')],
+ [t('names.power.switch-other', 'Other switch'), await this.sprite('power_switch')],
+ [t('names.power.reactor-series', 'Series reactor'), await this.sprite('power_reactor')],
+ [t('names.power.reactor-shunt', 'Shunt reactor'), await this.sprite('power_reactor_shunt')],
+ [t('names.power.capacitor-series', 'Series capacitor'), await this.sprite('power_capacitor')],
+ [t('names.power.capacitor-shunt', 'Shunt capacitor'), await this.sprite('power_capacitor_shunt')],
[t('names.power.filter', 'Filter'), await this.sprite('power_filter')],
- [t('names.power.compensator_other', 'Other compensator'), await this.sprite('power_compensator_frame')],
+ [t('names.power.compensator-other', 'Other compensator'), await this.sprite('power_compensator_frame')],
[t('names.power.converter', 'DC converter'), await this.sprite('converter')]
]
const table = list('table', Tr)
@@ -241,7 +241,7 @@ class KeyControl implements IControl {
async telecomTable() {
const rows = [
[t('names.cable', 'Cable'), svgLineFromLayer(comms_layers, 'telecoms_line')],
- [t('names.telecom.tower_mast', 'Tower/Mast'), await this.sprite('comms_tower')],
+ [t('names.telecom.tower-mast', 'Tower/Mast'), await this.sprite('comms_tower')],
[t('names.telecom.datacenter', 'Datacenter'), await this.sprite('telecom_datacenter')],
[t('names.telecom.exchange', 'Exchange'), await this.sprite('telecom_exchange')],
[t('names.cabinet', 'Cabinet'), await this.sprite('cabinet')]
@@ -256,7 +256,7 @@ class KeyControl implements IControl {
[t('names.substance.oil', 'Oil'), svgLine(colour_oil, line_thickness)],
[t('names.substance.gas', 'Gas'), svgLine(colour_gas, line_thickness)],
[
- t('names.substance.petroleum_intermediate', 'Petroleum intermediate'),
+ t('names.substance.petroleum-intermediate', 'Petroleum intermediate'),
svgLine(colour_intermediate, line_thickness)
],
[t('names.substance.fuel', 'Fuel'), svgLine(colour_fuel, line_thickness)],
@@ -275,24 +275,24 @@ class KeyControl implements IControl {
async waterTable() {
const rows = [
- [t('names.substance.fresh_water', 'Fresh water'), svgLine(colour_freshwater, line_thickness)],
- [t('names.substance.hot_water', 'Hot water'), svgLine(colour_hotwater, line_thickness)],
+ [t('names.substance.fresh-water', 'Fresh water'), svgLine(colour_freshwater, line_thickness)],
+ [t('names.substance.hot-water', 'Hot water'), svgLine(colour_hotwater, line_thickness)],
[t('names.substance.steam', 'Steam'), svgLine(colour_steam, line_thickness)],
[t('names.substance.wastewater', 'Wastewater'), svgLine(colour_wastewater, line_thickness)],
- [t('names.water.treatment_plant', 'Water treatment plant'), await this.sprite('water_treatment_plant')],
+ [t('names.water.treatment-plant', 'Water treatment plant'), await this.sprite('water_treatment_plant')],
[
- t('names.water.water_pumping_station', 'Water pumping station'),
+ t('names.water.water-pumping-station', 'Water pumping station'),
await this.sprite('water_pumping_station')
],
[
- t('names.water.sewage_treatment_plant', 'Sewage treatment plant'),
+ t('names.water.sewage-treatment-plant', 'Sewage treatment plant'),
await this.sprite('sewage_treatment_plant')
],
[
- t('names.water.sewage_pumping_station', 'Sewage pumping station'),
+ t('names.water.sewage-pumping-station', 'Sewage pumping station'),
await this.sprite('sewage_pumping_station')
],
- [t('names.other_pumping_station', 'Other pumping station'), await this.sprite('pumping_station')]
+ [t('names.other-pumping-station', 'Other pumping station'), await this.sprite('pumping_station')]
]
const table = list('table', Tr)
table.update(rows)