fix locale generation in safari

diff --git a/server/sonar-web/src/main/js/helpers/l10n.js b/server/sonar-web/src/main/js/helpers/l10n.js
index e61916ad72b7d92f65ab61f04b7e20454cc3ae74..25c9ded9327078d67e74baa92fc141b1a54e4e93 100644 (file)
--- a/server/sonar-web/src/main/js/helpers/l10n.js
+++ b/server/sonar-web/src/main/js/helpers/l10n.js
@@ -19,6 +19,7 @@
  */
 import { stringify } from 'querystring';
 import moment from 'moment';
+import _ from 'underscore';
 
 let messages = {};
 
@@ -40,7 +41,9 @@ export function translateWithParameters (messageKey, ...parameters) {
 
 function getCurrentLocale () {
   const locale = window.navigator.languages ? window.navigator.languages[0] : window.navigator.language;
-  return locale.replace('-', '_');
+  const tags = locale.split('-');
+  const [region, ...other] = tags;
+  return [region.toLowerCase(), ...other.map(t => t.toUpperCase())].join('_');
 }
 
 function makeRequest (params) {