From 5f95e5f7b2f48af70c44b5c70eb2f22f115d6a55 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 3 Nov 2017 13:05:36 +0000 Subject: [PATCH] translation service upgrade and fixes (#2604) --- demo-shell-ng2/package.json | 2 +- ng2-components/ng2-activiti-analytics/package.json | 2 +- ng2-components/ng2-activiti-diagrams/package.json | 2 +- ng2-components/ng2-activiti-form/package.json | 2 +- ng2-components/ng2-activiti-processlist/package.json | 2 +- ng2-components/ng2-activiti-tasklist/package.json | 2 +- ng2-components/ng2-alfresco-core/package.json | 2 +- .../src/services/translation.service.ts | 12 ++++++------ ng2-components/ng2-alfresco-datatable/package.json | 2 +- .../ng2-alfresco-documentlist/package.json | 2 +- ng2-components/ng2-alfresco-login/package.json | 2 +- ng2-components/ng2-alfresco-search/package.json | 2 +- ng2-components/ng2-alfresco-social/package.json | 2 +- ng2-components/ng2-alfresco-tag/package.json | 2 +- ng2-components/ng2-alfresco-upload/package.json | 2 +- ng2-components/ng2-alfresco-userinfo/package.json | 2 +- ng2-components/ng2-alfresco-viewer/package.json | 2 +- ng2-components/ng2-alfresco-webscript/package.json | 2 +- ng2-components/package.json | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index cfa5a5e763..d02cefd2c3 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -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", diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json index 040723fd45..fd8ee194fd 100644 --- a/ng2-components/ng2-activiti-analytics/package.json +++ b/ng2-components/ng2-activiti-analytics/package.json @@ -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", diff --git a/ng2-components/ng2-activiti-diagrams/package.json b/ng2-components/ng2-activiti-diagrams/package.json index 02cc1f3010..32e8080774 100644 --- a/ng2-components/ng2-activiti-diagrams/package.json +++ b/ng2-components/ng2-activiti-diagrams/package.json @@ -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", diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json index efce1e9e1c..d615d3fe6a 100644 --- a/ng2-components/ng2-activiti-form/package.json +++ b/ng2-components/ng2-activiti-form/package.json @@ -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", diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json index 477242b0d5..43b37b3f3c 100644 --- a/ng2-components/ng2-activiti-processlist/package.json +++ b/ng2-components/ng2-activiti-processlist/package.json @@ -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", diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index e8135e71e2..f667611b07 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -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", diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index 30b362d771..25fa047856 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -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", diff --git a/ng2-components/ng2-alfresco-core/src/services/translation.service.ts b/ng2-components/ng2-alfresco-core/src/services/translation.service.ts index 309a0a8db7..e160729171 100644 --- a/ng2-components/ng2-alfresco-core/src/services/translation.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/translation.service.ts @@ -39,19 +39,19 @@ export class TranslationService { @Inject(TRANSLATION_PROVIDER) providers: TranslationProvider[]) { this.customLoader = 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 = '') { diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index c880111fa0..547e9778a9 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -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", diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 620e36bf32..7e85771c07 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -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", diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index 29edb826fb..2e15e8cafc 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -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", diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index e453b1d6ab..d84916c325 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -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", diff --git a/ng2-components/ng2-alfresco-social/package.json b/ng2-components/ng2-alfresco-social/package.json index d4e7ec0c85..6a3e13241f 100644 --- a/ng2-components/ng2-alfresco-social/package.json +++ b/ng2-components/ng2-alfresco-social/package.json @@ -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", diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json index 0077627e78..b41a251373 100644 --- a/ng2-components/ng2-alfresco-tag/package.json +++ b/ng2-components/ng2-alfresco-tag/package.json @@ -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", diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index 972e2a2618..f5f78b5dd2 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -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", diff --git a/ng2-components/ng2-alfresco-userinfo/package.json b/ng2-components/ng2-alfresco-userinfo/package.json index d22ea8203e..24d3e71588 100644 --- a/ng2-components/ng2-alfresco-userinfo/package.json +++ b/ng2-components/ng2-alfresco-userinfo/package.json @@ -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", diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index 936e346177..4e6b959289 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -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", diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index 4f52e5de5b..4799103bb7 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -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", diff --git a/ng2-components/package.json b/ng2-components/package.json index 335d604f1b..2a543943c9 100644 --- a/ng2-components/package.json +++ b/ng2-components/package.json @@ -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",