Merge pull request #4139 from dpalou/MOBILE-4591
MOBILE-4591 lang: Fix parent language strings overriden by mistakemain
commit
5a8911e8ae
|
@ -599,7 +599,10 @@ export class CoreLangProvider {
|
|||
// Merge parent translations with the child ones.
|
||||
const parentTranslations = Translate.translations[fallbackLang] ?? await this.readLangFile(fallbackLang);
|
||||
|
||||
const mergedData = Object.assign(parentTranslations, data);
|
||||
const mergedData = {
|
||||
...parentTranslations,
|
||||
...data,
|
||||
};
|
||||
|
||||
Object.assign(data, mergedData);
|
||||
} catch {
|
||||
|
|
Loading…
Reference in New Issue