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

Merge pull request #1799 from dpalou/MOBILE-2912 

MOBILE-2912 lang: Fix coumpound langs for site plugins
main
Juan Leyva 2019-03-11 13:26:03 +01:00 committed by GitHub
parent eaa1399087 a4349077df
commit 513c7e452b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/providers/lang.ts
View File

@ -58,6 +58,8 @@ export class CoreLangProvider {
* @param {string} [prefix] A prefix to add to all keys. * @param {string} [prefix] A prefix to add to all keys.
*/ */
addSitePluginsStrings(lang: string, strings: any, prefix?: string): void { addSitePluginsStrings(lang: string, strings: any, prefix?: string): void {
lang = lang.replace('_', '-'); // Use the app format instead of Moodle format.
// Initialize structure if it doesn't exist. // Initialize structure if it doesn't exist.
if (!this.sitePluginsStrings[lang]) { if (!this.sitePluginsStrings[lang]) {
this.sitePluginsStrings[lang] = {}; this.sitePluginsStrings[lang] = {};
@ -305,7 +307,7 @@ export class CoreLangProvider {
return; return;
} }
lang = values[2]; lang = values[2].replace('_', '-'); // Use the app format instead of Moodle format.
if (!this.customStrings[lang]) { if (!this.customStrings[lang]) {
this.customStrings[lang] = {}; this.customStrings[lang] = {};
@ -361,6 +363,8 @@ export class CoreLangProvider {
* @param {string} value String value. * @param {string} value String value.
*/ */
loadString(langObject: any, lang: string, key: string, value: string): void { loadString(langObject: any, lang: string, key: string, value: string): void {
lang = lang.replace('_', '-'); // Use the app format instead of Moodle format.
if (this.translate.translations[lang]) { if (this.translate.translations[lang]) {
// The language is loaded. // The language is loaded.
// Store the original value of the string. // Store the original value of the string.