Add abbreviation localization independant of HA language setting #22

tomvanswam · Aug 17, 2020 · ff0ea79 · ff0ea79
1 parent 90cb035
commit ff0ea79
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 12 deletions.
diff --git a/src/compass-card.ts b/src/compass-card.ts
@@ -219,7 +219,6 @@ export class CompassCard extends LitElement {
       string = COMPASS_ABBREVIATIONS[0];
     }
     string = COMPASS_ABBREVIATIONS[index];
-
     return localize(`directions.${string}`, '', '', language);
   }
 

diff --git a/src/const.ts b/src/const.ts
@@ -42,7 +42,7 @@ export const COMPASS_ABBREVIATIONS = [
 ];
 export const UNAVAILABLE = localize('common.invalid');
 
-export const INDICATORS = ['arrow_outward', 'arrow_inward', 'circle'];
+export const INDICATORS = ['arrow_outward', 'arrow_inward', 'circle'].sort();
 
 export const CONFIG_ENTITY = 'entity';
 export const CONFIG_SECONDARY_ENTITY = 'secondary_entity';

diff --git a/src/editor.ts b/src/editor.ts
@@ -62,9 +62,9 @@ export class CompassCardEditor extends LitElement implements LovelaceCardEditor
 
   get _compass_language(): string {
     if (this._config) {
-      return this._config?.compass?.language || getLocalLanguage();
+      return this._config?.compass?.language || '';
     }
-    return getLocalLanguage();
+    return '';
   }
 
   protected render(): TemplateResult | void {
@@ -76,8 +76,8 @@ export class CompassCardEditor extends LitElement implements LovelaceCardEditor
     const entities = Object.keys(this.hass.states)
       .filter((eid) => CONFIG_DOMAINS.includes(eid.substr(0, eid.indexOf('.'))))
       .sort();
-    const indicatorsSorted = INDICATORS.sort();
-    const languages = COMPASS_LANGUAGES.sort();
+    const indicatorsSorted = INDICATORS;
+    const languages = COMPASS_LANGUAGES;
 
     return html`
       <div class="card-config">
@@ -105,7 +105,7 @@ export class CompassCardEditor extends LitElement implements LovelaceCardEditor
         </paper-dropdown-menu>
         <paper-dropdown-menu
           class="editor-entity-select"
-          label="${localize('editor.direction')} ${localize('editor.abbreviation')} ${localize('editor.language')} (${localize('editor.optional')})"
+          label="${localize('editor.direction')} ${localize('editor.abbreviations')} ${localize('editor.language')} (${localize('editor.optional')})"
           @value-changed=${this._valueChanged}
           .configValue=${CONFIG_COMPASS + '.' + CONFIG_LANGUAGE}
         >

diff --git a/src/localize/languages/de.json b/src/localize/languages/de.json
@@ -1,8 +1,33 @@
 {
+  "common": {
+    "version": "Version",
+    "description": "Zeigt einen Kompass mit einem Indikator in Richtung des Entitätswertes an",
+    "invalid_configuration": "Ungültige Konfiguration",
+    "no_entity": "Entität nicht konfiguriert",
+    "offset_not_a_number": "Richtungs-Offset ist keine Zahl",
+    "invalid": "ungültig",
+    "on": "An",
+    "off": "Aus"
+  },
+  "editor": {
+    "name": "Name",
+    "optional": "Optional",
+    "entity": "Entität",
+    "required": "Benötigt",
+    "primary": "Richtung",
+    "secondary": "Sekundär",
+    "indicator": "Indikator",
+    "direction": "Richtung",
+    "offset": "Offset",
+    "show": "Zeige",
+    "abbreviations": "Abkürzungen",
+    "toggle": "Umschalten",
+    "language": "Sprache"
+  },
   "directions": {
     "north": "Norden",
     "east": "Osten",
-    "south": "Süd",
+    "south": "Süden",
     "west": "Westen",
     "N": "N",
     "NNE": "NNO",

diff --git a/src/localize/languages/en.json b/src/localize/languages/en.json
@@ -20,8 +20,8 @@
     "direction": "Direction",
     "offset": "Offset",
     "show": "Show",
-    "toggle": "Toggle",
     "abbreviations": "Abbreviations",
+    "toggle": "Toggle",
     "language": "Language"
   },
   "directions": {

diff --git a/src/localize/languages/it.json b/src/localize/languages/it.json
@@ -20,7 +20,9 @@
     "direction": "Direzione",
     "offset": "Compensazione",
     "show": "Mostra",
-    "toggle": "Inverti stato"
+    "abbreviations": "Abbreviazioni",
+    "toggle": "Inverti stato",
+    "language": "Linguaggio"
   },
   "directions": {
     "north": "Nord",

diff --git a/src/localize/languages/nl.json b/src/localize/languages/nl.json
@@ -20,7 +20,9 @@
     "direction": "Richting",
     "offset": "Afwijking",
     "show": "Toon",
-    "toggle": "Wissel"
+    "abbreviations": "Afkorting",
+    "toggle": "Wissel",
+    "language": "Taal"
   },
   "directions": {
     "north": "Noorden",

diff --git a/src/localize/localize.ts b/src/localize/localize.ts
@@ -9,7 +9,7 @@ export const languages: any = {
   it: it,
   de: de,
 };
-export const COMPASS_LANGUAGES = Object.keys(languages);
+export const COMPASS_LANGUAGES = [...Object.keys(languages), ''].sort();
 
 export function getLocalLanguage(): string {
   return (localStorage.getItem('selectedLanguage') || 'en').replace(/['"]+/g, '').replace('-', '_');