Merge pull request #1176 from AFaust/TinyMCE-localeGeneralization

Locale generalization so JS_LOCALE of de_DE results in use of de
Alfresco · Aug 1, 2016 · 13b07ba · 13b07ba
2 parents 91b6e2f + bc2c3c8
commit 13b07ba
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/aikau/src/main/resources/alfresco/editors/TinyMCE.js b/aikau/src/main/resources/alfresco/editors/TinyMCE.js
@@ -226,14 +226,23 @@ define(["dojo/_base/declare",
          // Check that the language requested is supported...
          if (config.language) {
             var locales = this.supportedLocales.split(",");
-            var locale = "en";
+            var locale, bestGeneralizedLocale;
             for (var i = 0, j = locales.length; i < j; i++) {
                if (locales[i] === config.language) {
                   locale = config.language;
                   break;
                }
+
+               if (config.language.indexOf(locales[i]) === 0)
+               {
+                   if (bestGeneralizedLocale === undefined || locales[i].length > bestGeneralizedLocale.length)
+                   {
+                       bestGeneralizedLocale = locales[i];
+                   }
+               }
             }
-            config.language = locale;
+
+            config.language = locale || bestGeneralizedLocale || "en";
          }
 
          tinymce.baseURL = AlfConstants.URL_RESCONTEXT + "js/lib/tinymce";