@zohodesk/i18n 1.0.0-beta.24 → 1.0.0-beta.26

package/README.md

@@ -1,5 +1,13 @@
 # i18n
 
+# 1.0.0-beta.26
+
+- Localization feature enhancement in i18n method.
+
+# 1.0.0-beta.25
+
+- July i18n key correction
+
 # 1.0.0-beta.24
 
 - I18N support for Days, Months and 12-hour time variables.

package/es/index.js

@@ -1,4 +1,4 @@
-export { formatDate, pad, replaceI18NValuesWithRegex, unescapeUnicode, getValues, getI18NInfo, isToday, isYesterday, isTomorrow, isWithinAWeek, isTwoWeeksOrMore, userDateFormat, getDiffObj, getLyears, getSuffix, getDatePatternWithoutYear, setLocalizedData, dayi18n, monthi18n, timei18n } from './utils';
+export { formatDate, pad, replaceI18NValuesWithRegex, unescapeUnicode, getValues, getI18NInfo, isToday, isYesterday, isTomorrow, isWithinAWeek, isTwoWeeksOrMore, userDateFormat, getDiffObj, getLyears, getSuffix, getDatePatternWithoutYear, setLocalizedData, setI18NKeyMapping, dayi18n, monthi18n, timei18n } from './utils';
 import { getI18NValue as getI18NValue1 } from './utils';
 export { I18NContext } from './I18NContext';
 export { default as I18NProvider, i18NProviderUtils } from './components/I18NProvider';

package/es/utils.js

@@ -35,7 +35,7 @@ export const monthi18n = {
   'April': 'deskreact.calendar.monthname.april',
   'May': 'deskreact.calendar.monthname.may',
   'June': 'deskreact.calendar.monthname.june',
-  'July': 'deskreact.calendar.monthname.July',
+  'July': 'deskreact.calendar.monthname.july',
   'August': 'deskreact.calendar.monthname.august',
   'September': 'deskreact.calendar.monthname.september',
   'October': 'deskreact.calendar.monthname.october',
@@ -176,9 +176,38 @@ export function getValues() {
   let diff = arguments.length > 1 ? arguments[1] : undefined;
   return params.map(param => diff[param]);
 }
+export function isObject(item) {
+  return item && typeof item === 'object' && !Array.isArray(item);
+}
 let localizedData = {};
+let localizedStringData = {};
+
+let getMappedKey = key => key;
+
+function setLocalizedStringData(data) {
+  let keyString = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+
+  if (typeof data === 'string') {
+    localizedStringData[keyString] = data;
+    return;
+  }
+
+  const keys = Object.keys(data);
+
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    const newKeyString = keyString ? `${keyString}.${key}` : key;
+    setLocalizedStringData(data[key], newKeyString);
+  }
+}
+
 export function setLocalizedData(data) {
-  localizedData = data;
+  const translationData = isObject(data) ? data : {};
+  localizedData = translationData;
+  setLocalizedStringData(translationData);
+}
+export function setI18NKeyMapping(func) {
+  getMappedKey = func;
 }
 export function getLocalizedValue() {
   let {
@@ -214,11 +243,12 @@ export function getI18NValue(i18n) {
   }
 
   return (key, values, localizedProps) => {
-    const localizedValue = localizedProps ? getLocalizedValue(localizedProps) : null;
-    let i18nStr = i18n[key];
+    const localizedValue = localizedProps ? getLocalizedValue(localizedProps) : localizedStringData[key];
+    const finalKey = getMappedKey(key);
+    let i18nStr = i18n[finalKey];
 
     if (i18nStr === undefined) {
-      return localizedValue || key;
+      return localizedValue || finalKey;
     }
 
     i18nStr = replaceI18NValuesWithRegex(i18nStr, values);

package/lib/index.js

@@ -156,6 +156,12 @@ Object.defineProperty(exports, "replaceI18NValuesWithRegex", {
     return _utils.replaceI18NValuesWithRegex;
   }
 });
+Object.defineProperty(exports, "setI18NKeyMapping", {
+  enumerable: true,
+  get: function get() {
+    return _utils.setI18NKeyMapping;
+  }
+});
 Object.defineProperty(exports, "setLocalizedData", {
   enumerable: true,
   get: function get() {

package/lib/utils.js

@@ -13,6 +13,7 @@ exports.getLocalizedValue = getLocalizedValue;
 exports.getLyears = getLyears;
 exports.getSuffix = getSuffix;
 exports.getValues = getValues;
+exports.isObject = isObject;
 exports.isToday = isToday;
 exports.isTomorrow = isTomorrow;
 exports.isTwoWeeksOrMore = isTwoWeeksOrMore;
@@ -21,6 +22,7 @@ exports.isYesterday = isYesterday;
 exports.monthi18n = void 0;
 exports.pad = pad;
 exports.replaceI18NValuesWithRegex = replaceI18NValuesWithRegex;
+exports.setI18NKeyMapping = setI18NKeyMapping;
 exports.setLocalizedData = setLocalizedData;
 exports.timei18n = void 0;
 exports.unescapeUnicode = unescapeUnicode;
@@ -72,7 +74,7 @@ var monthi18n = (_monthi18n = {
   'February': 'deskreact.calendar.monthname.february',
   'March': 'deskreact.calendar.monthname.march',
   'April': 'deskreact.calendar.monthname.april'
-}, _defineProperty(_monthi18n, "May", 'deskreact.calendar.monthname.may'), _defineProperty(_monthi18n, 'June', 'deskreact.calendar.monthname.june'), _defineProperty(_monthi18n, 'July', 'deskreact.calendar.monthname.July'), _defineProperty(_monthi18n, 'August', 'deskreact.calendar.monthname.august'), _defineProperty(_monthi18n, 'September', 'deskreact.calendar.monthname.september'), _defineProperty(_monthi18n, 'October', 'deskreact.calendar.monthname.october'), _defineProperty(_monthi18n, 'November', 'deskreact.calendar.monthname.november'), _defineProperty(_monthi18n, 'December', 'deskreact.calendar.monthname.december'), _monthi18n);
+}, _defineProperty(_monthi18n, "May", 'deskreact.calendar.monthname.may'), _defineProperty(_monthi18n, 'June', 'deskreact.calendar.monthname.june'), _defineProperty(_monthi18n, 'July', 'deskreact.calendar.monthname.july'), _defineProperty(_monthi18n, 'August', 'deskreact.calendar.monthname.august'), _defineProperty(_monthi18n, 'September', 'deskreact.calendar.monthname.september'), _defineProperty(_monthi18n, 'October', 'deskreact.calendar.monthname.october'), _defineProperty(_monthi18n, 'November', 'deskreact.calendar.monthname.november'), _defineProperty(_monthi18n, 'December', 'deskreact.calendar.monthname.december'), _monthi18n);
 exports.monthi18n = monthi18n;
 var timei18n = {
   'a': 'support.time.format.time.am.short.small',
@@ -217,10 +219,42 @@ function getValues() {
   });
 }
 
+function isObject(item) {
+  return item && _typeof(item) === 'object' && !Array.isArray(item);
+}
+
 var localizedData = {};
+var localizedStringData = {};
+
+var getMappedKey = function getMappedKey(key) {
+  return key;
+};
+
+function setLocalizedStringData(data) {
+  var keyString = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+
+  if (typeof data === 'string') {
+    localizedStringData[keyString] = data;
+    return;
+  }
+
+  var keys = Object.keys(data);
+
+  for (var i = 0; i < keys.length; i++) {
+    var key = keys[i];
+    var newKeyString = keyString ? "".concat(keyString, ".").concat(key) : key;
+    setLocalizedStringData(data[key], newKeyString);
+  }
+}
 
 function setLocalizedData(data) {
-  localizedData = data;
+  var translationData = isObject(data) ? data : {};
+  localizedData = translationData;
+  setLocalizedStringData(translationData);
+}
+
+function setI18NKeyMapping(func) {
+  getMappedKey = func;
 }
 
 function getLocalizedValue() {
@@ -260,11 +294,12 @@ function getI18NValue(i18n) {
   }
 
   return function (key, values, localizedProps) {
-    var localizedValue = localizedProps ? getLocalizedValue(localizedProps) : null;
-    var i18nStr = i18n[key];
+    var localizedValue = localizedProps ? getLocalizedValue(localizedProps) : localizedStringData[key];
+    var finalKey = getMappedKey(key);
+    var i18nStr = i18n[finalKey];
 
     if (i18nStr === undefined) {
-      return localizedValue || key;
+      return localizedValue || finalKey;
     }
 
     i18nStr = replaceI18NValuesWithRegex(i18nStr, values);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/i18n",
-  "version": "1.0.0-beta.24",
+  "version": "1.0.0-beta.26",
   "main": "lib/index",
   "module": "es/index.js",
   "jsnext:main": "es/index.js",

package/src/index.js

@@ -16,6 +16,7 @@ export {
   getSuffix,
   getDatePatternWithoutYear,
   setLocalizedData,
+  setI18NKeyMapping,
   dayi18n,
   monthi18n,
   timei18n

package/src/utils.js

@@ -39,7 +39,7 @@ export const monthi18n = {
   'April': 'deskreact.calendar.monthname.april',
   'May': 'deskreact.calendar.monthname.may',
   'June': 'deskreact.calendar.monthname.june',
-  'July': 'deskreact.calendar.monthname.July',
+  'July': 'deskreact.calendar.monthname.july',
   'August': 'deskreact.calendar.monthname.august',
   'September': 'deskreact.calendar.monthname.september',
   'October': 'deskreact.calendar.monthname.october',
@@ -214,11 +214,37 @@ export function getValues(params = [], diff) {
   return params.map((param) => diff[param]);
 }
 
+export function isObject(item) {
+  return (item && typeof item === 'object' && !Array.isArray(item));
+}
+
 let localizedData = {};
+let localizedStringData = {};
+let getMappedKey = (key) => key;
+
+function setLocalizedStringData(data, keyString = '') {
+  if(typeof data === 'string') {
+    localizedStringData[keyString] = data;
+    return;
+  }
+  const keys = Object.keys(data);
+  for(let i = 0; i < keys.length; i++) {
+    const key = keys[i];
+    const newKeyString = keyString ?  `${keyString}.${key}` : key;
+    setLocalizedStringData(data[key], newKeyString);
+  }
+}
 
 export function setLocalizedData(data) {
-  localizedData = data;
+  const translationData = isObject(data) ? data : {};
+  localizedData = translationData;
+  setLocalizedStringData(translationData);
+}
+
+export function setI18NKeyMapping(func) {
+  getMappedKey = func;
 }
+
 export function getLocalizedValue({
   type,
   moduleName,
@@ -247,10 +273,11 @@ export function getI18NValue(i18n) {
     return (key) => key;
   }
   return (key, values, localizedProps) => {
-    const localizedValue = localizedProps ? getLocalizedValue(localizedProps) : null;
-    let i18nStr = i18n[key];
+    const localizedValue = localizedProps ? getLocalizedValue(localizedProps) : localizedStringData[key];
+    const finalKey = getMappedKey(key);
+    let i18nStr = i18n[finalKey];
     if (i18nStr === undefined) {
-      return localizedValue || key;
+      return localizedValue || finalKey;
     }
     i18nStr = replaceI18NValuesWithRegex(i18nStr, values);
     return localizedValue || unescapeUnicode(i18nStr);