translation service upgrade and fixes (#2604)

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

View File

@ -69,7 +69,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",
"chart.js": "2.5.0",
"classlist.js": "1.1.20150312",

View File

@ -43,7 +43,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",
"chart.js": "2.5.0",
"core-js": "2.4.1",

View File

@ -39,7 +39,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",

View File

@ -46,7 +46,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",

View File

@ -46,7 +46,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",

View File

@ -50,7 +50,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",

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",

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 = '') {

View File

@ -45,7 +45,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",

View File

@ -54,7 +54,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",

View File

@ -57,7 +57,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",
"hammerjs": "2.0.8",
"ng2-alfresco-core": "1.9.0",

View File

@ -53,7 +53,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",

View File

@ -33,7 +33,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",

View File

@ -33,7 +33,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",

View File

@ -54,7 +54,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",

View File

@ -33,7 +33,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",

View File

@ -48,7 +48,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",

View File

@ -33,7 +33,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",

View File

@ -74,7 +74,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",