diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.d.ts b/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.d.ts index 1494b095dc..dc5f9db48e 100644 --- a/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.d.ts +++ b/ng2-components/ng2-alfresco-login/src/alfresco-authentication.service.d.ts @@ -1,7 +1,12 @@ import { Observable } from 'rxjs/Rx'; import { Http } from 'angular2/http'; +import { AlfrescoSettingsService } from '../../ng2-alfresco-core/services'; +/** + * The AlfrescoAuthenticationService provide the login service and store the token in the localStorage + */ export declare class AlfrescoAuthenticationService { http: Http; + private settings; token: string; private _host; private _baseUrl; @@ -9,7 +14,7 @@ export declare class AlfrescoAuthenticationService { * Constructor * @param http */ - constructor(http: Http); + constructor(http: Http, settings: AlfrescoSettingsService); /** * The method return tru if the user is logged in * @returns {boolean} diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.d.ts b/ng2-components/ng2-alfresco-login/src/alfresco-login.component.d.ts index 233527536e..3879968ab2 100644 --- a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.d.ts +++ b/ng2-components/ng2-alfresco-login/src/alfresco-login.component.d.ts @@ -1,10 +1,12 @@ import { Router } from 'angular2/router'; import { ControlGroup, FormBuilder } from 'angular2/common'; import { AlfrescoAuthenticationService } from './alfresco-authentication.service'; +import { TranslateService } from 'ng2-translate/ng2-translate'; export declare class AlfrescoLoginComponent { auth: AlfrescoAuthenticationService; router: Router; method: string; + translate: TranslateService; form: ControlGroup; error: boolean; /** @@ -13,7 +15,7 @@ export declare class AlfrescoLoginComponent { * @param auth * @param router */ - constructor(fb: FormBuilder, auth: AlfrescoAuthenticationService, router: Router); + constructor(fb: FormBuilder, auth: AlfrescoAuthenticationService, router: Router, translate: TranslateService); /** * Method called on submit form * @param value @@ -26,4 +28,9 @@ export declare class AlfrescoLoginComponent { * @returns {boolean} */ isErrorStyle(field: ControlGroup): boolean; + /** + * Initial configuration for Multi language + * @param translate + */ + translationInit(translate: TranslateService): void; } diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js b/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js index 6a0d7e3e50..b8e9ae79a2 100644 --- a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js +++ b/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js @@ -37,7 +37,7 @@ System.register(['angular2/core', 'angular2/router', 'angular2/common', './alfre * @param auth * @param router */ - function AlfrescoLoginComponent(fb, auth, router) { + function AlfrescoLoginComponent(fb, auth, router, translate) { this.auth = auth; this.router = router; this.method = 'GET'; @@ -46,6 +46,7 @@ System.register(['angular2/core', 'angular2/router', 'angular2/common', './alfre username: ['', common_1.Validators.compose([common_1.Validators.required, common_1.Validators.minLength(4)])], password: ['', common_1.Validators.required] }); + this.translationInit(translate); } /** * Method called on submit form @@ -78,6 +79,17 @@ System.register(['angular2/core', 'angular2/router', 'angular2/common', './alfre return true; } }; + /** + * Initial configuration for Multi language + * @param translate + */ + AlfrescoLoginComponent.prototype.translationInit = function (translate) { + this.translate = translate; + var userLang = navigator.language.split('-')[0]; // use navigator lang if available + userLang = /(fr|en)/gi.test(userLang) ? userLang : 'en'; + this.translate.setDefaultLang('en'); + this.translate.use(userLang); + }; __decorate([ core_1.Input(), __metadata('design:type', String) @@ -91,7 +103,7 @@ System.register(['angular2/core', 'angular2/router', 'angular2/common', './alfre styleUrls: ['./alfresco-login.component.css'], pipes: [ng2_translate_1.TranslatePipe] }), - __metadata('design:paramtypes', [common_1.FormBuilder, alfresco_authentication_service_1.AlfrescoAuthenticationService, router_1.Router]) + __metadata('design:paramtypes', [common_1.FormBuilder, alfresco_authentication_service_1.AlfrescoAuthenticationService, router_1.Router, ng2_translate_1.TranslateService]) ], AlfrescoLoginComponent); return AlfrescoLoginComponent; }()); diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js.map b/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js.map index d40eb7bf6c..bdc268f191 100644 --- a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js.map +++ b/ng2-components/ng2-alfresco-login/src/alfresco-login.component.js.map @@ -1 +1 @@ -{"version":3,"file":"alfresco-login.component.js","sourceRoot":"","sources":["alfresco-login.component.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAiCA;gBAMI;;;;;mBAKG;gBACH,gCAAY,EAAc,EAAS,IAAkC,EAAS,MAAa;oBAAxD,SAAI,GAAJ,IAAI,CAA8B;oBAAS,WAAM,GAAN,MAAM,CAAO;oBAXlF,WAAM,GAAU,KAAK,CAAC;oBAG/B,UAAK,GAAW,KAAK,CAAC;oBASlB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC;wBACjB,QAAQ,EAAE,CAAC,EAAE,EAAE,mBAAU,CAAC,OAAO,CAAC,CAAC,mBAAU,CAAC,QAAQ,EAAE,mBAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAClF,QAAQ,EAAE,CAAC,EAAE,EAAE,mBAAU,CAAC,QAAQ,CAAC;qBACtC,CAAC,CAAC;gBACP,CAAC;gBAED;;;;mBAIG;gBACH,yCAAQ,GAAR,UAAS,KAAS,EAAE,KAAK;oBAAzB,iBAWC;oBAVG,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;wBACR,KAAK,CAAC,cAAc,EAAE,CAAC;oBAC3B,CAAC;oBACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC;yBACvD,SAAS,CACV,UAAC,KAAS,IAAK,OAAA,KAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,EAA9B,CAA8B,EAC7C;wBACI,KAAI,CAAC,KAAK,GAAG,IAAI,CAAC;oBACtB,CAAC,CACJ,CAAC;gBACN,CAAC;gBAED;;;;mBAIG;gBACH,6CAAY,GAAZ,UAAa,KAAkB;oBAC3B,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;wBACnB,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;oBAC5C,CAAC;oBACD,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;wBACd,MAAM,CAAC,KAAK,CAAC;oBACjB,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,MAAM,CAAC,IAAI,CAAC;oBAChB,CAAC;gBACL,CAAC;gBAlDD;oBAAC,YAAK,EAAE;;sEAAA;gBAVZ;oBAAC,gBAAS,CAAC;wBACP,QAAQ,EAAE,gBAAgB;wBAC1B,QAAQ,EAAE,YAAY;wBACtB,UAAU,EAAE,CAAC,0BAAiB,EAAE,wBAAe,CAAC;wBAChD,WAAW,EAAE,iCAAiC;wBAC9C,SAAS,EAAE,CAAC,gCAAgC,CAAC;wBAC7C,KAAK,EAAE,CAAC,6BAAa,CAAC;qBAEzB,CAAC;;0CAAA;gBAqDF,6BAAC;YAAD,CAAC,AApDD,IAoDC;YApDD,2DAoDC,CAAA"} \ No newline at end of file +{"version":3,"file":"alfresco-login.component.js","sourceRoot":"","sources":["alfresco-login.component.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAiCA;gBAOI;;;;;mBAKG;gBACH,gCAAY,EAAc,EACP,IAAkC,EAClC,MAAa,EACpB,SAA0B;oBAFnB,SAAI,GAAJ,IAAI,CAA8B;oBAClC,WAAM,GAAN,MAAM,CAAO;oBAdvB,WAAM,GAAU,KAAK,CAAC;oBAI/B,UAAK,GAAW,KAAK,CAAC;oBAalB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,KAAK,CAAC;wBACjB,QAAQ,EAAE,CAAC,EAAE,EAAE,mBAAU,CAAC,OAAO,CAAC,CAAC,mBAAU,CAAC,QAAQ,EAAE,mBAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAClF,QAAQ,EAAE,CAAC,EAAE,EAAE,mBAAU,CAAC,QAAQ,CAAC;qBACtC,CAAC,CAAC;oBAEH,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;gBACpC,CAAC;gBAED;;;;mBAIG;gBACH,yCAAQ,GAAR,UAAS,KAAS,EAAE,KAAK;oBAAzB,iBAWC;oBAVG,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;wBACR,KAAK,CAAC,cAAc,EAAE,CAAC;oBAC3B,CAAC;oBACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC;yBACvD,SAAS,CACV,UAAC,KAAS,IAAK,OAAA,KAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,EAA9B,CAA8B,EAC7C;wBACI,KAAI,CAAC,KAAK,GAAG,IAAI,CAAC;oBACtB,CAAC,CACJ,CAAC;gBACN,CAAC;gBAED;;;;mBAIG;gBACH,6CAAY,GAAZ,UAAa,KAAkB;oBAC3B,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC;wBACnB,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;oBAC5C,CAAC;oBACD,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;wBACd,MAAM,CAAC,KAAK,CAAC;oBACjB,CAAC;oBAAC,IAAI,CAAC,CAAC;wBACJ,MAAM,CAAC,IAAI,CAAC;oBAChB,CAAC;gBACL,CAAC;gBAED;;;mBAGG;gBACH,gDAAe,GAAf,UAAgB,SAA2B;oBACvC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;oBAC3B,IAAI,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kCAAkC;oBACnF,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,QAAQ,GAAG,IAAI,CAAC;oBAExD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;oBAEpC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACjC,CAAC;gBAvED;oBAAC,YAAK,EAAE;;sEAAA;gBAVZ;oBAAC,gBAAS,CAAC;wBACP,QAAQ,EAAE,gBAAgB;wBAC1B,QAAQ,EAAE,YAAY;wBACtB,UAAU,EAAE,CAAC,0BAAiB,EAAE,wBAAe,CAAC;wBAChD,WAAW,EAAE,iCAAiC;wBAC9C,SAAS,EAAE,CAAC,gCAAgC,CAAC;wBAC7C,KAAK,EAAE,CAAC,6BAAa,CAAC;qBAEzB,CAAC;;0CAAA;gBA0EF,6BAAC;YAAD,CAAC,AAzED,IAyEC;YAzED,2DAyEC,CAAA"} \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/alfresco-login.component.ts index 38cf6bc555..4743dc4cb0 100644 --- a/ng2-components/ng2-alfresco-login/src/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/alfresco-login.component.ts @@ -18,7 +18,7 @@ import {Component, Input} from 'angular2/core'; import {Router, ROUTER_DIRECTIVES} from 'angular2/router'; import {FORM_DIRECTIVES, ControlGroup, FormBuilder, Validators} from 'angular2/common'; import {AlfrescoAuthenticationService} from './alfresco-authentication.service'; -import {TranslatePipe} from 'ng2-translate/ng2-translate'; +import {TranslateService, TranslatePipe} from 'ng2-translate/ng2-translate'; declare let componentHandler; declare let __moduleName:string; @@ -33,6 +33,7 @@ declare let __moduleName:string; }) export class AlfrescoLoginComponent { @Input() method:string = 'GET'; + translate: TranslateService; form:ControlGroup; error:boolean = false; @@ -43,11 +44,17 @@ export class AlfrescoLoginComponent { * @param auth * @param router */ - constructor(fb:FormBuilder, public auth:AlfrescoAuthenticationService, public router:Router) { + constructor(fb:FormBuilder, + public auth:AlfrescoAuthenticationService, + public router:Router, + translate:TranslateService + ) { this.form = fb.group({ username: ['', Validators.compose([Validators.required, Validators.minLength(4)])], password: ['', Validators.required] }); + + this.translationInit(translate); } /** @@ -83,4 +90,18 @@ export class AlfrescoLoginComponent { return true; } } + + /** + * Initial configuration for Multi language + * @param translate + */ + translationInit(translate: TranslateService) { + this.translate = translate; + let userLang = navigator.language.split('-')[0]; // use navigator lang if available + userLang = /(fr|en)/gi.test(userLang) ? userLang : 'en'; + + this.translate.setDefaultLang('en'); + + this.translate.use(userLang); + } }