Use document.documentElement.lang

diff --git a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
index 2289766b9f041c2e106f741c6da17a9f7c15e936..5034ff32e79bf339a52e159f5cef43114b9bbcb6 100644 (file)
--- a/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
+++ b/com.woltlab.wcf/templates/headIncludeJavaScript.tpl
@@ -8,7 +8,6 @@
        var WSC_API_URL = '{@$__wcf->getActivePath()}';
        var SECURITY_TOKEN = '{@SECURITY_TOKEN}';
        var LANGUAGE_ID = {@$__wcf->getLanguage()->languageID};
-       var LANGUAGE_CODE = '{@$__wcf->getLanguage()->getFixedLanguageCode()}';
        var LANGUAGE_USE_INFORMAL_VARIANT = {if LANGUAGE_USE_INFORMAL_VARIANT}true{else}false{/if};
        var TIME_NOW = {@TIME_NOW};
        var LAST_UPDATE_TIME = {@LAST_UPDATE_TIME};

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 9a19e4375a80226b0140de3adcee4b4ae3bff83f..b08b26f7a6c40a8f283f1c244b79537de486eca3 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -35,7 +35,6 @@
                var WSC_API_URL = '{@$__wcf->getActivePath()}acp/';
                var SECURITY_TOKEN = '{@SECURITY_TOKEN}';
                var LANGUAGE_ID = {@$__wcf->getLanguage()->languageID};
-               var LANGUAGE_CODE = '{@$__wcf->getLanguage()->getFixedLanguageCode()}';
                var LANGUAGE_USE_INFORMAL_VARIANT = {if LANGUAGE_USE_INFORMAL_VARIANT}true{else}false{/if};
                var TIME_NOW = {@TIME_NOW};
                var LAST_UPDATE_TIME = {@LAST_UPDATE_TIME};

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/I18n/Plural.js b/wcfsetup/install/files/js/WoltLabSuite/Core/I18n/Plural.js
index bcc85d2071ae0b19ef3ec469b7d029368a253b31..adf440f2498fe79fae42f0368c5053e735a44f7c 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/I18n/Plural.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/I18n/Plural.js
@@ -26,7 +26,7 @@ define(['StringUtil'], function(StringUtil) {
                 */
                getCategory: function(value, languageCode) {
                        if (!languageCode) {
-                               languageCode = LANGUAGE_CODE;
+                               languageCode = document.documentElement.lang;
                        }
                        
                        // Fallback: handle unknown languages as English