@zohodesk/i18n 1.0.0-beta.16 → 1.0.0-beta.19

package/lib/index.js

@@ -1,88 +1,83 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "formatDate", {
-  enumerable: true,
-  get: function get() {
-    return _utils.formatDate;
-  }
-});
-Object.defineProperty(exports, "pad", {
+Object.defineProperty(exports, "DateTimeDiffFormat", {
   enumerable: true,
   get: function get() {
-    return _utils.pad;
+    return _DateTimeDiffFormat["default"];
   }
 });
-Object.defineProperty(exports, "replaceI18NValuesWithRegex", {
+Object.defineProperty(exports, "FormatText", {
   enumerable: true,
   get: function get() {
-    return _utils.replaceI18NValuesWithRegex;
+    return _FormatText["default"];
   }
 });
-Object.defineProperty(exports, "unescapeUnicode", {
+Object.defineProperty(exports, "HOCI18N", {
   enumerable: true,
   get: function get() {
-    return _utils.unescapeUnicode;
+    return _HOCI18N["default"];
   }
 });
-Object.defineProperty(exports, "getValues", {
+Object.defineProperty(exports, "I18N", {
   enumerable: true,
   get: function get() {
-    return _utils.getValues;
+    return _I18N["default"];
   }
 });
-Object.defineProperty(exports, "getI18NInfo", {
+Object.defineProperty(exports, "I18NContext", {
   enumerable: true,
   get: function get() {
-    return _utils.getI18NInfo;
+    return _I18NContext.I18NContext;
   }
 });
-Object.defineProperty(exports, "isToday", {
+Object.defineProperty(exports, "I18NProvider", {
   enumerable: true,
   get: function get() {
-    return _utils.isToday;
+    return _I18NProvider["default"];
   }
 });
-Object.defineProperty(exports, "isYesterday", {
+Object.defineProperty(exports, "PluralFormat", {
   enumerable: true,
   get: function get() {
-    return _utils.isYesterday;
+    return _PluralFormat["default"];
   }
 });
-Object.defineProperty(exports, "isTomorrow", {
+Object.defineProperty(exports, "UserTimeDiffFormat", {
   enumerable: true,
   get: function get() {
-    return _utils.isTomorrow;
+    return _UserTimeDiffFormat["default"];
   }
 });
-Object.defineProperty(exports, "isWithinAWeek", {
+Object.defineProperty(exports, "formatDate", {
   enumerable: true,
   get: function get() {
-    return _utils.isWithinAWeek;
+    return _utils.formatDate;
   }
 });
-Object.defineProperty(exports, "isTwoWeeksOrMore", {
+Object.defineProperty(exports, "getDatePatternWithoutYear", {
   enumerable: true,
   get: function get() {
-    return _utils.isTwoWeeksOrMore;
+    return _utils.getDatePatternWithoutYear;
   }
 });
-Object.defineProperty(exports, "userDateFormat", {
+Object.defineProperty(exports, "getDiffObj", {
   enumerable: true,
   get: function get() {
-    return _utils.userDateFormat;
+    return _utils.getDiffObj;
   }
 });
-Object.defineProperty(exports, "getDiffObj", {
+Object.defineProperty(exports, "getI18NInfo", {
   enumerable: true,
   get: function get() {
-    return _utils.getDiffObj;
+    return _utils.getI18NInfo;
   }
 });
+exports.getI18NValue = void 0;
 Object.defineProperty(exports, "getLyears", {
   enumerable: true,
   get: function get() {
@@ -95,67 +90,78 @@ Object.defineProperty(exports, "getSuffix", {
     return _utils.getSuffix;
   }
 });
-Object.defineProperty(exports, "getDatePatternWithoutYear", {
+Object.defineProperty(exports, "getValues", {
   enumerable: true,
   get: function get() {
-    return _utils.getDatePatternWithoutYear;
+    return _utils.getValues;
   }
 });
-Object.defineProperty(exports, "I18NContext", {
+Object.defineProperty(exports, "i18NProviderUtils", {
   enumerable: true,
   get: function get() {
-    return _I18NContext.I18NContext;
+    return _I18NProvider.i18NProviderUtils;
   }
 });
-Object.defineProperty(exports, "I18NProvider", {
+Object.defineProperty(exports, "isToday", {
   enumerable: true,
   get: function get() {
-    return _I18NProvider["default"];
+    return _utils.isToday;
   }
 });
-Object.defineProperty(exports, "i18NProviderUtils", {
+Object.defineProperty(exports, "isTomorrow", {
   enumerable: true,
   get: function get() {
-    return _I18NProvider.i18NProviderUtils;
+    return _utils.isTomorrow;
   }
 });
-Object.defineProperty(exports, "I18N", {
+Object.defineProperty(exports, "isTwoWeeksOrMore", {
   enumerable: true,
   get: function get() {
-    return _I18N["default"];
+    return _utils.isTwoWeeksOrMore;
   }
 });
-Object.defineProperty(exports, "HOCI18N", {
+Object.defineProperty(exports, "isWithinAWeek", {
   enumerable: true,
   get: function get() {
-    return _HOCI18N["default"];
+    return _utils.isWithinAWeek;
   }
 });
-Object.defineProperty(exports, "FormatText", {
+Object.defineProperty(exports, "isYesterday", {
   enumerable: true,
   get: function get() {
-    return _FormatText["default"];
+    return _utils.isYesterday;
   }
 });
-Object.defineProperty(exports, "PluralFormat", {
+Object.defineProperty(exports, "pad", {
   enumerable: true,
   get: function get() {
-    return _PluralFormat["default"];
+    return _utils.pad;
   }
 });
-Object.defineProperty(exports, "DateTimeDiffFormat", {
+Object.defineProperty(exports, "replaceI18NValuesWithRegex", {
   enumerable: true,
   get: function get() {
-    return _DateTimeDiffFormat["default"];
+    return _utils.replaceI18NValuesWithRegex;
   }
 });
-Object.defineProperty(exports, "UserTimeDiffFormat", {
+Object.defineProperty(exports, "setLocalizedData", {
   enumerable: true,
   get: function get() {
-    return _UserTimeDiffFormat["default"];
+    return _utils.setLocalizedData;
+  }
+});
+Object.defineProperty(exports, "unescapeUnicode", {
+  enumerable: true,
+  get: function get() {
+    return _utils.unescapeUnicode;
+  }
+});
+Object.defineProperty(exports, "userDateFormat", {
+  enumerable: true,
+  get: function get() {
+    return _utils.userDateFormat;
   }
 });
-exports.getI18NValue = void 0;
 
 var _utils = require("./utils");
 

package/lib/utils.js

@@ -4,28 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.formatDate = formatDate;
-exports.pad = pad;
-exports.replaceI18NValuesWithRegex = replaceI18NValuesWithRegex;
-exports.unescapeUnicode = unescapeUnicode;
-exports.getValues = getValues;
-exports.getI18NValue = getI18NValue;
+exports.getDatePatternWithoutYear = getDatePatternWithoutYear;
+exports.getDiffObj = getDiffObj;
 exports.getI18NInfo = getI18NInfo;
+exports.getI18NValue = getI18NValue;
+exports.getLocalizedValue = getLocalizedValue;
+exports.getLyears = getLyears;
+exports.getSuffix = getSuffix;
+exports.getValues = getValues;
 exports.isToday = isToday;
-exports.isYesterday = isYesterday;
 exports.isTomorrow = isTomorrow;
-exports.isWithinAWeek = isWithinAWeek;
 exports.isTwoWeeksOrMore = isTwoWeeksOrMore;
-exports.getDatePatternWithoutYear = getDatePatternWithoutYear;
+exports.isWithinAWeek = isWithinAWeek;
+exports.isYesterday = isYesterday;
+exports.pad = pad;
+exports.replaceI18NValuesWithRegex = replaceI18NValuesWithRegex;
+exports.setLocalizedData = setLocalizedData;
+exports.unescapeUnicode = unescapeUnicode;
 exports.userDateFormat = userDateFormat;
-exports.getDiffObj = getDiffObj;
-exports.getLyears = getLyears;
-exports.getSuffix = getSuffix;
 
 var _datetimejs = _interopRequireDefault(require("@zohodesk/datetimejs"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 var dateFormat = {
   dayNames: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
@@ -159,6 +161,41 @@ function getValues() {
   });
 }
 
+var localizedData = {};
+
+function setLocalizedData(data) {
+  localizedData = data;
+}
+
+function getLocalizedValue() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      type = _ref.type,
+      moduleName = _ref.moduleName,
+      apiName = _ref.apiName,
+      fieldValue = _ref.fieldValue;
+
+  var localizedValue = localizedData;
+
+  switch (type) {
+    case 'field':
+      ['Field', moduleName, apiName].map(function (key) {
+        localizedValue = localizedValue[key] || '';
+      });
+      break;
+
+    case 'picklist':
+      ['PickListValue', moduleName, apiName, fieldValue].map(function (key) {
+        localizedValue = localizedValue[key] || '';
+      });
+      break;
+
+    default:
+      return null;
+  }
+
+  return localizedValue || null;
+}
+
 function getI18NValue(i18n) {
   if (typeof i18n === 'undefined') {
     return function (key) {
@@ -166,15 +203,16 @@ function getI18NValue(i18n) {
     };
   }
 
-  return function (key, values) {
+  return function (key, values, localizedProps) {
+    var localizedValue = localizedProps ? getLocalizedValue(localizedProps) : null;
     var i18nStr = i18n[key];
 
     if (i18nStr === undefined) {
-      return key;
+      return localizedValue || key;
     }
 
     i18nStr = replaceI18NValuesWithRegex(i18nStr, values);
-    return unescapeUnicode(i18nStr);
+    return localizedValue || unescapeUnicode(i18nStr);
   };
 } // function getValues(params = [], diff) {
 //   return params.map(param => {
@@ -248,16 +286,16 @@ function getDatePatternWithoutYear(datePattern) {
   }
 
   return dateObj.filter(function (data) {
-    return ['YY', 'YYYY'].indexOf(data) === -1;
+    return ['yy', 'yyyy'].indexOf(data) === -1;
   }).join(delemiter);
 }
 
 function userDateFormat(getI18NValue, timezoneData, timeFormat, datePattern, isEnabledCurrentYear) {
-  return function (to, _ref, ago, later) {
-    var today = _ref.today,
-        yesterday = _ref.yesterday,
-        tomorrow = _ref.tomorrow,
-        others = _ref.others;
+  return function (to, _ref2, ago, later) {
+    var today = _ref2.today,
+        yesterday = _ref2.yesterday,
+        tomorrow = _ref2.tomorrow,
+        others = _ref2.others;
     var isSuffixEnable = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
     var format = arguments.length > 5 ? arguments[5] : undefined;
 
@@ -307,7 +345,8 @@ function userDateFormat(getI18NValue, timezoneData, timeFormat, datePattern, isE
       timeFormat: timeFormat,
       datePattern: datePattern,
       dateTimePattern: "".concat(datePattern, " ").concat(timeFormat)
-    };
+    }; //In if condition we'll remove year and set date format  if the current year is not required
+    //In else part we'll set the date format as it is
 
     if (isEnabledCurrentYear === true && diffObj1.years === 0 && diffObj1.tYear === diffObj1.crntYear) {
       var _dateFormat = getDatePatternWithoutYear(datePattern);
@@ -359,7 +398,7 @@ function userDateFormat(getI18NValue, timezoneData, timeFormat, datePattern, isE
     } else {
       var dateObj = new Date(toDateObj);
       var curDateObj = new Date(fromDateObj);
-      var diffDayType = diffObj1.yDays;
+      var diffDayType = diffObj1.yDays; //In this condition, to calculate different days we have copied it from live --> diffDayType
 
       if (isOverdue && dateObj.getDate() < curDateObj.getDate() && diffObj1.yDays == 0) {
         diffDayType = -1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/i18n",
-  "version": "1.0.0-beta.16",
+  "version": "1.0.0-beta.19",
   "main": "lib/index",
   "module": "es/index.js",
   "jsnext:main": "es/index.js",
@@ -19,11 +19,11 @@
     "lint": "react-cli lint"
   },
   "dependencies": {
-    "@zoho/SecurityJS": "5.0.0-rc2.1"
+    "@zoho/SecurityJS": "5.0.2"
   },
   "react-cli": {
     "docs": {
       "componentFolder": "./src"
     }
   }
-}
+}

package/src/components/DateTimeDiffFormat.js

@@ -108,6 +108,8 @@ export default class DateTimeDiffFormat extends React.Component {
       dateTimePattern: `${datePattern} ${timeFormat}`,
     };
 
+    //In if condition we'll remove year and set date format  if the current year is not required
+    //In else part we'll set the date format as it is
     if (
       isEnabledCurrentYear === true &&
       diffObj1.years === 0 &&
@@ -164,6 +166,7 @@ export default class DateTimeDiffFormat extends React.Component {
       let curDateObj = new Date(fromDateObj);
       let diffDayType = diffObj1.yDays;
 
+      //In this condition, to calculate different days we have copied it from live --> diffDayType
       if (
         isOverdue &&
         dateObj.getDate() < curDateObj.getDate() &&

package/src/components/I18NProvider.js

@@ -15,13 +15,15 @@ export default class I18NProvider extends React.Component {
   constructor(props, context) {
     super(props, context);
     i18NProviderUtils.getI18NValue = getI18NValue(props.i18n);
-    i18NProviderUtils.userDateFormat = userDateFormat(
-      i18NProviderUtils.getI18NValue,
-      props.tzData,
-      props.timeFormat,
-      props.datePattern,
-      props.isEnabledCurrentYear
-    );
+    if(props.tzData){
+      i18NProviderUtils.userDateFormat = userDateFormat(
+        i18NProviderUtils.getI18NValue,
+        props.tzData,
+        props.timeFormat,
+        props.datePattern,
+        props.isEnabledCurrentYear
+      );
+    }
   }
 
   componentDidUpdate(next) {
@@ -48,13 +50,15 @@ export default class I18NProvider extends React.Component {
       }).then(
         () => {
           i18NProviderUtils.getI18NValue = getI18NValue(nextProps.i18n);
-          i18NProviderUtils.userDateFormat = userDateFormat(
-            i18NProviderUtils.getI18NValue,
-            props.tzData,
-            props.timeFormat,
-            props.datePattern,
-            this.props.isEnabledCurrentYear
-          );
+          if(props.tzData){
+            i18NProviderUtils.userDateFormat = userDateFormat(
+              i18NProviderUtils.getI18NValue,
+              props.tzData,
+              props.timeFormat,
+              props.datePattern,
+              this.props.isEnabledCurrentYear
+            );
+          }
           this.promise = null;
         },
         () => {

package/src/index.js

@@ -14,7 +14,8 @@ export {
   getDiffObj,
   getLyears,
   getSuffix,
-  getDatePatternWithoutYear
+  getDatePatternWithoutYear,
+  setLocalizedData
 } from './utils';
 import { getI18NValue as getI18NValue1 } from './utils';
 export { I18NContext } from './I18NContext';

package/src/utils.js

@@ -155,17 +155,47 @@ export function unescapeUnicode(str) {
 export function getValues(params = [], diff) {
   return params.map((param) => diff[param]);
 }
+
+let localizedData = {};
+
+export function setLocalizedData(data) {
+  localizedData = data;
+}
+export function getLocalizedValue({
+  type,
+  moduleName,
+  apiName,
+  fieldValue
+} = {}) {
+  let localizedValue = localizedData;
+  switch(type) {
+    case 'field':
+      ['Field', moduleName, apiName].map((key) => {
+        localizedValue = localizedValue[key] || '';
+      });
+    break;
+    case 'picklist':
+      ['PickListValue', moduleName, apiName, fieldValue].map((key) => {
+        localizedValue = localizedValue[key] || '';
+      });
+    break; 
+    default: 
+      return null
+  }
+  return localizedValue || null
+}
 export function getI18NValue(i18n) {
   if (typeof i18n === 'undefined') {
     return (key) => key;
   }
-  return (key, values) => {
+  return (key, values, localizedProps) => {
+    const localizedValue = localizedProps ? getLocalizedValue(localizedProps) : null;
     let i18nStr = i18n[key];
     if (i18nStr === undefined) {
-      return key;
+      return localizedValue || key;
     }
     i18nStr = replaceI18NValuesWithRegex(i18nStr, values);
-    return unescapeUnicode(i18nStr);
+    return localizedValue || unescapeUnicode(i18nStr);
   };
 }
 
@@ -227,7 +257,7 @@ export function getDatePatternWithoutYear(datePattern) {
     delemiter = ' ';
   }
   return dateObj
-    .filter((data) => ['YY', 'YYYY'].indexOf(data) === -1)
+    .filter((data) => ['yy', 'yyyy'].indexOf(data) === -1)
     .join(delemiter);
 }
 
@@ -291,6 +321,8 @@ export function userDateFormat(
       dateTimePattern: `${datePattern} ${timeFormat}`,
     };
 
+    //In if condition we'll remove year and set date format  if the current year is not required
+    //In else part we'll set the date format as it is
     if (
       isEnabledCurrentYear === true &&
       diffObj1.years === 0 &&
@@ -345,6 +377,7 @@ export function userDateFormat(
       let curDateObj = new Date(fromDateObj);
       let diffDayType = diffObj1.yDays;
 
+      //In this condition, to calculate different days we have copied it from live --> diffDayType
       if (
         isOverdue &&
         dateObj.getDate() < curDateObj.getDate() &&