Fix translates module

Author: Stivin

src/app/app.module.ts

@@ -6,13 +6,11 @@ import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { AppComponent } from './app.component';
 import { CookieService } from 'ngx-cookie-service';
-import { HttpClient, HttpClientModule } from '@angular/common/http';
+import { HttpClientModule } from '@angular/common/http';
 import { MetaModule, MetaSettings } from '@ngx-meta/core';
 import { MetaLoader } from '@ngx-meta/core';
 import { MetaStaticLoader } from '@ngx-meta/core';
 import { PageTitlePositioning } from '@ngx-meta/core';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { PrebootModule } from 'preboot';
 import { SharedModule } from '@shared/shared.module';
 
@@ -35,10 +33,6 @@ export function metaFactory(): MetaLoader {
   return new MetaStaticLoader(setting);
 }
 
-export function httpLoaderFactory(http: HttpClient) {
-  return new TranslateHttpLoader(http, './assets/i18n/', '.json');
-}
-
 @NgModule({
   declarations: [
     AppComponent,
@@ -56,15 +50,7 @@ export function httpLoaderFactory(http: HttpClient) {
       provide: MetaLoader,
       useFactory: metaFactory,
       deps: []
-    }),
-    TranslateModule.forRoot({
-        loader: {
-          provide: TranslateLoader,
-          useFactory: httpLoaderFactory,
-          deps: [HttpClient]
-        }
-      }
-    )
+    })
   ],
   providers: [CookieService],
   bootstrap: [AppComponent]

src/app/shared/layouts/layouts.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { RouterModule } from '@angular/router';
 
-import { TranslateModule } from '@shared/translate/translate.module';
+import { TranslatesModule } from '@shared/translates/translates.module';
 
 import { FooterComponent } from './footer/footer.component';
 import { SidebarComponent } from './sidebar/sidebar.component';
@@ -13,7 +13,7 @@ import { WrapperComponent } from './wrapper/wrapper.component';
   imports: [
     CommonModule,
     RouterModule,
-    TranslateModule
+    TranslatesModule
   ],
   declarations: [
     FooterComponent,

src/app/shared/layouts/toolbar/toolbar.component.ts

@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import { TranslateService } from '@shared/translate/translate.service';
+import { TranslatesService } from '@shared/translates/translates.service';
 
 const LANGUAGES: any[] = [
   { value: 'ru', name: 'Русский' },
@@ -14,10 +14,10 @@ const LANGUAGES: any[] = [
 export class ToolbarComponent {
   public languages: any[] = LANGUAGES;
 
-  constructor(private _translateService: TranslateService) {
+  constructor(private _translatesService: TranslatesService) {
   }
 
   public changeLang(lang: string): void {
-    this._translateService.changeLang(lang);
+    this._translatesService.changeLang(lang);
   }
 }

src/app/shared/shared.module.ts

@@ -1,12 +1,12 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 
 import { LayoutsModule } from './layouts/layouts.module';
-import { TranslateModule } from './translate/translate.module';
+import { TranslatesModule } from './translates/translates.module';
 
 @NgModule({
   exports: [
     LayoutsModule,
-    TranslateModule
+    TranslatesModule
   ],
   providers: []
 })

src/app/shared/translate/translate.module.ts

@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TranslateHttpLoader } from '@ngx-translate/http-loader';
+
+import { TranslatesService } from './translates.service';
+
+export function httpLoaderFactory(http: HttpClient) {
+  return new TranslateHttpLoader(http, './assets/i18n/', '.json');
+}
+
+@NgModule({
+  imports: [
+    TranslateModule.forRoot({
+        loader: {
+          provide: TranslateLoader,
+          useFactory: httpLoaderFactory,
+          deps: [HttpClient]
+        }
+      }
+    )
+  ],
+  providers: [TranslatesService]
+})
+export class TranslatesModule {
+}

src/app/shared/translates/translates.module.ts

@@ -4,7 +4,7 @@ import { TranslateService } from '@ngx-translate/core';
 const DEFAULT_LANG: string = 'ru';
 
 @Injectable()
-export class TranslateService {
+export class TranslatesService {
   constructor(private _translateService: TranslateService) {
     this._translateService.setDefaultLang(DEFAULT_LANG);
   }