Fix translations on risks overview graph and default knowledge base name on language change (+ ISO code update)

src/app/services/languages.service.ts

@@ -14,9 +14,9 @@ export class LanguagesService {
   initLanguages(): void {
     this.translateService.addLangs([
       'bg',
-      'cz',
+      'cs',
       'de',
-      'dk',
+      'da',
       'el',
       'en',
       'es',
@@ -51,7 +51,7 @@ export class LanguagesService {
       // Set default language
       const browserLang = this.translateService.getBrowserLang();
       language = browserLang.match(
-        /bg|cz|de|dk|el|en|es|et|fi|fr|hr|hu|it|lt|lv|nl|no|pl|pt|ro|sl|sv/
+        /bg|cs|de|da|el|en|es|et|fi|fr|hr|hu|it|lt|lv|nl|no|pl|pt|ro|sl|sv/
       )
         ? browserLang
         : 'fr';

src/app/shared/components/header/header.component.html

@@ -320,26 +320,26 @@
                 </li>
                 <li
                   [ngClass]="{
-                    is_active: languagesService.selectedLanguage === 'cz'
+                    is_active: languagesService.selectedLanguage === 'cs'
                   }"
                 >
                   <a
                     href="javascript:;"
-                    (click)="languagesService.updateCurrentLanguage('cz')"
+                    (click)="languagesService.updateCurrentLanguage('cs')"
                   >
-                    {{ "header.languages.cz" | translate }}
+                    {{ "header.languages.cs" | translate }}
                   </a>
                 </li>
                 <li
                   [ngClass]="{
-                    is_active: languagesService.selectedLanguage === 'dk'
+                    is_active: languagesService.selectedLanguage === 'da'
                   }"
                 >
                   <a
                     href="javascript:;"
-                    (click)="languagesService.updateCurrentLanguage('dk')"
+                    (click)="languagesService.updateCurrentLanguage('da')"
                   >
-                    {{ "header.languages.dk" | translate }}
+                    {{ "header.languages.da" | translate }}
                   </a>
                 </li>
                 <li
@@ -462,18 +462,6 @@
                     {{ "header.languages.sv" | translate }}
                   </a>
                 </li>
-                <li
-                  [ngClass]="{
-                    is_active: languagesService.selectedLanguage === 'lv'
-                  }"
-                >
-                  <a
-                    href="javascript:;"
-                    (click)="languagesService.updateCurrentLanguage('lv')"
-                  >
-                    {{ "header.languages.lv" | translate }}
-                  </a>
-                </li>
                 <li
                   [ngClass]="{
                     is_active: languagesService.selectedLanguage === 'bg'

src/app/shared/components/knowledge-base/knowledge-base.component.ts

@@ -47,23 +47,9 @@ export class KnowledgeBaseComponent implements OnInit, OnChanges, OnDestroy {
     private el: ElementRef,
     private translateService: TranslateService,
     private structureService: StructureService
-  ) {
-    // Parse default Knowledge base json
-    this.translateService
-      .get('knowledge_base.default_knowledge_base')
-      .subscribe((translation: string) => {
-        const defaultKnowledgeBase = new KnowledgeBase(
-          0,
-          translation,
-          'CNIL',
-          'CNIL'
-        );
-        defaultKnowledgeBase.is_example = true;
-        this.customKnowledgeBases.push(defaultKnowledgeBase);
-      });
-  }
+  ) {}
 
-  ngOnInit(): void {
+  async ngOnInit(): Promise<void> {
     // INIT
     const knowledgeIdentifier = this.pia
       ? 'pia_' + this.route.snapshot.params.id + '_knowledgebase'
@@ -96,18 +82,12 @@ export class KnowledgeBaseComponent implements OnInit, OnChanges, OnDestroy {
       }
     };
 
-    this.loadKnowledgesBase().then(() => {
-      if (this.selectedKnowledBase !== null) {
-        this.switch(this.selectedKnowledBase);
-      }
-    });
+    this.updateDefaultKnowledgeBase();
+    this.loadAndSwitchKnowledgeBase();
 
     this.translateService.onLangChange.subscribe(() => {
-      this.loadKnowledgesBase().then(() => {
-        if (this.selectedKnowledBase !== null) {
-          this.switch(this.selectedKnowledBase);
-        }
-      });
+      this.updateDefaultKnowledgeBase();
+      this.loadAndSwitchKnowledgeBase();
     });
   }
 
@@ -123,10 +103,34 @@ export class KnowledgeBaseComponent implements OnInit, OnChanges, OnDestroy {
     this.knowledgeBaseService.previousKnowledgeBaseData = [];
   }
 
+  private updateDefaultKnowledgeBase(): void {
+    this.translateService
+      .get('knowledge_base.default_knowledge_base')
+      .subscribe((translation: string) => {
+        const defaultKnowledgeBase = new KnowledgeBase(
+          0,
+          translation,
+          'CNIL',
+          'CNIL'
+        );
+        defaultKnowledgeBase.is_example = true;
+
+        this.customKnowledgeBases = [defaultKnowledgeBase];
+      });
+  }
+
+  private async loadAndSwitchKnowledgeBase(): Promise<void> {
+    await this.loadKnowledgesBase();
+
+    if (this.selectedKnowledBase !== null) {
+      this.switch(this.selectedKnowledBase);
+    }
+  }
+
   /**
    * Load the knowledges List
    */
-  loadKnowledgesBase(): Promise<any> {
+  async loadKnowledgesBase(): Promise<any> {
     return new Promise((resolve, reject) => {
       // LOAD CUSTOM KNOWLEDGE BASE
       this.knowledgeBaseService

src/assets/i18n/ar.json

@@ -184,9 +184,9 @@
       "bg": "български",
       "cnil_translations": "الترجمات التي أنجزتها اللجنة الوطنية للمعلوماتية والحريات",
       "community_translations": "الترجمات التي أنجزها الجماعة",
-      "cz": "Česky",
+      "cs": "Česky",
       "de": "Deutsch",
-      "dk": "Dansk",
+      "da": "Dansk",
       "dpa_translations": "الترجمة التي تم اعتمادها في تقييم حماية البيانات ",
       "el": "Ελληνικά",
       "en": "English",

src/assets/i18n/bg.json

@@ -185,33 +185,33 @@
     "homepage_link": "Моите ОВЗД",
     "knowledge_base_link": "База знания",
     "languages": {
-      "ar": "Арабски",
-      "bg": "Български",
+      "ar": "العربية",
+      "bg": "български",
       "cnil_translations": "Предоставени от CNIL преводи",
       "community_translations": "Преводи предоставени от общността",
-      "cz": "Чешки",
-      "de": "Немски",
-      "dk": "Датски",
+      "cs": "Česky",
+      "de": "Deutsch",
+      "da": "Dansk",
       "dpa_translations": "Преводи, ревизирани от европейския надзорен орган по защита на данните",
-      "el": "Гръцки",
-      "en": "Английски",
-      "es": "Испански",
-      "et": "Естонски",
-      "fi": "Фински",
-      "fr": "Френски",
-      "hr": "Хърватски",
-      "hu": "Унгарски",
-      "it": "Италиански",
-      "lt": "Литовски",
-      "lv": "Латвийски",
-      "nl": "Нидерландски",
-      "no": "Норвежки",
+      "el": "Ελληνικά",
+      "en": "English",
+      "es": "Español",
+      "et": "Eesti keel",
+      "fi": "Suomi",
+      "fr": "Français",
+      "hr": "Hrvatski",
+      "hu": "Magyar",
+      "it": "Italiano",
+      "lt": "Lietuviškai",
+      "lv": "Latviešu valoda",
+      "nl": "Nederlands",
+      "no": "Norsk",
       "official_translation": "Оригинална версия",
-      "pl": "Полски",
-      "pt": "Португалски",
-      "ro": "Румънски",
-      "sl": "Словенски",
-      "sv": "Шведски"
+      "pl": "Polski",
+      "pt": "Português",
+      "ro": "Română",
+      "sl": "Slovenščina",
+      "sv": "Svenska"
     },
     "logo_subtitle": "",
     "logo_title": "Оценка на въздействието върху поверителността (Оценка на въздействието върху защитата на данните)",