diff --git a/src/server_manager/index.html b/src/server_manager/index.html index df31ff79..4f01b2b8 100644 --- a/src/server_manager/index.html +++ b/src/server_manager/index.html @@ -36,5 +36,7 @@ Outline Manager - + + + diff --git a/src/server_manager/ui_components/app-root.html b/src/server_manager/ui_components/app-root.html index a98fdf6c..eff677a9 100644 --- a/src/server_manager/ui_components/app-root.html +++ b/src/server_manager/ui_components/app-root.html @@ -594,15 +594,8 @@ }; } - ready() { - super.ready(); - const messagesUrl = `/messages/${this.language}.json`; - this.loadResources(messagesUrl, this.language); - const langDir = this.getAttribute("dir"); - if (langDir === "rtl") { - this.$.appDrawer.align = "right"; - this.$.sideBar.align = "right"; - } + constructor() { + super(); this.addEventListener("RegionSelected", this.handleRegionSelected); this.addEventListener("SetUpGenericCloudProviderRequested", this.handleSetUpGenericCloudProviderRequested); this.addEventListener("SetUpAwsRequested", this.handleSetUpAwsRequested); @@ -610,6 +603,16 @@ this.addEventListener("ManualServerEntryCancelled", this.handleManualCancelled); } + setLanguage(newLanguage, langDir) { + const messagesUrl = `/messages/${newLanguage}.json`; + this.loadResources(messagesUrl, newLanguage); + if (langDir === "rtl") { + this.$.appDrawer.align = "right"; + this.$.sideBar.align = "right"; + } + this.language = newLanguage; + } + showIntro() { this.maybeCloseDrawer(); this.selectedServer = undefined; diff --git a/src/server_manager/web_app/main.ts b/src/server_manager/web_app/main.ts index e16e5f73..69f647f3 100644 --- a/src/server_manager/web_app/main.ts +++ b/src/server_manager/web_app/main.ts @@ -107,14 +107,10 @@ document.addEventListener('WebComponentsReady', () => { const language = getLanguageToUse(); const languageDirection = SUPPORTED_LANGUAGES[language.string()].dir; document.documentElement.setAttribute('dir', languageDirection); - const appRootEl = document.createElement('app-root'); - appRootEl.setAttribute('language', language.string()); - appRootEl.setAttribute('dir', languageDirection); - document.body.appendChild(appRootEl); // NOTE: this cast is safe and allows us to leverage Polymer typings since we haven't migrated to // Polymer 3, which adds typescript support. - // tslint:disable-next-line:no-any - const appRoot = appRootEl as unknown as polymer.Base; + const appRoot = document.getElementById('appRoot') as unknown as polymer.Base; + appRoot.setLanguage(language.string(), languageDirection); new App( appRoot, version, digitalocean_api.createDigitalOceanSession, digitalOceanServerRepositoryFactory, new ManualServerRepository('manualServers'),