hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-14 05:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

add json5 support

Browse Source
This commit is contained in:
Art Lowel
2019-07-26 17:21:57 +02:00
parent 64a60f561e
commit 359cb10fa3
10 changed files with 196 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/app/browser-app.module.ts
View File

@@ -6,7 +6,7 @@ import { RouterModule } from '@angular/router';
import { REQUEST } from '@nguniversal/express-engine/tokens';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { TranslateHttpLoader } from '@ngx-translate/http-loader';
import { TranslateJson5HttpLoader } from '../../ngx-translate-loaders/translate-json5-http.loader';
import { IdlePreload, IdlePreloadModule } from 'angular-idle-preload';
@@ -20,13 +20,12 @@ import { CookieService } from '../../app/shared/services/cookie.service';
import { AuthService } from '../../app/core/auth/auth.service';
import { Angulartics2Module } from 'angulartics2';
import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
import { ServerSubmissionService } from '../../app/submission/server-submission.service';
import { SubmissionService } from '../../app/submission/submission.service';
export const REQ_KEY = makeStateKey<string>('req');
export function createTranslateLoader(http: HttpClient) {
return new TranslateHttpLoader(http, 'assets/i18n/', '.json');
return new TranslateJson5HttpLoader(http, 'assets/i18n/', '.json5');
}
export function getRequest(transferState: TransferState): any {

4
src/modules/app/server-app.module.ts
View File

@@ -12,7 +12,7 @@ import { AppModule } from '../../app/app.module';
import { DSpaceServerTransferStateModule } from '../transfer-state/dspace-server-transfer-state.module';
import { DSpaceTransferState } from '../transfer-state/dspace-transfer-state.service';
import { TranslateUniversalLoader } from '../translate-universal-loader';
import { TranslateJson5UniversalLoader } from '../../ngx-translate-loaders/translate-json5-universal.loader';
import { CookieService } from '../../app/shared/services/cookie.service';
import { ServerCookieService } from '../../app/shared/services/server-cookie.service';
import { AuthService } from '../../app/core/auth/auth.service';
@@ -24,7 +24,7 @@ import { SubmissionService } from '../../app/submission/submission.service';
import { ServerSubmissionService } from '../../app/submission/server-submission.service';
export function createTranslateLoader() {
return new TranslateUniversalLoader('dist/assets/i18n/', '.json');
return new TranslateJson5UniversalLoader('dist/assets/i18n/', '.json5');
}
@NgModule({

16
src/modules/translate-universal-loader.ts
View File

@@ -1,16 +0,0 @@
import { TranslateLoader } from '@ngx-translate/core';
import { Observable } from 'rxjs';
import * as fs from 'fs';
export class TranslateUniversalLoader implements TranslateLoader {
constructor(private prefix: string = 'dist/assets/i18n/', private suffix: string = '.json') { }
public getTranslation(lang: string): Observable<any> {
return Observable.create((observer: any) => {
observer.next(JSON.parse(fs.readFileSync(`${this.prefix}${lang}${this.suffix}`, 'utf8')));
observer.complete();
});
}
}