From e483cc4510c999e34ac18d29907913e71266dc8d Mon Sep 17 00:00:00 2001 From: Tiago Melo Date: Tue, 1 Oct 2019 13:16:16 +0000 Subject: [PATCH] mgr/dashboard: Remove call to registerLocalData Since we configure the locale during the build phase, there is no need to set it dynamically. Signed-off-by: Tiago Melo --- .../dashboard/frontend/src/app/app.module.ts | 5 +- .../frontend/src/app/locale.helper.ts | 52 ------------------- 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts index d5d91bc49cc..12a4d9434e7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts @@ -1,4 +1,3 @@ -import { registerLocaleData } from '@angular/common'; import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http'; import { ErrorHandler, NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; @@ -19,7 +18,7 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { CephModule } from './ceph/ceph.module'; import { CoreModule } from './core/core.module'; -import { i18nProviders, LocaleHelper } from './locale.helper'; +import { i18nProviders } from './locale.helper'; import { ApiInterceptorService } from './shared/services/api-interceptor.service'; import { JsErrorHandler } from './shared/services/js-error-handler.service'; import { SharedModule } from './shared/shared.module'; @@ -28,8 +27,6 @@ export function jwtTokenGetter() { return localStorage.getItem('access_token'); } -registerLocaleData(LocaleHelper.getLocaleData(), LocaleHelper.getLocale()); - @NgModule({ declarations: [AppComponent], imports: [ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/locale.helper.ts b/src/pybind/mgr/dashboard/frontend/src/app/locale.helper.ts index 5c5b9d2209b..6598e1cd733 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/locale.helper.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/locale.helper.ts @@ -1,15 +1,3 @@ -import locale_cs from '@angular/common/locales/cs'; -import locale_de from '@angular/common/locales/de'; -import locale_en from '@angular/common/locales/en'; -import locale_es from '@angular/common/locales/es'; -import locale_fr from '@angular/common/locales/fr'; -import locale_id from '@angular/common/locales/id'; -import locale_it from '@angular/common/locales/it'; -import locale_ja from '@angular/common/locales/ja'; -import locale_pl from '@angular/common/locales/pl'; -import locale_pt from '@angular/common/locales/pt'; -import locale_zh_Hans from '@angular/common/locales/zh-Hans'; -import locale_zh_Hant from '@angular/common/locales/zh-Hant'; import { LOCALE_ID, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core'; declare const require; @@ -55,46 +43,6 @@ export class LocaleHelper { document.cookie = `cd-lang=${lang}`; window.localStorage.setItem('lang', lang); } - - static getLocaleData() { - let localeData = locale_en; - switch (this.getLocale()) { - case 'cs': - localeData = locale_cs; - break; - case 'de-DE': - localeData = locale_de; - break; - case 'es-ES': - localeData = locale_es; - break; - case 'fr-FR': - localeData = locale_fr; - break; - case 'id-ID': - localeData = locale_id; - break; - case 'it-IT': - localeData = locale_it; - break; - case 'ja-JP': - localeData = locale_ja; - break; - case 'pl-PL': - localeData = locale_pl; - break; - case 'pt-BR': - localeData = locale_pt; - break; - case 'zh-CN': - localeData = locale_zh_Hans; - break; - case 'zh-TW': - localeData = locale_zh_Hant; - break; - } - return localeData; - } } const i18nProviders = [ -- 2.39.5