inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-10-08 14:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

translation service upgrade and fixes (#2604)

Browse Source
This commit is contained in:
Denys Vuika
2017-11-03 13:05:36 +00:00
committed by Eugenio Romano
parent 856f094598
commit 5f95e5f7b2
19 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ng2-components/ng2-alfresco-core/package.json
View File

@@ -55,7 +55,7 @@
"@angular/platform-browser": "4.4.5",
"@angular/platform-browser-dynamic": "4.4.5",
"@angular/router": "4.4.5",
"@ngx-translate/core": "7.0.0",
"@ngx-translate/core": "8.0.0",
"alfresco-js-api": "1.9.0",
"core-js": "2.4.1",
"hammerjs": "2.0.8",

12
ng2-components/ng2-alfresco-core/src/services/translation.service.ts
View File

@@ -39,19 +39,19 @@ export class TranslationService {
@Inject(TRANSLATION_PROVIDER) providers: TranslationProvider[]) {
this.customLoader = <AlfrescoTranslateLoader> this.translate.currentLoader;
this.defaultLang = this.userPreference.getDefaultLocale();
this.defaultLang = 'en';
translate.setDefaultLang(this.defaultLang);
this.userPreference.locale$.subscribe( (locale) => {
this.userLang = locale;
this.use(this.userLang);
});
if (providers && providers.length > 0) {
for (let provider of providers) {
this.addTranslationFolder(provider.name, provider.source);
}
}
this.userPreference.locale$.subscribe( (locale) => {
this.userLang = locale;
this.use(this.userLang);
});
}
addTranslationFolder(name: string = '', path: string = '') {