Skip to content

MOBILE-3189 lang: Emit onLangChange when custom strings loaded #2146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 8, 2019
Merged

MOBILE-3189 lang: Emit onLangChange when custom strings loaded #2146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/assets/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,7 @@
"core.back": "Back",
"core.block.blocks": "Blocks",
"core.cancel": "Cancel",
"core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 2.4 or later.",
"core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle 3.1 or later.",
"core.cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.",
"core.captureaudio": "Record audio",
"core.capturedimage": "Taken picture.",
Expand Down
14 changes: 14 additions & 0 deletions src/providers/lang.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,8 @@ export class CoreLangProvider {
return;
}

let currentLangChanged = false;

const list: string[] = strings.split(/(?:\r\n|\r|\n)/);
list.forEach((entry: string) => {
const values: string[] = entry.split('|');
Expand All @@ -327,6 +329,10 @@ export class CoreLangProvider {

lang = values[2].replace(/_/g, '-'); // Use the app format instead of Moodle format.

if (lang == this.currentLanguage) {
currentLangChanged = true;
}

if (!this.customStrings[lang]) {
this.customStrings[lang] = {};
}
Expand All @@ -340,6 +346,14 @@ export class CoreLangProvider {
});

this.customStringsRaw = strings;

if (currentLangChanged) {
// Some lang strings have changed, emit an event to update the pipes.
this.translate.onLangChange.emit({
lang: this.currentLanguage,
translations: this.translate.translations[this.currentLanguage]
});
}
}

/**
Expand Down