mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-13 04:53:06 +00:00
fixed aot build with translate loader (wip)
This commit is contained in:
@@ -1,6 +1,5 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
|
||||||
|
|
||||||
import { SharedModule } from '../shared/shared.module';
|
import { SharedModule } from '../shared/shared.module';
|
||||||
|
|
||||||
|
@@ -1,8 +1,6 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
|
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
|
||||||
|
|
||||||
import { SharedModule } from '../shared/shared.module';
|
import { SharedModule } from '../shared/shared.module';
|
||||||
import { CommunityPageComponent } from './community-page.component';
|
import { CommunityPageComponent } from './community-page.component';
|
||||||
import { CommunityPageSubCollectionListComponent } from './sub-collection-list/community-page-sub-collection-list.component';
|
import { CommunityPageSubCollectionListComponent } from './sub-collection-list/community-page-sub-collection-list.component';
|
||||||
|
@@ -1,8 +1,6 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { CommonModule } from '@angular/common';
|
import { CommonModule } from '@angular/common';
|
||||||
|
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
|
||||||
|
|
||||||
import { HomeComponent } from './home.component';
|
import { HomeComponent } from './home.component';
|
||||||
import { HomeRoutingModule } from './home-routing.module';
|
import { HomeRoutingModule } from './home-routing.module';
|
||||||
import { TopLevelCommunityListComponent } from './top-level-community-list/top-level-community-list.component';
|
import { TopLevelCommunityListComponent } from './top-level-community-list/top-level-community-list.component';
|
||||||
|
@@ -45,6 +45,10 @@ export function createTranslateLoader(http: HttpClient) {
|
|||||||
HttpClientModule,
|
HttpClientModule,
|
||||||
IdlePreloadModule.forRoot(), // forRoot ensures the providers are only created once
|
IdlePreloadModule.forRoot(), // forRoot ensures the providers are only created once
|
||||||
RouterModule.forRoot([], { useHash: false, preloadingStrategy: IdlePreload }),
|
RouterModule.forRoot([], { useHash: false, preloadingStrategy: IdlePreload }),
|
||||||
|
BrowserCookiesModule,
|
||||||
|
BrowserDataLoaderModule,
|
||||||
|
BrowserTransferStateModule,
|
||||||
|
BrowserTransferStoreModule,
|
||||||
TranslateModule.forRoot({
|
TranslateModule.forRoot({
|
||||||
loader: {
|
loader: {
|
||||||
provide: TranslateLoader,
|
provide: TranslateLoader,
|
||||||
@@ -52,10 +56,6 @@ export function createTranslateLoader(http: HttpClient) {
|
|||||||
deps: [HttpClient]
|
deps: [HttpClient]
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
BrowserCookiesModule,
|
|
||||||
BrowserDataLoaderModule,
|
|
||||||
BrowserTransferStateModule,
|
|
||||||
BrowserTransferStoreModule,
|
|
||||||
EffectsModule.forRoot([BrowserTransferStoreEffects]),
|
EffectsModule.forRoot([BrowserTransferStoreEffects]),
|
||||||
StoreRouterConnectingModule,
|
StoreRouterConnectingModule,
|
||||||
AppModule
|
AppModule
|
||||||
|
@@ -46,7 +46,7 @@ export function boot(cache: TransferState, appRef: ApplicationRef, store: Store<
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
export function createTranslateLoader() {
|
export function createTranslateLoader() {
|
||||||
return new TranslateUniversalLoader('dist/assets/i18n', '.json');
|
return new TranslateUniversalLoader('dist/assets/i18n/', '.json');
|
||||||
}
|
}
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
@@ -57,6 +57,11 @@ export function createTranslateLoader() {
|
|||||||
}),
|
}),
|
||||||
RouterModule.forRoot([], { useHash: false }),
|
RouterModule.forRoot([], { useHash: false }),
|
||||||
StoreRouterConnectingModule,
|
StoreRouterConnectingModule,
|
||||||
|
ServerModule,
|
||||||
|
ServerCookiesModule,
|
||||||
|
ServerDataLoaderModule,
|
||||||
|
ServerTransferStateModule,
|
||||||
|
ServerTransferStoreModule,
|
||||||
TranslateModule.forRoot({
|
TranslateModule.forRoot({
|
||||||
loader: {
|
loader: {
|
||||||
provide: TranslateLoader,
|
provide: TranslateLoader,
|
||||||
@@ -64,11 +69,6 @@ export function createTranslateLoader() {
|
|||||||
deps: []
|
deps: []
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
ServerModule,
|
|
||||||
ServerCookiesModule,
|
|
||||||
ServerDataLoaderModule,
|
|
||||||
ServerTransferStateModule,
|
|
||||||
ServerTransferStoreModule,
|
|
||||||
EffectsModule.forRoot([ServerTransferStoreEffects]),
|
EffectsModule.forRoot([ServerTransferStoreEffects]),
|
||||||
AppModule
|
AppModule
|
||||||
],
|
],
|
||||||
|
@@ -5,6 +5,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
|||||||
|
|
||||||
import { NgxPaginationModule } from 'ngx-pagination';
|
import { NgxPaginationModule } from 'ngx-pagination';
|
||||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
import { TranslateModule } from '@ngx-translate/core';
|
||||||
|
|
||||||
import { PaginationComponent } from './pagination/pagination.component';
|
import { PaginationComponent } from './pagination/pagination.component';
|
||||||
@@ -26,12 +27,12 @@ import { TruncatePipe } from './utils/truncate.pipe';
|
|||||||
const MODULES = [
|
const MODULES = [
|
||||||
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
|
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
|
||||||
CommonModule,
|
CommonModule,
|
||||||
RouterModule,
|
|
||||||
TranslateModule,
|
|
||||||
FormsModule,
|
FormsModule,
|
||||||
ReactiveFormsModule,
|
NgbModule,
|
||||||
NgxPaginationModule,
|
NgxPaginationModule,
|
||||||
NgbModule
|
ReactiveFormsModule,
|
||||||
|
RouterModule,
|
||||||
|
TranslateModule
|
||||||
];
|
];
|
||||||
|
|
||||||
const PIPES = [
|
const PIPES = [
|
||||||
|
@@ -4,11 +4,11 @@ import * as fs from 'fs';
|
|||||||
|
|
||||||
export class TranslateUniversalLoader implements TranslateLoader {
|
export class TranslateUniversalLoader implements TranslateLoader {
|
||||||
|
|
||||||
constructor(private prefix: string = 'i18n', private suffix: string = '.json') { }
|
constructor(private prefix: string = 'dist/assets/i18n/', private suffix: string = '.json') { }
|
||||||
|
|
||||||
public getTranslation(lang: string): Observable<any> {
|
public getTranslation(lang: string): Observable<any> {
|
||||||
return Observable.create((observer: any) => {
|
return Observable.create((observer: any) => {
|
||||||
observer.next(JSON.parse(fs.readFileSync(`${this.prefix}/${lang}${this.suffix}`, 'utf8')));
|
observer.next(JSON.parse(fs.readFileSync(`${this.prefix}${lang}${this.suffix}`, 'utf8')));
|
||||||
observer.complete();
|
observer.complete();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user