mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 01:54:15 +00:00
Added TranslateModule and dependencies to node and browser modules
This commit is contained in:
@@ -2,6 +2,9 @@ import { NgModule, ModuleWithProviders } from '@angular/core';
|
|||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||||
|
|
||||||
|
import { TranslateModule } from 'ng2-translate/ng2-translate';
|
||||||
|
|
||||||
import { ApiService } from './api.service';
|
import { ApiService } from './api.service';
|
||||||
import { ModelService } from './model/model.service';
|
import { ModelService } from './model/model.service';
|
||||||
|
|
||||||
@@ -9,6 +12,7 @@ const MODULES = [
|
|||||||
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
|
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
|
||||||
CommonModule,
|
CommonModule,
|
||||||
RouterModule,
|
RouterModule,
|
||||||
|
TranslateModule,
|
||||||
FormsModule,
|
FormsModule,
|
||||||
ReactiveFormsModule
|
ReactiveFormsModule
|
||||||
];
|
];
|
||||||
|
@@ -1,9 +1,12 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
|
import { Http } from '@angular/http';
|
||||||
import { FormsModule } from '@angular/forms';
|
import { FormsModule } from '@angular/forms';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { UniversalModule, isBrowser, isNode, AUTO_PREBOOT } from 'angular2-universal/browser'; // for AoT we need to manually split universal packages
|
import { UniversalModule, isBrowser, isNode, AUTO_PREBOOT } from 'angular2-universal/browser'; // for AoT we need to manually split universal packages
|
||||||
import { IdlePreload, IdlePreloadModule } from '@angularclass/idle-preload';
|
import { IdlePreload, IdlePreloadModule } from '@angularclass/idle-preload';
|
||||||
|
|
||||||
|
import { TranslateLoader, TranslateModule, TranslateStaticLoader } from 'ng2-translate';
|
||||||
|
|
||||||
import { AppModule, AppComponent } from './app/app.module';
|
import { AppModule, AppComponent } from './app/app.module';
|
||||||
import { SharedModule } from './app/shared/shared.module';
|
import { SharedModule } from './app/shared/shared.module';
|
||||||
import { CacheService } from './app/shared/cache.service';
|
import { CacheService } from './app/shared/cache.service';
|
||||||
@@ -14,6 +17,10 @@ import { Meta } from './angular2-meta';
|
|||||||
|
|
||||||
// import * as LRU from 'modern-lru';
|
// import * as LRU from 'modern-lru';
|
||||||
|
|
||||||
|
export function createTranslateLoader(http: Http) {
|
||||||
|
return new TranslateStaticLoader(http, './assets/i18n', '.json');
|
||||||
|
}
|
||||||
|
|
||||||
export function getLRU(lru?: any) {
|
export function getLRU(lru?: any) {
|
||||||
// use LRU for node
|
// use LRU for node
|
||||||
// return lru || new LRU(10);
|
// return lru || new LRU(10);
|
||||||
@@ -33,9 +40,14 @@ export function getResponse() {
|
|||||||
export const UNIVERSAL_KEY = 'UNIVERSAL_CACHE';
|
export const UNIVERSAL_KEY = 'UNIVERSAL_CACHE';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
bootstrap: [ AppComponent ],
|
bootstrap: [AppComponent],
|
||||||
imports: [
|
imports: [
|
||||||
// MaterialModule.forRoot() should be included first
|
TranslateModule.forRoot({
|
||||||
|
provide: TranslateLoader,
|
||||||
|
useFactory: (createTranslateLoader),
|
||||||
|
deps: [Http]
|
||||||
|
}),
|
||||||
|
|
||||||
UniversalModule, // BrowserModule, HttpModule, and JsonpModule are included
|
UniversalModule, // BrowserModule, HttpModule, and JsonpModule are included
|
||||||
|
|
||||||
FormsModule,
|
FormsModule,
|
||||||
|
@@ -1,8 +1,11 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
|
import { Http } from '@angular/http';
|
||||||
import { FormsModule } from '@angular/forms';
|
import { FormsModule } from '@angular/forms';
|
||||||
import { RouterModule } from '@angular/router';
|
import { RouterModule } from '@angular/router';
|
||||||
import { UniversalModule, isBrowser, isNode } from 'angular2-universal/node'; // for AoT we need to manually split universal packages
|
import { UniversalModule, isBrowser, isNode } from 'angular2-universal/node'; // for AoT we need to manually split universal packages
|
||||||
|
|
||||||
|
import { TranslateLoader, TranslateModule, TranslateStaticLoader } from 'ng2-translate';
|
||||||
|
|
||||||
import { AppModule, AppComponent } from './app/app.module';
|
import { AppModule, AppComponent } from './app/app.module';
|
||||||
import { SharedModule } from './app/shared/shared.module';
|
import { SharedModule } from './app/shared/shared.module';
|
||||||
import { CacheService } from './app/shared/cache.service';
|
import { CacheService } from './app/shared/cache.service';
|
||||||
@@ -11,6 +14,10 @@ import { CacheService } from './app/shared/cache.service';
|
|||||||
// see https://github.com/angular/angular/pull/12322
|
// see https://github.com/angular/angular/pull/12322
|
||||||
import { Meta } from './angular2-meta';
|
import { Meta } from './angular2-meta';
|
||||||
|
|
||||||
|
export function createTranslateLoader(http: Http) {
|
||||||
|
return new TranslateStaticLoader(http, './assets/i18n', '.json');
|
||||||
|
}
|
||||||
|
|
||||||
export function getLRU() {
|
export function getLRU() {
|
||||||
return new Map();
|
return new Map();
|
||||||
}
|
}
|
||||||
@@ -25,9 +32,14 @@ export function getResponse() {
|
|||||||
export const UNIVERSAL_KEY = 'UNIVERSAL_CACHE';
|
export const UNIVERSAL_KEY = 'UNIVERSAL_CACHE';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
bootstrap: [ AppComponent ],
|
bootstrap: [AppComponent],
|
||||||
imports: [
|
imports: [
|
||||||
// MaterialModule.forRoot() should be included first
|
TranslateModule.forRoot({
|
||||||
|
provide: TranslateLoader,
|
||||||
|
useFactory: (createTranslateLoader),
|
||||||
|
deps: [Http]
|
||||||
|
}),
|
||||||
|
|
||||||
UniversalModule, // BrowserModule, HttpModule, and JsonpModule are included
|
UniversalModule, // BrowserModule, HttpModule, and JsonpModule are included
|
||||||
|
|
||||||
FormsModule,
|
FormsModule,
|
||||||
@@ -63,9 +75,9 @@ export class MainModule {
|
|||||||
universalCache[CacheService.KEY] = JSON.stringify(this.cache.dehydrate());
|
universalCache[CacheService.KEY] = JSON.stringify(this.cache.dehydrate());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clear the cache after it's rendered
|
* Clear the cache after it's rendered
|
||||||
*/
|
*/
|
||||||
universalAfterDehydrate = () => {
|
universalAfterDehydrate = () => {
|
||||||
// comment out if LRU provided at platform level to be shared between each user
|
// comment out if LRU provided at platform level to be shared between each user
|
||||||
this.cache.clear();
|
this.cache.clear();
|
||||||
|
Reference in New Issue
Block a user