Fix translate. Moved to shared dir

Author: Stivin

src/app/app.browser.module.ts

@@ -1,18 +1,16 @@
 // angular
 import { NgModule } from '@angular/core';
-import { BrowserModule, BrowserTransferStateModule, TransferState } from '@angular/platform-browser';
-import { HttpClient } from '@angular/common/http';
+import { BrowserModule, BrowserTransferStateModule } from '@angular/platform-browser';
 // libs
 import { TransferHttpCacheModule } from '@nguniversal/common';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 // shared
 import { CookieStorage } from '../forStorage/browser.storage';
 import { AppStorage } from '../forStorage/universal.inject';
 // components
-import { TranslateBrowserLoader } from './translate-browser-loader.service';
 import { AppComponent } from './app.component';
 import { AppModule } from './app.module';
+import { TranslatesBrowserModule } from '@shared/translates/translates-browser';
 
 // import { ServiceWorkerModule } from '@angular/service-worker';
 
@@ -21,26 +19,15 @@ export function getRequest(): any {
   return { headers: { cookie: document.cookie } };
 }
 
-export function exportTranslateStaticLoader(http: HttpClient, transferState: TransferState): TranslateBrowserLoader {
-  return new TranslateBrowserLoader('/assets/i18n/', '.json', transferState, http);
-}
-
 @NgModule({
   bootstrap: [AppComponent],
   imports: [
     BrowserModule.withServerTransition({ appId: 'my-app' }),
     TransferHttpCacheModule,
     BrowserTransferStateModule,
-    TranslateModule.forRoot({
-        loader: {
-          provide: TranslateLoader,
-          useFactory: exportTranslateStaticLoader,
-          deps: [HttpClient, TransferState]
-        }
-      }
-    ),
     // ServiceWorkerModule.register('/ngsw-worker.js'),
     AppModule,
+    TranslatesBrowserModule
   ],
   providers: [
     {

src/app/app.module.ts

@@ -1,18 +1,19 @@
-import { AppRoutes } from './app.routing';
+// angular
+import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { TransferHttpModule } from '../modules/transfer-http/transfer-http.module';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { HttpClientModule } from '@angular/common/http';
 import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-import { AppComponent } from './app.component';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+// libs
 import { CookieService } from 'ngx-cookie-service';
-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 { MetaLoader, MetaModule, MetaSettings, MetaStaticLoader, PageTitlePositioning, } from '@ngx-meta/core';
 import { PrebootModule } from 'preboot';
+// shared
+import { TransferHttpModule } from '../modules/transfer-http/transfer-http.module';
 import { SharedModule } from '@shared/shared.module';
+// components
+import { AppRoutes } from './app.routing';
+import { AppComponent } from './app.component';
 
 export function metaFactory(): MetaLoader {
   const setting: MetaSettings = {
@@ -50,9 +51,10 @@ export function metaFactory(): MetaLoader {
       provide: MetaLoader,
       useFactory: metaFactory,
       deps: []
-    })
+    }),
   ],
   providers: [CookieService],
   bootstrap: [AppComponent]
 })
-export class AppModule { }
+export class AppModule {
+}

src/app/app.server.module.ts

@@ -1,40 +1,27 @@
 // angular
 import { NgModule } from '@angular/core';
 import { ServerModule, ServerTransferStateModule } from '@angular/platform-server';
-import { TransferState } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 // libs
 import { ModuleMapLoaderModule } from '@nguniversal/module-map-ngfactory-loader';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import 'rxjs/add/operator/filter';
 import 'rxjs/add/operator/first';
 // shared
 import { UniversalStorage } from '../forStorage/server.storage';
 import { AppStorage } from '../forStorage/universal.inject';
+import { TranslatesServerModule } from '@shared/translates/translates-server';
 // components
-import { TranslateServerLoader } from './translate-server-loader.service';
 import { AppComponent } from './app.component';
 import { AppModule } from './app.module';
 
-
-export function translateFactory(transferState: TransferState): TranslateServerLoader {
-  return new TranslateServerLoader('./dist/assets/i18n', '.json', transferState);
-}
-
 @NgModule({
   imports: [
     AppModule,
     NoopAnimationsModule,
     ServerTransferStateModule,
     ServerModule,
     ModuleMapLoaderModule,
-    TranslateModule.forRoot({
-      loader: {
-        provide: TranslateLoader,
-        useFactory: translateFactory,
-        deps: [TransferState]
-      }
-    }),
+    TranslatesServerModule
   ],
   bootstrap: [AppComponent],
   providers: [

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

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { TranslatesService } from '@shared/translates/translates.service';
+import { TranslatesService } from '@shared/translates';
 
 const LANGUAGES: any[] = [
   { value: 'ru', name: 'Русский' },

src/app/shared/shared.module.ts

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

src/app/shared/translates/index.ts

@@ -0,0 +1 @@
+export { TranslatesService } from './translates.service';

src/app/shared/translates/translates-browser/index.ts

@@ -0,0 +1 @@
+export { TranslatesBrowserModule } from './translates-browser.module';

…/app/translate-browser-loader.service.ts …ser/translates-browser-loader.service.tssrc/app/translate-browser-loader.service.ts renamed to src/app/shared/translates/translates-browser/translates-browser-loader.service.ts src/app/translate-browser-loader.service.ts renamed to src/app/shared/translates/translates-browser/translates-browser-loader.service.ts

@@ -1,20 +1,19 @@
-// angular
 import { HttpClient } from '@angular/common/http';
 import { makeStateKey, StateKey, TransferState } from '@angular/platform-browser';
-// libs
+
 import { TranslateLoader } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { Observable } from 'rxjs/Observable';
 
-export class TranslateBrowserLoader implements TranslateLoader {
+export class TranslatesBrowserLoaderService implements TranslateLoader {
   constructor(private prefix: string = 'i18n',
               private suffix: string = '.json',
               private transferState: TransferState,
               private http: HttpClient) {
   }
 
   public getTranslation(lang: string): Observable<any> {
-    const key: StateKey<number> = makeStateKey<number>('transfer-translate-' + lang);
+    const key: StateKey<number> = makeStateKey<number>(`transfer-translate-${lang}`);
     const data = this.transferState.get(key, null);
     if (data) {
       return Observable.create(observer => {

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

@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { TransferState } from '@angular/platform-browser';
+
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+
+import { TranslatesService } from '@shared/translates/translates.service';
+import { TranslatesBrowserLoaderService } from './translates-browser-loader.service';
+
+export function translateStaticLoader(http: HttpClient, transferState: TransferState): TranslatesBrowserLoaderService {
+  return new TranslatesBrowserLoaderService('/assets/i18n/', '.json', transferState, http);
+}
+
+@NgModule({
+  imports: [
+    TranslateModule.forRoot({
+        loader: {
+          provide: TranslateLoader,
+          useFactory: translateStaticLoader,
+          deps: [HttpClient, TransferState]
+        }
+      }
+    ),
+  ],
+  providers: [TranslatesService]
+})
+export class TranslatesBrowserModule {
+}

src/app/shared/translates/translates-server/index.ts

@@ -0,0 +1 @@
+export { TranslatesServerModule } from './translates-server.module';