inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #953 from Alfresco/dev-denys-ie

Browse Source 
IE fixes
This commit is contained in:
Mario Romano
2016-10-31 13:52:41 +00:00
committed by GitHub
parent 18474121dc 03d0ce1d86
commit 19a4532cfb
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
demo-shell-ng2/package.json
View File

@@ -6,11 +6,13 @@
"scripts": { "scripts": {
"clean": "npm install rimraf && rimraf dist node_modules typings", "clean": "npm install rimraf && rimraf dist node_modules typings",
"build": "npm run tslint && npm run tsc && npm run licensecheck", "build": "npm run tslint && npm run tsc && npm run licensecheck",
"start": "npm run build && concurrently \"npm run tsc:w\" \"npm run serve\" ", "start": "npm run build && npm run serve",
"start:dev": "npm run build && concurrently \"npm run tsc:w\" \"npm run serve:dev\" ",
"aws": "node app.js", "aws": "node app.js",
"tsc": "tsc", "tsc": "tsc",
"tsc:w": "tsc -w", "tsc:w": "tsc -w",
"serve": "wsrv -O http://localhost:3000 -s -l -p 3000 -a 0.0.0.0 -x ./server/versions.js", "serve": "wsrv -O http://localhost:3000 -s -p 3000 -a 0.0.0.0 -x ./server/versions.js",
"serve:dev": "wsrv -O http://localhost:3000 -s -l -p 3000 -a 0.0.0.0 -x ./server/versions.js",
"tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json 'app/{,**/}**.ts'", "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json 'app/{,**/}**.ts'",
"licensecheck": "license-check" "licensecheck": "license-check"
}, },

3
ng2-components/ng2-alfresco-core/src/services/AlfrescoTranslation.service.ts
View File

@@ -25,8 +25,7 @@ export class AlfrescoTranslationService {
userLang: string = 'en' ; userLang: string = 'en' ;
constructor(private translate: TranslateService) { constructor(private translate: TranslateService) {
this.userLang = navigator.language.split('-')[0]; // use navigator lang if available this.userLang = translate.getBrowserLang() || 'en';
this.userLang = /(fr|en)/gi.test(this.userLang) ? this.userLang : 'en';
translate.setDefaultLang(this.userLang); translate.setDefaultLang(this.userLang);
} }