TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-01-07 23:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(console): fallback to default language if browser language not supported (#5999)

Browse Source 
fix: fallback to default language if browser language not supported
This commit is contained in:
Max Peintner 2023-06-09 15:14:15 +02:00 committed by GitHub
parent 66e639b5ad
commit dafa8ab4df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
console/src/app/app.component.ts
View File

@ -19,6 +19,7 @@ import { KeyboardShortcutsService } from './services/keyboard-shortcuts/keyboard
import { ManagementService } from './services/mgmt.service'; import { ManagementService } from './services/mgmt.service';
import { ThemeService } from './services/theme.service'; import { ThemeService } from './services/theme.service';
import { UpdateService } from './services/update.service'; import { UpdateService } from './services/update.service';
import { fallbackLanguage, supportedLanguages, supportedLanguagesRegexp } from './utils/language';
@Component({ @Component({
selector: 'cnsl-root', selector: 'cnsl-root',
@ -267,15 +268,15 @@ export class AppComponent implements OnDestroy {
} }
private setLanguage(): void { private setLanguage(): void {
this.translate.addLangs(['de', 'en', 'es', 'fr', 'it', 'ja', 'pl', 'zh']); this.translate.addLangs(supportedLanguages);
this.translate.setDefaultLang('en'); this.translate.setDefaultLang(fallbackLanguage);
this.authService.user.subscribe((userprofile) => { this.authService.user.subscribe((userprofile) => {
if (userprofile) { if (userprofile) {
const cropped = navigator.language.split('-')[0] ?? 'en'; const cropped = navigator.language.split('-')[0] ?? fallbackLanguage;
const fallbackLang = cropped.match(/de|en|es|fr|it|ja|pl|zh/) ? cropped : 'en'; const fallbackLang = cropped.match(supportedLanguagesRegexp) ? cropped : fallbackLanguage;
const lang = userprofile?.human?.profile?.preferredLanguage.match(/de|en|es|fr|it|ja|pl|zh/) const lang = userprofile?.human?.profile?.preferredLanguage.match(supportedLanguagesRegexp)
? userprofile.human.profile?.preferredLanguage ? userprofile.human.profile?.preferredLanguage
: fallbackLang; : fallbackLang;
this.translate.use(lang); this.translate.use(lang);

6
console/src/app/services/grpc.service.ts
View File

@ -8,6 +8,7 @@ import { catchError, switchMap, tap, throwError } from 'rxjs';
import { AdminServiceClient } from '../proto/generated/zitadel/AdminServiceClientPb'; import { AdminServiceClient } from '../proto/generated/zitadel/AdminServiceClientPb';
import { AuthServiceClient } from '../proto/generated/zitadel/AuthServiceClientPb'; import { AuthServiceClient } from '../proto/generated/zitadel/AuthServiceClientPb';
import { ManagementServiceClient } from '../proto/generated/zitadel/ManagementServiceClientPb'; import { ManagementServiceClient } from '../proto/generated/zitadel/ManagementServiceClientPb';
import { fallbackLanguage, supportedLanguagesRegexp } from '../utils/language';
import { AuthenticationService } from './authentication.service'; import { AuthenticationService } from './authentication.service';
import { EnvironmentService } from './environment.service'; import { EnvironmentService } from './environment.service';
import { ExhaustedService } from './exhausted.service'; import { ExhaustedService } from './exhausted.service';
@ -40,8 +41,11 @@ export class GrpcService {
public loadAppEnvironment(): Promise<any> { public loadAppEnvironment(): Promise<any> {
this.themeService.applyLabelPolicy(); this.themeService.applyLabelPolicy();
// We use the browser language until we can make API requests to get the users configured language. // We use the browser language until we can make API requests to get the users configured language.
const browserLanguage = this.translate.getBrowserLang();
const language = browserLanguage?.match(supportedLanguagesRegexp) ? browserLanguage : fallbackLanguage;
return this.translate return this.translate
.use(this.translate.getBrowserLang() || this.translate.defaultLang) .use(language || this.translate.defaultLang)
.pipe( .pipe(
switchMap(() => this.envService.env), switchMap(() => this.envService.env),
tap((env) => { tap((env) => {

3
console/src/app/utils/language.ts Normal file
View File

@ -0,0 +1,3 @@
export const supportedLanguages = ['de', 'en', 'es', 'fr', 'it', 'ja', 'pl', 'zh'];
export const supportedLanguagesRegexp: RegExp = /de|en|es|fr|it|ja|pl|zh/;
export const fallbackLanguage: string = 'en';