From 00e935fc6b8baae4d9b9ffef2c748202a60b66b4 Mon Sep 17 00:00:00 2001 From: avigaffa Date: Sun, 10 Sep 2017 08:58:51 +0300 Subject: Add latest bug fixes to master Change-Id: Ieddc2330ad4e093984f14a69b52f2ca5cb465a10 Issue-ID: SDC-293 Signed-off-by: avigaffa --- openecomp-ui/src/nfvo-utils/i18n/i18n.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'openecomp-ui/src/nfvo-utils') 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; -- cgit 1.2.3-korg