diff --git a/src/addons/filter/multilang2/services/handlers/multilang2.ts b/src/addons/filter/multilang2/services/handlers/multilang2.ts index 003b2786a..91976ed1f 100644 --- a/src/addons/filter/multilang2/services/handlers/multilang2.ts +++ b/src/addons/filter/multilang2/services/handlers/multilang2.ts @@ -45,7 +45,7 @@ export class AddonFilterMultilang2HandlerService extends CoreFilterDefaultHandle const currentLang = await CoreLang.getCurrentLanguage(); this.replacementDone = false; - const parentLanguage = CoreLang.getParentLanguage(currentLang); + const parentLanguage = CoreLang.getParentLanguage(); const search = /{\s*mlang\s+((?:[a-z0-9_-]+)(?:\s*,\s*[a-z0-9_-]+\s*)*)\s*}(.*?){\s*mlang\s*}/gim; const result = text.replace( diff --git a/src/core/services/lang.ts b/src/core/services/lang.ts index 73497ee4d..7af4b5e9b 100644 --- a/src/core/services/lang.ts +++ b/src/core/services/lang.ts @@ -152,12 +152,11 @@ export class CoreLangProvider { /** * Get the parent language defined on the language strings. * - * @param currentLanguage Current language. * @returns If a parent language is set, return the index name. */ - getParentLanguage(currentLanguage: string): string | undefined { + getParentLanguage(): string | undefined { const parentLang = Translate.instant('core.parentlanguage'); - if (parentLang != '' && parentLang != 'core.parentlanguage' && parentLang != currentLanguage) { + if (parentLang !== '' && parentLang !== 'core.parentlanguage' && parentLang !== this.currentLanguage) { return parentLang; } } @@ -169,41 +168,16 @@ export class CoreLangProvider { * @returns Promise resolved when the change is finished. */ async changeCurrentLanguage(language: string): Promise { - const promises: Promise[] = []; - - // Change the language, resolving the promise when we receive the first value. - promises.push(new Promise((resolve, reject) => { - CoreSubscriptions.once(Translate.use(language), async data => { - // Check if it has a parent language. - const fallbackLang = this.getParentLanguage(language); - - if (fallbackLang) { - try { - // Merge parent translations with the child ones. - const parentTranslations = Translate.translations[fallbackLang] ?? await this.readLangFile(fallbackLang); - - const mergedData = Object.assign(parentTranslations, data); - - Object.assign(data, mergedData); - } catch { - // Ignore errors. - } - } - - resolve(data); - }, reject); - })); - - // Change the config. - promises.push(CoreConfig.set('current_language', language)); - // Use british english when parent english is loaded. moment.locale(language == 'en' ? 'en-gb' : language); this.currentLanguage = language; try { - await Promise.all(promises); + await Promise.all([ + this.reloadLanguageStrings(), + CoreConfig.set('current_language', language), + ]); } finally { // Load the custom and site plugins strings for the language. if (this.loadLangStrings(this.customStrings, language) || this.loadLangStrings(this.sitePluginsStrings, language)) { @@ -558,6 +532,39 @@ export class CoreLangProvider { } } + /** + * Reload language strings for the current language. + */ + protected async reloadLanguageStrings(): Promise { + const currentLanguage = this.currentLanguage; + + if (!currentLanguage) { + return; + } + + await new Promise((resolve, reject) => { + CoreSubscriptions.once(Translate.use(currentLanguage), async data => { + // Check if it has a parent language. + const fallbackLang = this.getParentLanguage(); + + if (fallbackLang) { + try { + // Merge parent translations with the child ones. + const parentTranslations = Translate.translations[fallbackLang] ?? await this.readLangFile(fallbackLang); + + const mergedData = Object.assign(parentTranslations, data); + + Object.assign(data, mergedData); + } catch { + // Ignore errors. + } + } + + resolve(data); + }, reject); + }); + } + } export const CoreLang = makeSingleton(CoreLangProvider); diff --git a/src/core/services/utils/url.ts b/src/core/services/utils/url.ts index 32c2e568d..2f21fe6fd 100644 --- a/src/core/services/utils/url.ts +++ b/src/core/services/utils/url.ts @@ -261,7 +261,7 @@ export class CoreUrlUtilsProvider { try { let lang = await CoreLang.getCurrentLanguage(); - lang = CoreLang.getParentLanguage(lang) || lang; + lang = CoreLang.getParentLanguage() || lang; return docsUrl.replace('/en/', '/' + lang + '/'); } catch (error) {