EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3947 lang: Fallback to previous language if cannot load selected

main
Pau Ferrer Ocaña 2023-11-20 15:34:24 +01:00
parent d2fa4e6382
commit af22db5605
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/services/lang.ts
View File

@ -27,6 +27,7 @@ import { CorePlatform } from '@services/platform';
import { AddonFilterMultilangHandler } from '@addons/filter/multilang/services/handlers/multilang'; import { AddonFilterMultilangHandler } from '@addons/filter/multilang/services/handlers/multilang';
import { AddonFilterMultilang2Handler } from '@addons/filter/multilang2/services/handlers/multilang2'; import { AddonFilterMultilang2Handler } from '@addons/filter/multilang2/services/handlers/multilang2';
import { firstValueFrom } from 'rxjs'; import { firstValueFrom } from 'rxjs';
import { CoreLogger } from '@singletons/logger';
/* /*
* Service to handle language features, like changing the current language. * Service to handle language features, like changing the current language.
@ -40,6 +41,11 @@ export class CoreLangProvider {
protected customStrings: CoreLanguageObject = {}; // Strings defined using the admin tool. protected customStrings: CoreLanguageObject = {}; // Strings defined using the admin tool.
protected customStringsRaw?: string; protected customStringsRaw?: string;
protected sitePluginsStrings: CoreLanguageObject = {}; // Strings defined by site plugins. protected sitePluginsStrings: CoreLanguageObject = {}; // Strings defined by site plugins.
protected logger: CoreLogger;
constructor() {
this.logger = CoreLogger.getInstance('CoreLang');
}
async initialize(): Promise<void> { async initialize(): Promise<void> {
// Set fallback language and language to use until the app determines the right language to use. // Set fallback language and language to use until the app determines the right language to use.
@ -171,13 +177,21 @@ export class CoreLangProvider {
// Use british english when parent english is loaded. // Use british english when parent english is loaded.
moment.locale(language == 'en' ? 'en-gb' : language); moment.locale(language == 'en' ? 'en-gb' : language);
const previousLanguage = this.currentLanguage ?? this.getDefaultLanguage();
this.currentLanguage = language; this.currentLanguage = language;
try { try {
await Promise.all([ await this.reloadLanguageStrings();
this.reloadLanguageStrings(), await CoreConfig.set('current_language', language);
CoreConfig.set('current_language', language), } catch (error) {
]); if (language !== previousLanguage) {
this.logger.error(`Language ${language} not available, reverting to ${previousLanguage}`, error);
return this.changeCurrentLanguage(previousLanguage);
}
throw error;
} finally { } finally {
// Load the custom and site plugins strings for the language. // Load the custom and site plugins strings for the language.
if (this.loadLangStrings(this.customStrings, language) || this.loadLangStrings(this.sitePluginsStrings, language)) { if (this.loadLangStrings(this.customStrings, language) || this.loadLangStrings(this.sitePluginsStrings, language)) {