From 2fa5d05c2b23deea2a06d18235424109979036a6 Mon Sep 17 00:00:00 2001 From: Carlos Santos <4a.santos@gmail.com> Date: Wed, 9 Nov 2022 13:31:40 +0100 Subject: [PATCH] openvidu-components: Fixed bug with captions lang initialization --- .../lib/services/caption/caption.service.ts | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/caption/caption.service.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/caption/caption.service.ts index e5948e70..9f5882f0 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/caption/caption.service.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/caption/caption.service.ts @@ -9,8 +9,7 @@ import { StorageService } from '../storage/storage.service'; providedIn: 'root' }) export class CaptionService { - - private langTitles = [ + private langs = [ { name: 'English', ISO: 'en-US' }, { name: 'Español', ISO: 'es-ES' }, { name: 'Deutsch', ISO: 'de-DE' }, @@ -21,15 +20,18 @@ export class CaptionService { { name: 'やまと', ISO: 'jp-JP' }, { name: 'Português', ISO: 'pt-PT' } ]; - captionLangSelected: { name: string; ISO: string }; + captionLangSelected: { name: string; ISO: string } = { name: 'English', ISO: 'en-US' }; captionLangObs: Observable<{ name: string; ISO: string }>; private _captionLangObs: Subject<{ name: string; ISO: string }> = new Subject(); private captionsEnabled: boolean = false; constructor(private storageService: StorageService) { const iso = this.storageService.getCaptionsLang(); - if (iso) { - this.captionLangSelected = this.langTitles.find((lang) => lang.ISO === iso) || this.langTitles[0]; + const lang = this.langs.find((lang) => lang.ISO === iso); + if (iso && lang) { + this.captionLangSelected = lang; + } else { + this.captionLangSelected = this.langs[0]; } this.captionLangObs = this._captionLangObs.asObservable(); } @@ -43,8 +45,8 @@ export class CaptionService { } setLanguage(lang: string) { - const newLang = this.langTitles.find((l) => l.ISO === lang); - if(!!newLang && newLang.ISO !== this.captionLangSelected.ISO){ + const newLang = this.langs.find((l) => l.ISO === lang); + if (!!newLang && newLang.ISO !== this.captionLangSelected.ISO) { this.captionLangSelected = newLang; this.storageService.setCaptionLang(lang); this._captionLangObs.next(this.captionLangSelected); @@ -52,10 +54,10 @@ export class CaptionService { } getLangSelected(): { name: string; ISO: string } { - return this.captionLangSelected || this.langTitles[0]; + return this.captionLangSelected; } getCaptionLanguages(): { name: string; ISO: string }[] { - return this.langTitles; + return this.langs; } }