mgr/dashboard: Provide TRANSLATIONS directly in app.module.ts

Remove LOCALE_ID from provide list, since this is now defined during build.

Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit d0a8ee9bc68e1fdecffce7b0424bf3ed7c211cb5)

Conflicts:
  src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
  removed the ".default" suffix of line 75.
  src/pybind/mgr/dashboard/frontend/src/app/locale.helper.ts
  kept all changes from the cherry picked commit

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 3dd54a17c6594fdcd1884aa330f19d9339c8e03d..2770c1b95330d695698f4a0f09af8c9161c3ede8 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
@@ -1,5 +1,11 @@
 import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
-import { ErrorHandler, NgModule } from '@angular/core';
+import {
+  ErrorHandler,
+  LOCALE_ID,
+  NgModule,
+  TRANSLATIONS,
+  TRANSLATIONS_FORMAT
+} from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
@@ -15,7 +21,6 @@ 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 } 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';
@@ -60,7 +65,19 @@ export function jwtTokenGetter() {
       useClass: ApiInterceptorService,
       multi: true
     },
-    i18nProviders,
+    {
+      provide: TRANSLATIONS,
+      useFactory: (locale) => {
+        locale = locale || 'en-US';
+        try {
+          return require(`raw-loader!locale/messages.${locale}.xlf`);
+        } catch (error) {
+          return [];
+        }
+      },
+      deps: [LOCALE_ID]
+    },
+    { provide: TRANSLATIONS_FORMAT, useValue: 'xlf' },
     I18n
   ],
   bootstrap: [AppComponent]

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 956dd8de3e8bdde57a513f8ab54cd4b45286b177..10866024242160c78729adda218fbab5dbdb69ec 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/locale.helper.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/locale.helper.ts
@@ -1,7 +1,3 @@
-import { LOCALE_ID, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core';
-
-declare const require;
-
 export class LocaleHelper {
   static getBrowserLang(): string {
     const lang = navigator.language;
@@ -47,21 +43,3 @@ export class LocaleHelper {
   }
 }
 
-const i18nProviders = [
-  { provide: LOCALE_ID, useValue: LocaleHelper.getLocale() },
-  {
-    provide: TRANSLATIONS,
-    useFactory: (locale) => {
-      locale = locale || 'en-US';
-      try {
-        return require(`raw-loader!locale/messages.${locale}.xlf`);
-      } catch (error) {
-        return [];
-      }
-    },
-    deps: [LOCALE_ID]
-  },
-  { provide: TRANSLATIONS_FORMAT, useValue: 'xlf' }
-];
-
-export { i18nProviders };