From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Mon, 4 Jun 2018 11:52:16 +0000 (+0200)
Subject: SONAR-10841 Correctly set default language bundle when locale is unknown
X-Git-Tag: 7.5~1087
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=434c61ad74dc6ddeeb21477a8754064db95b4b5c;p=sonarqube.git

SONAR-10841 Correctly set default language bundle when locale is unknown
---

diff --git a/server/sonar-web/src/main/js/app/components/LocalizationContainer.tsx b/server/sonar-web/src/main/js/app/components/LocalizationContainer.tsx
index aea9b8490ac..22c457bf7ea 100644
--- a/server/sonar-web/src/main/js/app/components/LocalizationContainer.tsx
+++ b/server/sonar-web/src/main/js/app/components/LocalizationContainer.tsx
@@ -47,15 +47,20 @@ export default class LocalizationContainer extends React.PureComponent<Props, St
 
   bundleLoaded = (lang: string) => {
     const langToLoad = lang || DEFAULT_LANGUAGE;
-
-    // No need to load english bundle, it's coming wiht react-intl, use english if it fails
-    if (langToLoad !== 'en') {
+    // No need to load english (default) bundle, it's coming with react-intl
+    if (langToLoad !== DEFAULT_LANGUAGE) {
       import('react-intl/locale-data/' + langToLoad).then(
-        i => this.updateLang(langToLoad, i),
-        () => {}
+        intlBundle => this.updateLang(langToLoad, intlBundle),
+        this.setDefaultLang
       );
     } else {
-      this.setState({ loading: false, lang: langToLoad });
+      this.setDefaultLang();
+    }
+  };
+
+  setDefaultLang = () => {
+    if (this.mounted) {
+      this.setState({ loading: false, lang: DEFAULT_LANGUAGE });
     }
   };