handlebars-i18n 1.4.2 → 1.5.0

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# [1.5.0](https://github.com/fwalzel/handlebars-i18n/compare/1.4.2...1.5.0) (2022-10-13)
+
+
+### Features
+
+* init with second argument ready, compressed handlebars-i18n.min.js ([ea9e13b](https://github.com/fwalzel/handlebars-i18n/commit/ea9e13bc655e54d6000d437793a88fc555beb2a2))
+* **release:** init with second argument ready, compressed handlebars-i18n.min.js ([249a703](https://github.com/fwalzel/handlebars-i18n/commit/249a70334fe04cf1f036b50f70bdb64d662e8f42))
+
 ## [1.4.2](https://github.com/fwalzel/handlebars-i18n/compare/1.4.1...1.4.2) (2022-07-21)
 
 

package/dist/handlebars-i18n.js

@@ -106,7 +106,7 @@
       && typeof hndlbrsOpts.hash === 'object'
       && Object.keys(hndlbrsOpts.hash).length > 0) {
 
-      var oh = hndlbrsOpts.hash;
+      let oh = hndlbrsOpts.hash;
 
       // check against a custom format, if nonexistent
       // return the options hash (= template configuration)
@@ -166,7 +166,7 @@
     }
 
     if ((customFormat !== null && typeof customFormat !== 'undefined' && typeof customFormat !== 'string')
-      || customFormat == '' || customFormat == ' ') {
+      || customFormat === '' || customFormat === ' ') {
       console.error('@ handlebars-i18n.configure(): Invalid argument <' + customFormat + '> ' +
         'Fourth argument (optional) must be a string naming your custom format configuration.');
       return false;
@@ -255,18 +255,28 @@
     /**
      * init all handlebars helpers
      *
-     * @param overrideHndlbrs | optional: pass an individual instance of handlebars objec to the init() function
-     * to override the generic handlebars instance required in LINE 38
+     * @param overrideHndlbrs | optional: pass an individual instance of handlebars object to the init() function
+     * to override the generic instance required in LINE 37
+     *
+     * @param overrideI18n | optional: pass an individual instance of handlebars i18next to the init() function
+     * to override the generic instance required in LINE 38
      *
      * @returns {*}
      */
-    init: function (overrideHndlbrs) {
+    init: function (overrideHndlbrs, overrideI18n) {
 
-      if (typeof overrideHndlbrs === 'object')
+      if (typeof overrideHndlbrs === 'object' && overrideHndlbrs !== null)
         handlebars = overrideHndlbrs;
       else if (typeof overrideHndlbrs !== 'undefined' && overrideHndlbrs !== null)
-        console.error('@ handlebars-i18n.init(): Invalid Argument given for overrideHndlbrs. ' +
-          'Argument must be the Handlebars Object. Using previously required handlebars object instead.');
+        console.error('@ handlebars-i18n.init(): Invalid Argument [1] given for overrideHndlbrs. ' +
+          'Argument must be the Handlebars Object. Using handlebars object on module instead.');
+
+      if (typeof overrideI18n === 'object' && overrideI18n !== null)
+        i18next = overrideI18n;
+
+      else if (typeof overrideI18n !== 'undefined' && overrideI18n !== null)
+        console.error('@ handlebars-i18n.init(): Invalid Argument [2] given for overrideI18n. ' +
+          'Argument must be the i18next Object. Using i18next object on module level instead.');
 
       handlebars.registerHelper('__',
         /**
@@ -340,14 +350,14 @@
           }
           else if (typeof dateInput === 'string') {
 
-            if (dateInput.charAt(0) == '[' && dateInput.slice(-1) == ']') {
+            if (dateInput.charAt(0) === '[' && dateInput.slice(-1) === ']') {
               // input as array represented as string such as "[2020, 11]"
               dateInput = dateInput.substring(1, dateInput.length - 1).replace(/ /g, '');
               var dateArr = dateInput.split(',');
               var dateFactory = __applyToConstructor.bind(null, Date);
               date = dateFactory(dateArr);
             }
-            else if (dateInput.toLowerCase() == 'now' || dateInput.toLowerCase() == 'today') {
+            else if (dateInput.toLowerCase() === 'now' || dateInput.toLowerCase() === 'today') {
               // input as word "now" or "today"
               date = new Date();
             }

package/dist/handlebars-i18n.min.js

@@ -1 +1 @@
-!function(e,r){if("object"==typeof exports&&"object"==typeof module){const e=require("handlebars"),n=require("i18next"),t=require("intl");module.exports=r(e,n,t)}else if("function"==typeof define&&define.amd)define(["Handlebars","i18next","Intl"],r);else{if("object"!=typeof e.Handlebars||"object"!=typeof e.i18next||"object"!=typeof e.Intl)return console.error("@ handlebars-i18n: One or more dependencies are missing. Check for Handlebars, i18next and Intl."),!1;e.HandlebarsI18n=r(e.Handlebars,e.i18next,e.Intl)}}(this,(function(e,r,n){"use strict";var t={DateTimeFormat:{standard:{},custom:{}},NumberFormat:{standard:{},custom:{}},PriceFormat:{standard:{all:{style:"currency",currency:"EUR"}},custom:{}}},a=JSON.parse(JSON.stringify(t));function o(e,r){var n=[null].concat(r);return new(e.bind.apply(e,n))}function i(e,r,n){if("object"==typeof e&&"object"==typeof e.hash&&Object.keys(e.hash).length>0){var t=e.hash;if(void 0===t.format)return t;if(void 0!==n.custom[t.format]&&void 0!==n.custom[t.format][r])return n.custom[t.format][r]}return void 0!==n.standard[r]?n.standard[r]:void 0!==n.standard.all?n.standard.all:{}}function s(e,r,n,t){return"string"!=typeof e?(console.error("@ handlebars-i18n.configure(): Invalid argument <"+e+'> First argument must be a string with language code such as "en".'),!1):"DateTimeFormat"!==r&&"NumberFormat"!==r&&"PriceFormat"!==r?(console.error("@ handlebars-i18n.configure(): Invalid argument <"+r+'>. Second argument must be a string with the options key. Use either "DateTimeFormat", "NumberFormat" or "PriceFormat".'),!1):"object"!=typeof n?(console.error("@ handlebars-i18n.configure(): Invalid argument <"+n+"> Third argument must be an object containing the configuration parameters."),!1):(null==t||"string"==typeof t)&&""!=t&&" "!=t||(console.error("@ handlebars-i18n.configure(): Invalid argument <"+t+"> Fourth argument (optional) must be a string naming your custom format configuration."),!1)}function u(e,r,n,t){return null!=t?(void 0===a[r].custom[t]&&(a[r].custom[t]={}),a[r].custom[t][e]=n):a[r].standard[e]=n,!0}return{configure:function(e,r,n,t=null){if("string"!=typeof e&&!Array.isArray(e))return console.error("@ handlebars-i18n.configure(): Invalid argument <"+e+'> First argument must be a string with language code such as "en" or an array with parameters.'),!1;if(Array.isArray(e)){if(e.length<1)return console.log("@ handlebars-i18n.configure(): You passed an empty array, no parameters taken."),!1;e.forEach(e=>{if(!s(e[0],e[1],e[2],e[3]))return!1;u(e[0],e[1],e[2],e[3])})}else{if(!s(e,r,n,t))return!1;u(e,r,n,t)}return!0},reset:function(){return a=JSON.parse(JSON.stringify(t)),!0},init:function(t){return"object"==typeof t?e=t:null!=t&&console.error("@ handlebars-i18n.init(): Invalid Argument given for overrideHndlbrs. Argument must be the Handlebars Object. Using previously required handlebars object instead."),e.registerHelper("__",(function(n,t){return new e.SafeString(void 0!==r?r.t(n,t.hash):n)})),e.registerHelper("_locale",(function(){return r.language})),e.registerHelper("localeIs",(function(e){return r.language===e})),e.registerHelper("_date",(function(e,t){var s;if("number"==typeof e)s=new Date(e);else if("string"==typeof e)if("["==e.charAt(0)&&"]"==e.slice(-1)){var u=(e=e.substring(1,e.length-1).replace(/ /g,"")).split(",");s=o.bind(null,Date)(u)}else s="now"==e.toLowerCase()||"today"==e.toLowerCase()?new Date:new Date(e);else s=new Date;var l=i(t,r.language,a.DateTimeFormat);return new n.DateTimeFormat(r.language,l).format(s)})),e.registerHelper("_num",(function(e,t){var o=i(t,r.language,a.NumberFormat);return new n.NumberFormat(r.language,o).format(e)})),e.registerHelper("_price",(function(e,t){var o=i(t,r.language,a.PriceFormat);"string"!=typeof o.style&&"string"==typeof o.currency&&(o.style="currency");return new n.NumberFormat(r.language,o).format(e)})),e}}}));
+!function(e,r){if("object"==typeof exports&&"object"==typeof module){let n=require("handlebars"),t=require("i18next"),a=require("intl");module.exports=r(n,t,a)}else"function"==typeof define&&define.amd?define(["Handlebars","i18next","Intl"],r):"object"==typeof e.Handlebars&&"object"==typeof e.i18next&&"object"==typeof e.Intl?e.HandlebarsI18n=r(e.Handlebars,e.i18next,e.Intl):console.error("@ handlebars-i18n: One or more dependencies are missing. Check for Handlebars, i18next and Intl.")}(this,function(e,r,n){"use strict";var t={DateTimeFormat:{standard:{},custom:{}},NumberFormat:{standard:{},custom:{}},PriceFormat:{standard:{all:{style:"currency",currency:"EUR"}},custom:{}}},a=JSON.parse(JSON.stringify(t));function o(e,r){var n=[null].concat(r);return new(e.bind.apply(e,n))}function i(e,r,n){if("object"==typeof e&&"object"==typeof e.hash&&Object.keys(e.hash).length>0){let t=e.hash;if(void 0===t.format)return t;if(void 0!==n.custom[t.format]&&void 0!==n.custom[t.format][r])return n.custom[t.format][r]}return void 0!==n.standard[r]?n.standard[r]:void 0!==n.standard.all?n.standard.all:{}}function u(e,r,n,t){return"string"!=typeof e?(console.error("@ handlebars-i18n.configure(): Invalid argument <"+e+'> First argument must be a string with language code such as "en".'),!1):"DateTimeFormat"!==r&&"NumberFormat"!==r&&"PriceFormat"!==r?(console.error("@ handlebars-i18n.configure(): Invalid argument <"+r+'>. Second argument must be a string with the options key. Use either "DateTimeFormat", "NumberFormat" or "PriceFormat".'),!1):"object"!=typeof n?(console.error("@ handlebars-i18n.configure(): Invalid argument <"+n+"> Third argument must be an object containing the configuration parameters."),!1):(null==t||"string"==typeof t)&&""!==t&&" "!==t||(console.error("@ handlebars-i18n.configure(): Invalid argument <"+t+"> Fourth argument (optional) must be a string naming your custom format configuration."),!1)}function s(e,r,n,t){return null!=t?(void 0===a[r].custom[t]&&(a[r].custom[t]={}),a[r].custom[t][e]=n):a[r].standard[e]=n,!0}return{configure:function(e,r,n,t=null){if("string"!=typeof e&&!Array.isArray(e))return console.error("@ handlebars-i18n.configure(): Invalid argument <"+e+'> First argument must be a string with language code such as "en" or an array with parameters.'),!1;if(Array.isArray(e)){if(e.length<1)return console.log("@ handlebars-i18n.configure(): You passed an empty array, no parameters taken."),!1;e.forEach(e=>{if(!u(e[0],e[1],e[2],e[3]))return!1;s(e[0],e[1],e[2],e[3])})}else{if(!u(e,r,n,t))return!1;s(e,r,n,t)}return!0},reset:function(){return a=JSON.parse(JSON.stringify(t)),!0},init:function(t,u){return"object"==typeof t&&null!==t?e=t:null!=t&&console.error("@ handlebars-i18n.init(): Invalid Argument [1] given for overrideHndlbrs. Argument must be the Handlebars Object. Using handlebars object on module instead."),"object"==typeof u&&null!==u?r=u:null!=u&&console.error("@ handlebars-i18n.init(): Invalid Argument [2] given for overrideI18n. Argument must be the i18next Object. Using i18next object on module level instead."),e.registerHelper("__",function(n,t){return new e.SafeString(void 0!==r?r.t(n,t.hash):n)}),e.registerHelper("_locale",function(){return r.language}),e.registerHelper("localeIs",function(e){return r.language===e}),e.registerHelper("_date",function(e,t){if("number"==typeof e)u=new Date(e);else if("string"==typeof e){if("["===e.charAt(0)&&"]"===e.slice(-1)){var u,s=(e=e.substring(1,e.length-1).replace(/ /g,"")).split(",");u=o.bind(null,Date)(s)}else u="now"===e.toLowerCase()||"today"===e.toLowerCase()?new Date:new Date(e)}else u=new Date;var l=i(t,r.language,a.DateTimeFormat);let c=new n.DateTimeFormat(r.language,l);return c.format(u)}),e.registerHelper("_num",function(e,t){var o=i(t,r.language,a.NumberFormat);let u=new n.NumberFormat(r.language,o);return u.format(e)}),e.registerHelper("_price",function(e,t){var o=i(t,r.language,a.PriceFormat);"string"!=typeof o.style&&"string"==typeof o.currency&&(o.style="currency");let u=new n.NumberFormat(r.language,o);return u.format(e)}),e}}});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "handlebars-i18n",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "description": "handlebars-i18n adds internationlization to handlebars.js using i18next and Intl",
   "main": "dist/handlebars-i18n.js",
   "scripts": {

package/readme.md

@@ -370,7 +370,7 @@ Dismiss all existing configurations:
 HandlebarsI18n.reset();
 ```
 
-## Using custom instances of Handlebars
+## Using custom instances of Handlebars and/or i18next
 
 Sometimes you may want to use a Handlebars Object you have already modified before, or you may want to use multiple discrete instances of Handlebars. In this case you can pass you custom Handlebars instance to the init function to use it instead of the generic Handlebars object like so:
 
@@ -382,6 +382,14 @@ HandlebarsI18n.init(HandlebarsModified);
 
 HandlebarsI18n will have your previously defined method **foo()** by now.
 
+The same can be done for a custom instance of i18next. Pass it as the second argument to the init function.
+
+```javascript
+const i18nextCustom = require('i18next');
+i18nextCustom.createInstance( /*... pass some params here */ );
+HandlebarsI18n.init(null, i18nextCustom);
+```
+
 
 ## Note
 

package/test/handlebars-i18n.test.js

@@ -12,6 +12,7 @@ const expect = require('chai').expect;
 const Handlebars = require('handlebars');
 const i18next = require('i18next');
 const HandlebarsI18n = require('../dist/handlebars-i18n');
+//const HandlebarsModified = require("handlebars");
 
 describe('handlebars-i18n Test', function() {
 
@@ -74,6 +75,13 @@ describe('handlebars-i18n Test', function() {
     assert.isFunction(hI18nMod.helpers.foo);
   });
 
+  it('after method call init(null, overrideI18n) with custom i18n Object, i18n object should have custom function foo', function() {
+    const i18nModified = require('i18next');
+    i18nModified.init({supportedLngs: ['de','en']});
+    const hI18nMod = HandlebarsI18n.init(null, i18nModified);
+    assert.isFunction(function(){}); // write a test here
+  });
+
 
   // -- Tests for function _locale -- //