Skip to content
Snippets Groups Projects
Commit a36f6347 authored by mathias.chouet's avatar mathias.chouet
Browse files

Fix #426 - HTML entities in translated messages

parent 1ee3491c
No related branches found
No related tags found
1 merge request!82Resolve "Ajout de la fonctionnalité "Respect des critères""
......@@ -119,16 +119,16 @@ export class I18nService extends Observable implements Observer {
return `*** messages not loaded: ${this._currentLanguage} ***`;
}
if (messages[textKey] !== undefined) {
return messages[textKey];
return decodeHtml(messages[textKey]);
} else {
// try general message
if(msg !== undefined && this._Messages["INFO_LIB_"+textKey.toUpperCase()] !== undefined) {
return this._Messages["INFO_LIB_"+textKey.toUpperCase()];
if (msg !== undefined && this._Messages["INFO_LIB_" + textKey.toUpperCase()] !== undefined) {
return decodeHtml(this._Messages["INFO_LIB_" + textKey.toUpperCase()]);
}
if (!isDevMode()) {
// try fallback language before giving up
if (this._fallbackMessages[textKey] !== undefined) {
return this._fallbackMessages[textKey];
return decodeHtml(this._fallbackMessages[textKey]);
}
}
return `*** message not found: ${textKey} ***`;
......@@ -193,7 +193,8 @@ export class I18nService extends Observable implements Observer {
// replace "FORM_ID_X" by form name in current session, if any
m = m.replace(/FORM_ID_(\w{6})/g, (match, p1) => {
const form = ServiceFactory.formulaireService.getFormulaireFromNubId(p1); // cannot inject FormulaireService => cyclic dependency :/
// cannot inject FormulaireService => cyclic dependency :/
const form = ServiceFactory.formulaireService.getFormulaireFromNubId(p1);
let formName = "**UNKNOWN_FORM**";
if (form !== undefined) {
formName = form.calculatorName;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment