Bug in the language switcher and the language itself mathkruger#73

francesco-buscicchio · Jul 13, 2023 · ab324af · ab324af
1 parent 2f33de4
commit ab324af
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -35,7 +35,7 @@ import { SelectPlaylistComponent } from "./pages/select-playlist/select-playlist
 import { PodcastsComponent } from './pages/podcasts/podcasts.component';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
-import { LanguageSwitcherComponent } from './components/language-switcher/language-switcher.component';
+import { LanguageSwitcherComponent,WindowProvider } from './components/language-switcher/language-switcher.component';
 import { VolumeBoxComponent } from './components/volume-box/volume-box.component';
 import { SettingsComponent } from './pages/settings/settings.component';
 import { YoutubePlayerComponent } from './components/youtube-player/youtube-player.component';
@@ -97,7 +97,7 @@ import { MatInputModule } from '@angular/material/input';
     ],
   providers: [
     { provide: HTTP_INTERCEPTORS, useClass: TokenVerificationInterceptorService, multi: true },
-    PipesModule
+    PipesModule,WindowProvider
   ],
   bootstrap: [AppComponent]
 })

diff --git a/src/app/components/language-switcher/language-switcher.component.ts b/src/app/components/language-switcher/language-switcher.component.ts
@@ -1,5 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
+import { Injectable, Inject } from '@angular/core';
+
+
 
 @Component({
   selector: 'app-language-switcher',
@@ -8,14 +11,16 @@ import { TranslateService } from '@ngx-translate/core';
 })
 export class LanguageSwitcherComponent implements OnInit {
 
-  constructor(public translate: TranslateService) { }
+  constructor(public translate: TranslateService, @Inject('WINDOW') private window: Window) { }
 
   currentLang: any;
   languages: any[] = [];
   hidden: boolean = true;
 
   ngOnInit() {
-    const defaultLanguage = window.localStorage.getItem("languageSelected") || this.translate.getDefaultLang();
+    const defaultLanguage = window.localStorage.getItem("languageSelected") || this.window.navigator.language.slice(0,2);
+
+
 
     this.translate.getLangs().forEach(lang => {
       this.languages.push({
@@ -49,3 +54,9 @@ export class LanguageSwitcherComponent implements OnInit {
     window.localStorage.setItem('languageSelected', lang.code);
   }
 }
+
+export const WindowProvider = [{ provide: "WINDOW", useFactory: getWindow }];
+
+export function getWindow(): Window {
+    return window;
+}