fix(search-source): fix language reload on search source (#1189)

infra-geo-ouverte · Mar 21, 2023 · 750d461 · 750d461
1 parent 692a95e
commit 750d461
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/packages/core/src/lib/language/shared/language.service.ts b/packages/core/src/lib/language/shared/language.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, combineLatest } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
@@ -21,8 +21,8 @@ export class LanguageService {
 
   public setLanguage(language: string) {
     this.language = language.match(/en|fr/) ? language : 'en';
-    this.language$.next(this.language);
-    this.translate.use(this.language);
-    this.translate.reloadLang(this.language);
+    combineLatest([this.translate.use(this.language), this.translate.reloadLang(this.language)]).subscribe(() => {
+      this.language$.next(this.language);
+    });
   }
 }
diff --git a/packages/geo/src/lib/search/shared/sources/coordinates.ts b/packages/geo/src/lib/search/shared/sources/coordinates.ts
@@ -47,13 +47,13 @@ export class CoordinatesReverseSearchSource extends SearchSource
     @Inject('options') options: SearchSourceOptions,
     private languageService: LanguageService,
     storageService: StorageService,
-    @Inject('projections') projections: Projection[],
+    @Inject('projections') projections: Projection[]
   ) {
     super(options, storageService);
     this.projections = projections;
-    this.languageService.translate
-      .get(this.options.title)
-      .subscribe(title => this.title$.next(title));
+    this.languageService.language$.subscribe(() => {
+      this.title$.next(this.languageService.translate.instant(this.options.title));
+    });
   }
 
   getId(): string {

diff --git a/packages/geo/src/lib/search/shared/sources/icherche.ts b/packages/geo/src/lib/search/shared/sources/icherche.ts
@@ -85,10 +85,6 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
   ) {
     super(options, storageService);
 
-    this.languageService.translate
-      .get(this.options.title)
-      .subscribe((title) => this.title$.next(title));
-
     const authService = injector.get(AuthService);
     if (this.settings.length) {
       if (!authService) {
@@ -99,6 +95,10 @@ export class IChercheSearchSource extends SearchSource implements TextSearch {
         });
       }
     }
+
+    this.languageService.language$.subscribe(() => {
+      this.title$.next(this.languageService.translate.instant(this.options.title));
+    });
   }
 
   getId(): string {
@@ -653,9 +653,9 @@ export class IChercheReverseSearchSource extends SearchSource
   ) {
     super(options, storageService);
 
-    this.languageService.translate
-      .get(this.options.title)
-      .subscribe((title) => this.title$.next(title));
+    this.languageService.language$.subscribe(() => {
+      this.title$.next(this.languageService.translate.instant(this.options.title));
+    });
 
     const authService = injector.get(AuthService);
     if (this.settings.length) {

diff --git a/packages/geo/src/lib/search/shared/sources/ilayer.ts b/packages/geo/src/lib/search/shared/sources/ilayer.ts
@@ -86,9 +86,9 @@ export class ILayerSearchSource extends SearchSource implements TextSearch {
     private formatter: ILayerSearchResultFormatter
   ) {
     super(options, storageService);
-    this.languageService.translate
-      .get(this.options.title)
-      .subscribe(title => this.title$.next(title));
+    this.languageService.language$.subscribe(() => {
+      this.title$.next(this.languageService.translate.instant(this.options.title));
+    });
   }
 
   getId(): string {