diff --git a/dashboard-ui/scripts/globalize.js b/dashboard-ui/scripts/globalize.js index bbff177028..78c8019b3d 100644 --- a/dashboard-ui/scripts/globalize.js +++ b/dashboard-ui/scripts/globalize.js @@ -4,6 +4,12 @@ function getUrl(name, culture) { + var parts = culture.split('-'); + if (parts.length == 2) { + parts[1] = parts[1].toUpperCase(); + culture = parts.join('-'); + } + return 'strings/' + name + '/' + culture + '.json'; } function getDictionary(name, culture) { @@ -33,14 +39,9 @@ var currentCulture = 'en-US'; function setCulture(value) { - var promises = []; - currentCulture = value; - promises.push(loadDictionary('html', value)); - promises.push(loadDictionary('javascript', value)); - - return $.when(promises); + return $.when(loadDictionary('html', value), loadDictionary('javascript', value)); } function ensure() { @@ -57,7 +58,6 @@ function translateDocument(html, dictionaryName) { var glossary = getDictionary(dictionaryName, currentCulture) || {}; - return translateHtml(html, glossary); } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index e06f843902..875383d1fd 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -2066,11 +2066,20 @@ var AppInfo = {}; }); } + var pageContainer = document.querySelector('.pageContainer'); + var pageContainerInnerHtml = pageContainer ? pageContainer.innerHTML : ''; + function onConnectionManagerCreated(deferred) { Globalize.ensure().done(function () { $(function () { + document.title = Globalize.translateDocument(document.title, 'html'); + + if (pageContainer) { + pageContainer.innerHTML = Globalize.translateDocument(pageContainerInnerHtml, 'html'); + } + onDocumentReady(); Dashboard.initPromiseDone = true; $.mobile.initializePage();