@zohodesk/i18n 1.0.0-beta.15.1 → 1.0.0-beta.18

package/README.md

@@ -1,41 +1,73 @@
-# i18n
-
-# 1.0.0-beta.15
-
-- When working on date format build we have published I18n. Also, before moving date format build to master we had a emergency fix that need to be sent, so when publishing I18n we have published the date format changes with the next version.
-
-# 1.0.0-beta.10
-
-- Date Format Issue Fixes
-
-# 1.0.0-beta.9
-
-- Date Format Changes
-
-# 1.0.0-beta.8
-
-- ES Module Support Changes
-
-# 1.0.0-beta.7
-
-- 'userDateFormat' util method - 'others' function fix
-
-# 1.0.0-beta.6
-
-- Added new prop 'isNeedTime' for DateTimeDiffFormat Component
-
-# 1.0.0-beta.5
-
-- Timezone logic moved to @zohodesk/datetimejs
-
-# 1.0.0-beta.4
-
-- Added new prop 'page' for DateTimeDiffFormat Component
-
-# 1.0.0-beta.3
-
-- Added support for exact times along with relative times in format() function
-
-# 1.0.0-beta.0
-
-- Test Publish
+# i18n
+
+# 1.0.0-beta.18
+
+- Localization feature added and incorporated into getI18NValue Method.
+
+# 1.0.0-beta.17
+
+- There was some i18n changes done in live before moving the date format build to live. Since we need these changes we have published it as new version.
+
+# 1.0.0-beta.16
+
+- DatePattern and dateTimePattern key has been changed for the date format build.
+
+# 1.0.0-beta.15.1
+
+- Zoho security version updated.
+
+# 1.0.0-beta.15
+
+- When working on date format build we have published I18n. Also, before moving date format build to master we had a emergency fix that need to be sent, so when publishing I18n we have published the date format changes with the next version.
+
+# 1.0.0-beta.14
+
+- Issue fixed in enable current year.
+
+# 1.0.0-beta.13
+
+- Issue fixed in due date.
+
+# 1.0.0-beta.12
+
+- Issue fixed in date Format Pattern.
+
+# 1.0.0-beta.11
+
+- Date Format Changes
+
+# 1.0.0-beta.10
+
+- Date Format Issue Fixes
+
+# 1.0.0-beta.9
+
+- Date Format Changes
+
+# 1.0.0-beta.8
+
+- ES Module Support Changes
+
+# 1.0.0-beta.7
+
+- 'userDateFormat' util method - 'others' function fix
+
+# 1.0.0-beta.6
+
+- Added new prop 'isNeedTime' for DateTimeDiffFormat Component
+
+# 1.0.0-beta.5
+
+- Timezone logic moved to @zohodesk/datetimejs
+
+# 1.0.0-beta.4
+
+- Added new prop 'page' for DateTimeDiffFormat Component
+
+# 1.0.0-beta.3
+
+- Added support for exact times along with relative times in format() function
+
+# 1.0.0-beta.0
+
+- Test Publish

package/es/components/DateTimeDiffFormat.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { pad, getValues, getDiffObj, formatDate, getLyears } from '../utils';
+import { pad, getValues, getDiffObj, formatDate, getLyears, getDatePatternWithoutYear } from '../utils';
 import FormatText from './FormatText';
 import datetime from '@zohodesk/datetimejs';
 export default class DateTimeDiffFormat extends React.Component {
@@ -42,9 +42,8 @@ export default class DateTimeDiffFormat extends React.Component {
       title = null,
       isOverdue,
       timeFormat,
-      dateTimeFormat,
-      defaulDatePattern,
-      defaultDateTimeFormat
+      datePattern,
+      isEnabledCurrentYear
     } = this.props;
     let fromDateObj = datetime.toDate(datetime.tz.utcToTz(from, fromTzData)).getTime();
     let toDateObj = datetime.toDate(datetime.tz.utcToTz(to, toTzData)).getTime();
@@ -76,7 +75,6 @@ export default class DateTimeDiffFormat extends React.Component {
       seconds: diff.s,
       years: diff.y,
       yDays: diff.yd,
-      yMonth: diff.m,
       isWithInAWeek: withInAWeak,
       suffix: suffix,
       crntDate: new Date(from).getDate(),
@@ -94,9 +92,20 @@ export default class DateTimeDiffFormat extends React.Component {
       betweenleepYears: getLyears(from, to),
       isOverdue: isOverdue,
       timeFormat: timeFormat,
-      datePattern: defaulDatePattern,
-      dateTimeFormat: defaultDateTimeFormat
-    };
+      datePattern: datePattern,
+      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 && diffObj1.tYear === diffObj1.crntYear) {
+      let dateFormat = getDatePatternWithoutYear(datePattern);
+      diffObj1.dateFormat = dateFormat;
+      diffObj1.dateTimeFormat = `${dateFormat} ${timeFormat}`;
+    } else {
+      diffObj1.dateFormat = datePattern;
+      diffObj1.dateTimeFormat = `${datePattern} ${timeFormat}`;
+    }
+
     let key = '';
     let values = [];
     let text = null;
@@ -137,17 +146,42 @@ export default class DateTimeDiffFormat extends React.Component {
         text = formatDate(toDateObj, value, diffObj1);
       }
     } else {
-      if (diff.y === 0 && (diff.yd === 0 || diff.yd === 1)) {
-        let dateObj = new Date(toDateObj);
-        let curDateObj = new Date(fromDateObj);
+      let dateObj = new Date(toDateObj);
+      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() && diffObj1.yDays == 0) {
+        diffDayType = -1;
+      }
+
+      if (!isOverdue) {
+        let diffHr = dateObj.getHours() - curDateObj.getHours();
+
+        if (diffHr < 0) {
+          diffDayType += 1;
+        } else if (diffHr == 0) {
+          let diffMins = dateObj.getMinutes() - curDateObj.getMinutes();
+
+          if (diffMins < 0) {
+            diffDayType += 1;
+          } else if (diffMins == 0) {
+            let diffSec = dateObj.getSeconds() - curDateObj.getSeconds();
+
+            if (diffSec < 0) {
+              diffDayType += 1;
+            }
+          }
+        }
+      }
 
+      if (diff.y === 0 && (diffDayType === 0 || diffDayType === 1)) {
         if (dateObj.getDate() === curDateObj.getDate()) {
           var value = today && today(diffObj1) || others(diffObj1);
           text = formatDate(toDateObj, value);
         } else if (dateObj.getMonth() === curDateObj.getMonth() && dateObj.getDate() < curDateObj.getDate() || dateObj.getMonth() < curDateObj.getMonth()) {
           var value = yesterday && yesterday(diffObj1) || others(diffObj1);
           text = formatDate(toDateObj, value);
-        } else if (dateObj.getMonth() > curDateObj.getMonth() || dateObj.getDate() > curDateObj.getDate()) {
+        } else if (!isOverdue && diff.y === 0 && diffDayType === 1) {
           var value = tomorrow && tomorrow(diffObj1) || others(diffObj1);
           text = formatDate(toDateObj, value);
         }

package/es/components/HOCI18N.js

@@ -4,44 +4,47 @@ import React, { Children } from 'react';
 import PropTypes from 'prop-types';
 import { replaceI18NValuesWithRegex, unescapeUnicode } from '../utils';
 import { I18NContext } from '../I18NContext';
-export default ((i18NKeys = []) => Component => {
-  class HOCI18N extends React.Component {
-    constructor(props) {
-      super(props);
-      this.getI18NValue = this.getI18NValue.bind(this);
-    }
+export default (function () {
+  let i18NKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return Component => {
+    class HOCI18N extends React.Component {
+      constructor(props) {
+        super(props);
+        this.getI18NValue = this.getI18NValue.bind(this);
+      }
 
-    getI18NValue(key) {
-      const {
-        i18n
-      } = this.context || {};
+      getI18NValue(key) {
+        const {
+          i18n
+        } = this.context || {};
 
-      if (typeof i18n === 'undefined') {
-        return key;
-      }
+        if (typeof i18n === 'undefined') {
+          return key;
+        }
+
+        let i18nStr = i18n[key];
 
-      let i18nStr = i18n[key];
+        if (i18nStr === undefined) {
+          return key;
+        }
 
-      if (i18nStr === undefined) {
-        return key;
+        return unescapeUnicode(i18nStr);
       }
 
-      return unescapeUnicode(i18nStr);
-    }
+      render() {
+        let i18nProps = i18NKeys.reduce((result, key) => {
+          if (this.props[key]) {
+            result[key] = this.getI18NValue(this.props[key]);
+          }
 
-    render() {
-      let i18nProps = i18NKeys.reduce((result, key) => {
-        if (this.props[key]) {
-          result[key] = this.getI18NValue(this.props[key]);
-        }
+          return result;
+        }, {});
+        return /*#__PURE__*/React.createElement(Component, _extends({}, this.props, i18nProps));
+      }
 
-        return result;
-      }, {});
-      return /*#__PURE__*/React.createElement(Component, _extends({}, this.props, i18nProps));
     }
 
-  }
-
-  HOCI18N.contextType = I18NContext;
-  return HOCI18N;
+    HOCI18N.contextType = I18NContext;
+    return HOCI18N;
+  };
 });

package/es/components/I18NProvider.js

@@ -14,7 +14,7 @@ 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.defaulDatePattern, props.defaultDateTimeFormat);
+    i18NProviderUtils.userDateFormat = userDateFormat(i18NProviderUtils.getI18NValue, props.tzData, props.timeFormat, props.datePattern, props.isEnabledCurrentYear);
   }
 
   componentDidUpdate(next) {
@@ -23,21 +23,18 @@ export default class I18NProvider extends React.Component {
       timeZone,
       datePattern,
       timeFormat,
-      dateTimeFormat,
       direction,
       onChange,
-      tzData,
-      defaulDatePattern,
-      defaultDateTimeFormat
+      tzData
     } = this.props;
 
-    if (i18n !== next.i18n || timeZone !== next.timeZone || datePattern !== next.datePattern || timeFormat !== next.timeFormat || dateTimeFormat !== next.dateTimeFormat || direction !== next.direction || tzData !== next.tzData) {
+    if (i18n !== next.i18n || timeZone !== next.timeZone || datePattern !== next.datePattern || timeFormat !== next.timeFormat || direction !== next.direction || tzData !== next.tzData) {
       this.promise = new Promise((res, rej) => {
         this.resolve = res;
         this.reject = rej;
       }).then(() => {
         i18NProviderUtils.getI18NValue = getI18NValue(nextProps.i18n);
-        i18NProviderUtils.userDateFormat = userDateFormat(i18NProviderUtils.getI18NValue, props.tzData, props.timeFormat, props.defaulDatePattern, props.defaultDateTimeFormat);
+        i18NProviderUtils.userDateFormat = userDateFormat(i18NProviderUtils.getI18NValue, props.tzData, props.timeFormat, props.datePattern, this.props.isEnabledCurrentYear);
         this.promise = null;
       }, () => {
         this.promise = null;
@@ -54,9 +51,7 @@ export default class I18NProvider extends React.Component {
         timeZone: this.props.timeZone,
         datePattern: this.props.datePattern,
         timeFormat: this.props.timeFormat,
-        dateTimeFormat: this.props.dateTimeFormat,
-        defaulDatePattern: this.props.defaulDatePattern,
-        defaultDateTimeFormat: this.props.defaultDateTimeFormat,
+        isEnabledCurrentYear: this.props.isEnabledCurrentYear,
         tzData: this.props.tzData
       }
     }, this.props.children);
@@ -68,17 +63,13 @@ I18NProvider.defaultProps = {
   timeZone: '',
   datePattern: '',
   timeFormat: '',
-  dateTimeFormat: '',
-  defaulDatePattern: '',
-  defaultDateTimeFormat: '',
+  isEnabledCurrentYear: '',
   direction: 'ltr'
 };
 I18NProvider.propTypes = {
   children: PropTypes.element.isRequired,
   datePattern: PropTypes.string,
-  dateTimeFormat: PropTypes.string,
-  defaulDatePattern: PropTypes.string,
-  defaultDateTimeFormat: PropTypes.string,
+  isEnabledCurrentYear: PropTypes.string,
   direction: PropTypes.string,
   i18n: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
   onChange: PropTypes.func,

package/es/components/UserTimeDiffFormat.js

@@ -28,15 +28,18 @@ export default class UserTimeDiffFormat extends Component {
       tzData,
       timeFormat,
       datePattern,
-      dateTimeFormat,
-      defaulDatePattern,
-      defaultDateTimeFormat
+      isEnabledCurrentYear
     } = this.context || {};
 
     if (!format && !others) {
-      let pattern = displayType === 'date' ? datePattern : displayType === 'time' ? timeFormat : displayType === 'dateTime' ? dateTimeFormat : '';
-
-      format = () => pattern;
+      format = _ref => {
+        let {
+          dateTimeFormat,
+          dateFormat,
+          timeFormat
+        } = _ref;
+        displayType === 'dateTime' ? dateTimeFormat : displayType === 'date' ? dateFormat : timeFormat;
+      };
     }
 
     return /*#__PURE__*/React.createElement(DateTimeDiffFormat, {
@@ -59,9 +62,8 @@ export default class UserTimeDiffFormat extends Component {
       dataId: dataId,
       isOverdue: isOverdue,
       timeFormat: timeFormat,
-      dateTimeFormat: dateTimeFormat,
-      defaulDatePattern: defaulDatePattern,
-      defaultDateTimeFormat: defaultDateTimeFormat
+      datePattern: datePattern,
+      isEnabledCurrentYear: isEnabledCurrentYear
     });
   }