From ae68a09775540fc766c2d4690d5a1ecd4fa7e878 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Wed, 9 Feb 2022 03:48:55 +0100 Subject: [PATCH 1/2] Fix linting script --- scripts/lint.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/lint.ts b/scripts/lint.ts index 4857af6cb..460eb8c87 100644 --- a/scripts/lint.ts +++ b/scripts/lint.ts @@ -10,8 +10,7 @@ import {FixLegacyTheme, UpdateLegacyLayer} from "../Models/ThemeConfig/Conversio const layerFiles = ScriptUtils.getLayerFiles(); for (const layerFile of layerFiles) { try { - const state: any = undefined; // FIXME - const fixed = new UpdateLegacyLayer().convertStrict(state, layerFile.parsed, "While linting " + layerFile.path); + const fixed = new UpdateLegacyLayer().convertStrict(layerFile.parsed, "While linting " + layerFile.path); writeFileSync(layerFile.path, JSON.stringify(fixed, null, " ")) } catch (e) { console.error("COULD NOT LINT LAYER" + layerFile.path + ":\n\t" + e) @@ -21,8 +20,7 @@ for (const layerFile of layerFiles) { const themeFiles = ScriptUtils.getThemeFiles() for (const themeFile of themeFiles) { try { - const state: any = undefined; // FIXME - const fixed = new FixLegacyTheme().convertStrict(state, themeFile.parsed, "While linting " + themeFile.path); + const fixed = new FixLegacyTheme().convertStrict(themeFile.parsed, "While linting " + themeFile.path); writeFileSync(themeFile.path, JSON.stringify(fixed, null, " ")) } catch (e) { console.error("COULD NOT LINT THEME" + themeFile.path + ":\n\t" + e) From d91168a4eae5d922d2f8baa65ee1a7a699995ed3 Mon Sep 17 00:00:00 2001 From: Mark Rogerson Date: Wed, 9 Feb 2022 14:37:48 +0000 Subject: [PATCH 2/2] Spelling correction custumers/customers --- Docs/TagInfo/mapcomplete_climbing.json | 10 +++++----- assets/themes/climbing/climbing.json | 2 +- langs/themes/en.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Docs/TagInfo/mapcomplete_climbing.json b/Docs/TagInfo/mapcomplete_climbing.json index 054a8673f..1bccf0e5a 100644 --- a/Docs/TagInfo/mapcomplete_climbing.json +++ b/Docs/TagInfo/mapcomplete_climbing.json @@ -76,7 +76,7 @@ }, { "key": "access", - "description": "Layer 'Climbing club' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", + "description": "Layer 'Climbing club' shows access=customers with a fixed text, namely 'Only customers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", "value": "customers" }, { @@ -254,7 +254,7 @@ }, { "key": "access", - "description": "Layer 'Climbing gyms' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", + "description": "Layer 'Climbing gyms' shows access=customers with a fixed text, namely 'Only customers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", "value": "customers" }, { @@ -435,7 +435,7 @@ }, { "key": "access", - "description": "Layer 'Climbing routes' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", + "description": "Layer 'Climbing routes' shows access=customers with a fixed text, namely 'Only customers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", "value": "customers" }, { @@ -614,7 +614,7 @@ }, { "key": "access", - "description": "Layer 'Climbing opportunities' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", + "description": "Layer 'Climbing opportunities' shows access=customers with a fixed text, namely 'Only customers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", "value": "customers" }, { @@ -779,7 +779,7 @@ }, { "key": "access", - "description": "Layer 'Climbing opportunities?' shows access=customers with a fixed text, namely 'Only custumers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", + "description": "Layer 'Climbing opportunities?' shows access=customers with a fixed text, namely 'Only customers' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open Climbing Map')", "value": "customers" }, { diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index 24d6c9e03..6aa1105fb 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -1209,7 +1209,7 @@ { "if": "access=customers", "then": { - "en": "Only custumers", + "en": "Only customers", "fr": "Réservé aux clients", "de": "Nur für Kunden", "it": "Riservato ai clienti" diff --git a/langs/themes/en.json b/langs/themes/en.json index 888e786c8..7fc9fb3d1 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -488,7 +488,7 @@ "then": "You need a permit to access here" }, "2": { - "then": "Only custumers" + "then": "Only customers" }, "3": { "then": "Only club members"