From: Tiago Melo <tmelo@suse.com>
Date: Tue, 7 Jul 2020 20:58:38 +0000 (+0000)
Subject: mgr/dashboard: Fix display of current language
X-Git-Tag: v16.1.0~1769^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=614eea5dc92791f4811c0efa9ec190b911a8a667;p=ceph.git

mgr/dashboard: Fix display of current language

While in development mode, current language
was not being displayed in the dropdown.

Fixes: https://tracker.ceph.com/issues/45762

Signed-off-by: Tiago Melo <tmelo@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/angular.json b/src/pybind/mgr/dashboard/frontend/angular.json
index 6ed23a879eaf..616c5a9c5074 100644
--- a/src/pybind/mgr/dashboard/frontend/angular.json
+++ b/src/pybind/mgr/dashboard/frontend/angular.json
@@ -28,6 +28,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "i18nLocale": "en",
             "aot": true,
             "i18nMissingTranslation": "ignore",
             "outputPath": "dist",
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.html
index 96084a40de56..dbc677701cad 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.html
@@ -4,7 +4,7 @@
   <a ngbDropdownToggle
      i18n-title
      title="Select a Language">
-    {{ supportedLanguages[selectedLanguage] }}
+    {{ allLanguages[selectedLanguage] }}
   </a>
   <div ngbDropdownMenu>
     <ng-container *ngFor="let lang of supportedLanguages | keyvalue">
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.ts
index fedb6e181da7..e03c46ec914a 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.ts
@@ -14,6 +14,7 @@ export class LanguageSelectorComponent implements OnInit {
   @Input()
   isDropdown = true;
 
+  allLanguages = SupportedLanguages;
   supportedLanguages: Record<string, any> = {};
   selectedLanguage: string;