inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-19 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'core' library issues with ng2-translate

Browse Source
This commit is contained in:
Denys Vuika 2016-06-27 13:45:57 +01:00
parent 7f09b6ee26
commit 5efb9b9cfd
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,6 @@
"reflect-metadata": "0.1.3", "reflect-metadata": "0.1.3",
"rxjs": "5.0.0-beta.6", "rxjs": "5.0.0-beta.6",
"zone.js": "0.6.12", "zone.js": "0.6.12",
"angular2-in-memory-web-api": "0.0.12",
"ng2-translate": "2.2.2", "ng2-translate": "2.2.2",
@ -92,7 +91,7 @@
"karma-jasmine": "1.0.2", "karma-jasmine": "1.0.2",
"karma-mocha-reporter": "2.0.3", "karma-mocha-reporter": "2.0.3",
"karma-jasmine-html-reporter": "0.2.0", "karma-jasmine-html-reporter": "0.2.0",
"license-check": "1.0.4", "license-check": "1.1.5",
"remap-istanbul": "0.6.3", "remap-istanbul": "0.6.3",
"traceur": "0.0.91", "traceur": "0.0.91",
"tslint": "3.8.1", "tslint": "3.8.1",

5
ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslationService.service.ts
View File

@ -16,7 +16,6 @@
*/ */
import { Injectable, Optional } from '@angular/core'; import { Injectable, Optional } from '@angular/core';
import { Http } from '@angular/http';
import { MissingTranslationHandler, TranslateService } from 'ng2-translate/ng2-translate'; import { MissingTranslationHandler, TranslateService } from 'ng2-translate/ng2-translate';
import { AlfrescoTranslationLoader } from './AlfrescoTranslationLoader.service'; import { AlfrescoTranslationLoader } from './AlfrescoTranslationLoader.service';
@ -25,8 +24,8 @@ export class AlfrescoTranslationService extends TranslateService {
userLang: string = 'en' ; userLang: string = 'en' ;
currentLoader: AlfrescoTranslationLoader; currentLoader: AlfrescoTranslationLoader;
constructor(http: Http, currentLoader: AlfrescoTranslationLoader, @Optional() missingTranslationHandler: MissingTranslationHandler) { constructor(currentLoader: AlfrescoTranslationLoader, @Optional() missingTranslationHandler: MissingTranslationHandler) {
super(http, currentLoader, missingTranslationHandler); super(currentLoader, missingTranslationHandler);
this.userLang = navigator.language.split('-')[0]; // use navigator lang if available this.userLang = navigator.language.split('-')[0]; // use navigator lang if available
this.userLang = /(fr|en)/gi.test(this.userLang) ? this.userLang : 'en'; this.userLang = /(fr|en)/gi.test(this.userLang) ? this.userLang : 'en';
this.setDefaultLang(this.userLang); this.setDefaultLang(this.userLang);