Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-1742: Fixed change language

Browse Source
This commit is contained in:
Adina Țeudan 2021-07-02 17:11:44 +03:00
parent 5fd1fb413e
commit 3788b6bfdf
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/red-ui/src/app/components/base-screen/base-screen.component.ts
View File

@ -1,7 +1,6 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { UserService } from '@services/user.service'; import { UserService } from '@services/user.service';
import { AppStateService } from '@state/app-state.service'; import { AppStateService } from '@state/app-state.service';
import { LanguageService } from '@i18n/language.service';
import { PermissionsService } from '@services/permissions.service'; import { PermissionsService } from '@services/permissions.service';
import { UserPreferenceService } from '@services/user-preference.service'; import { UserPreferenceService } from '@services/user-preference.service';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
@ -26,7 +25,6 @@ export class BaseScreenComponent {
private readonly _statusOverlayService: StatusOverlayService, private readonly _statusOverlayService: StatusOverlayService,
private readonly _appConfigService: AppConfigService, private readonly _appConfigService: AppConfigService,
private readonly _router: Router, private readonly _router: Router,
private readonly _languageService: LanguageService,
private readonly _userService: UserService, private readonly _userService: UserService,
private readonly _translateService: TranslateService private readonly _translateService: TranslateService
) { ) {
@ -56,8 +54,4 @@ export class BaseScreenComponent {
logout() { logout() {
this._userService.logout(); this._userService.logout();
} }
changeLanguage(language: string) {
this._languageService.changeLanguage(language);
}
} }

2
apps/red-ui/src/app/components/user-profile/user-profile-screen.component.ts
View File

@ -61,7 +61,7 @@ export class UserProfileScreenComponent implements OnInit {
this.viewReady = false; this.viewReady = false;
if (this.languageChanged) { if (this.languageChanged) {
this._languageService.changeLanguage(this.formGroup.get('language').value); await this._languageService.changeLanguage(this.formGroup.get('language').value);
} }
if (this.profileChanged) { if (this.profileChanged) {

4
apps/red-ui/src/app/i18n/language.service.ts
View File

@ -30,9 +30,9 @@ export class LanguageService {
this._translateService.use(defaultLang).subscribe(() => {}); this._translateService.use(defaultLang).subscribe(() => {});
} }
changeLanguage(language: string) { async changeLanguage(language: string) {
localStorage.setItem('redaction.language', language); localStorage.setItem('redaction.language', language);
document.documentElement.lang = language; document.documentElement.lang = language;
this._translateService.use(language).subscribe(() => {}); await this._translateService.use(language).toPromise();
} }
} }