From: ilanap Date: Thu, 7 Sep 2017 09:37:09 +0000 (+0300) Subject: Fix for missing parameters in validation message X-Git-Tag: 1.0.0-Amsterdam~152^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=49a44ffc7e72f2375bcf98a4586059c5483fdb8c;p=sdc.git Fix for missing parameters in validation message Issue-Id: SDC-289 Change-Id: I8f369c1ef3af7c2e08db9584ffe59e48cfee00ae Signed-off-by: ilanap --- diff --git a/openecomp-ui/src/nfvo-utils/i18n/i18n.js b/openecomp-ui/src/nfvo-utils/i18n/i18n.js index 2f63dfe605..ef97b8bab4 100644 --- a/openecomp-ui/src/nfvo-utils/i18n/i18n.js +++ b/openecomp-ui/src/nfvo-utils/i18n/i18n.js @@ -14,14 +14,16 @@ * permissions and limitations under the License. */ import IntlObj from 'intl'; +import IntlMessageFormatObj from 'intl-messageformat'; import IntlRelativeFormatObj from 'intl-relativeformat'; import createFormatCacheObj from 'intl-format-cache'; import i18nJson from 'i18nJson'; /* - Intl libs are using out dated transpailer from ecmascript6. -* TODO: As soon as they fix it, remove this assignments!!! -* */ + Intl libs are using out dated transpailer from ecmascript6. + * TODO: As soon as they fix it, remove this assignments!!! + * */ var Intl = window.Intl || IntlObj.default, + IntlMessageFormat = IntlMessageFormatObj.default, IntlRelativeFormat = IntlRelativeFormatObj.default, createFormatCache = createFormatCacheObj.default; @@ -68,11 +70,15 @@ var i18n = { dateRelative(date, options) { return createFormatCache(IntlRelativeFormat)(this._locale, options).format(date); }, - message(messageId) { + message(messageId, options) { + let messageTxt = null; if (i18nJson && i18nJson[messageId]) { - return i18nJson[messageId]; + messageTxt = i18nJson[messageId]; + } else { + messageTxt = String(messageId); } - return messageId; + return createFormatCache(IntlMessageFormat)(messageTxt, this._locale).format(options); + }, getLocale() { return this._locale;