Skip to content

Commit

Permalink
Merge pull request #4139 from dpalou/MOBILE-4591
Browse files Browse the repository at this point in the history
MOBILE-4591 lang: Fix parent language strings overriden by mistake
  • Loading branch information
crazyserver authored Aug 13, 2024
2 parents 330b702 + 3923518 commit 5a8911e
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/core/services/lang.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 5a8911e

Please sign in to comment.