From 69301bd966d7f6836158ff8cc56dee119dd7f63f Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 6 Jan 2016 17:07:05 +0100 Subject: fix translations --- server/sonar-web/src/main/js/helpers/l10n.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'server/sonar-web/src/main/js') diff --git a/server/sonar-web/src/main/js/helpers/l10n.js b/server/sonar-web/src/main/js/helpers/l10n.js index e3c2c2a9b91..2b57dd45631 100644 --- a/server/sonar-web/src/main/js/helpers/l10n.js +++ b/server/sonar-web/src/main/js/helpers/l10n.js @@ -30,11 +30,11 @@ export function translate (...keys) { export function translateWithParameters (messageKey, ...parameters) { const message = messages[messageKey]; if (message) { - return parameters.reduce((acc, parameter, index) => ( - acc.replace(`{${index}}`, parameter) - )); + return parameters.reduce((acc, parameter, index) => { + return acc.replace(`{${index}}`, parameter); + }, message); } else { - return `${messageKey} ${parameters.join(' ')}`; + return `${messageKey}.${parameters.join('.')}`; } } @@ -80,6 +80,10 @@ export function requestMessages () { }); } +export function resetBundle (bundle) { + messages = bundle; +} + export function installGlobal () { window.t = translate; window.tp = translateWithParameters; -- cgit v1.2.3