fix conflict in login componemt

mekawy-issues
Mohamed Mekawy 6 years ago
parent a928d525bc
commit 97f6089272

@ -95,14 +95,6 @@ export class LoginComponent implements OnInit, OnDestroy {
private checkUserResult: CheckUserAuthenticationResponse;
ngOnInit() {
<<<<<<< HEAD
this.cs.stopLoading();
// tslint:disable-next-line: triple-equals
if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) {
this.language = 'US';
} else {
this.language = 'AR';
=======
this.currentLang = TranslatorService.getCurrentLanguageCode();
console.log(TranslatorService.CURRENT_LANGUAGE)
console.log(TranslatorService.EN)
@ -112,7 +104,6 @@ export class LoginComponent implements OnInit, OnDestroy {
} else {
this.language = "AR";
this.changeLanguage('1')
>>>>>>> master-newdesign
}
console.log("current lang: "+this.currentLang)
//this.ts.switchLanguage();

Loading…
Cancel
Save