diff --git a/src/app/services/internationalisation.service.ts b/src/app/services/internationalisation.service.ts index 971508c2be3bf1fe1d15236539403e7a38e5b77a..d8ddcb808c8dc200c2a215f07c7253bae4d1c3e1 100644 --- a/src/app/services/internationalisation.service.ts +++ b/src/app/services/internationalisation.service.ts @@ -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;