handlebars-i18n 1.7.0 → 1.8.0

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "handlebars-i18n",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "handlebars-i18n adds internationalization to handlebars.js using i18next and Intl.",
   "main": "dist/handlebars-i18n.js",
   "scripts": {
-    "test": "NODE_ENV=TEST nyc mocha",
-    "coveralls": "NODE_ENV=TEST istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
+    "test": "NODE_ENV=TEST c8 mocha",
+    "test:coverage": "npm run test && NODE_ENV=TEST c8 report --reporter=text-lcov > coverage/lcov.info",
     "compress": "gulp compress",
     "example:js": "cd examples/node-example && node simple-example.js",
     "example:ts": "cd examples/typescript && tsc && node index.js"
@@ -48,16 +48,17 @@
     "@commitlint/config-conventional": "16.2.1",
     "@types/intl": "^1.2.0",
     "@types/node": "^18.13.0",
+    "c8": "^10.1.2",
     "chai": "4.3.6",
-    "coveralls": "3.1.1",
-    "gulp": "4.0.2",
+    "coveralls-next": "^4.2.1",
+    "gulp": "5.0.0",
     "gulp-rename": "2.0.0",
     "gulp-uglify": "3.0.2",
     "gulp-uglify-es": "3.0.0",
     "html-entities": "^2.5.2",
     "husky": "7.0.4",
-    "istanbul": "0.4.5",
-    "mocha": "9.2.2",
+    "mocha": "10.7.3",
+    "mocha-lcov-reporter": "^1.3.0",
     "nyc": "15.1.0",
     "typescript": "^4.9.5"
   },

package/readme.md

@@ -10,7 +10,7 @@ Handlebars-i18n is listed amongst i18next’s [framework helpers](https://www.i1
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 ![Node.js Version](https://img.shields.io/badge/Node.js-14.x-green)
 [![Build](https://github.com/fwalzel/handlebars-i18n/actions/workflows/node.js.yml/badge.svg)](https://github.com/fwalzel/handlebars-i18n/actions/workflows/node.js.yml/badge.svg)
-[![Coverage Status](https://coveralls.io/repos/github/fwalzel/handlebars-i18next/badge.svg?branch=master)](https://coveralls.io/github/fwalzel/handlebars-i18next?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/Aller-Couleur/handlebars-i18n/badge.svg?branch=master)](https://coveralls.io/github/Aller-Couleur/handlebars-i18n?branch=master)
 [![Code Climate](https://codeclimate.com/github/Aller-Couleur/handlebars-i18n/badges/gpa.svg)](https://codeclimate.com/github/Aller-Couleur/handlebars-i18n)
 [![Known Vulnerabilities](https://snyk.io/test/github/Aller-Couleur/handlebars-i18n/badge.svg)](https://snyk.io/test/github/Aller-Couleur/handlebars-i18n/badge.svg)
 ![npm](https://img.shields.io/npm/dt/handlebars-i18n)
@@ -28,16 +28,8 @@ If you use handlebars-i18n in a professional context, you could
 
 ## Install
 
-If you use version npm >= 7:
-
-```bash
-$ npm i handlebars-i18n
-```
-
-For older versions do:
-
 ```bash
-$ npm i handlebars-i18n handlebars@4.7.6 i18next@20.2.1 intl@1.2.5
+npm i handlebars-i18n
 ```
 
 ## Usage
@@ -147,7 +139,7 @@ Finally use in template:
 
 * returns for "en" → **$1,200.99**
 
-## Further examples
+## Detailed examples
 
 :point_right: See the *examples folder* in the repo for more use cases and details.
 
@@ -197,13 +189,9 @@ Template usage:
 The i18next resource:
 
 ```javascript
-"en"
-:
-{
+"en" : {
   translation : {
-    "whatIsWhat"
-  :
-    "{{a}} is {{b}}."
+    "whatIsWhat" : "{{a}} is {{b}}."
   }
 }
 ```
@@ -215,19 +203,12 @@ The i18next resource:
 ```
 
 ```javascript
-"en"
-:
-{
+"en" : {
   translation : {
-    "keyWithCount"
-  :
-    "{{count}} item",
-      "keyWithCount_plural"
-  :
-    "{{count}} items"
+    "keyWithCount" : "{{count}} item", 
+    "keyWithCount_plural" : "{{count}} items"
   }
-}
-, ...
+}, 
 ```
 
 **Override globally selected language**
@@ -311,51 +292,67 @@ in [handlebars-i18n.d.ts](./dist/handlebars-i18n.d.ts).
 
 ---
 
-### _dateRel :tada: new in 1.7
+### _dateAdd :tada: new in 1.8
 
-Outputs a string with a relative date statement, formatted according to the language specific conventions.
+Adds a time offset in a given unit to a date, returns the modified date.
 
 ```
-{{_dateRel 7 unit="hour"}}
+{{_dateAdd "1996-12-17" 24 unit="hour"}}
 ```
 
-Will output for "en" → **in 7 hours**
+Will output for "en" → **12/18/1996**
+
+The first argument is a date (see function **_date** for valid date inputs). The second argument is a time amount given 
+as number. The option **unit** specifies the time amount. Possible units
+are `"second"` | `"minute"` | `"hour"` | `"day"` | `"week"` | `"month"` | `"quarter"` |`"year"` (default is `"hour"`).
+Further options as for function **_date** can be applied.
+
+---
+
+### _dateDiff
+
+Outputs the relative time difference between two given dates.
 
 ```
-{{_dateRel -7 unit="hour"}}
+{{_dateDiff "1996-12-17T00:00:00" "1995-12-17T00:00:00" unit="year"}}
 ```
 
-Will output for "en" → **7 hours ago**
+Will output for "en" → **in 1 year**
 
-A positive number argument leads to a future event statement, a negative refers to a past date. Possible units
-are `"second"` | `"minute"` | `"hour"` | `"day"` | `"week"` | `"month"` | `"year"` (default is `"hour"`). For a complete
-set of options (such as `numberingSystem` or `localeMatcher`)
-see [Intl.RelativeTimeFormat Constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/RelativeTimeFormat).
-Alternatively check this repo’s TS types
-in [handlebars-i18n.d.ts](./dist/handlebars-i18n.d.ts).
+The second date argument is subtracted from the first. If the difference is a positive value, a future event statement
+is made. A negative value refers to a past date. (If no second argument is given, the default date is the present moment). 
+Allowed date input formats are similar to **_date**, options equal **_dateRel**. Default unit is `"hour"`.
 
 ---
 
-### _dateDiff :tada: new in 1.7
+### _dateRel 
 
-Outputs the time difference between two given dates.
+Outputs a string with a relative date statement, formatted according to the language specific conventions.
 
 ```
-{{_dateDiff "1996-12-17T00:00:00", "1995-12-17T00:00:00" unit="year"}}
+{{_dateRel 7 unit="hour"}}
 ```
 
-Will output for "en" → **in 1 year**
+Will output for "en" → **in 7 hours**
 
-The second date argument is subtracted from the first. If the difference is a positive value, a future event statement
-is made. A negative value refers to a past date. Allowed date input formats are similar to *_date*, options equal
-**_dateRel**.
+```
+{{_dateRel -7 unit="hour"}}
+```
+
+Will output for "en" → **7 hours ago**
+
+A positive number argument leads to a future event statement, a negative refers to a past date. Possible units
+are `"second"` | `"minute"` | `"hour"` | `"day"` | `"week"` | `"month"` | `"quarter"` |`"year"` (default is `"hour"`). 
+For a complete set of options (such as `numberingSystem` or `localeMatcher`)
+see [Intl.RelativeTimeFormat Constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat/RelativeTimeFormat).
+Alternatively check this repo’s TS types in [handlebars-i18n.d.ts](./dist/handlebars-i18n.d.ts).
 
 ---
 
 ### _num
 
-Outputs a formatted number according to the language specific conventions of number representation, e.g. *
-*4,100,000.8314** for "**en**", but **4.100.000,8314** for "**de**".
+Outputs a formatted number according to the language specific conventions of number representation, e.g. 
+**4,100,000.8314** for "**en**", but **4.100.000,8314** for "**de**".
 
 ```
 {{_num 4100000.8314 }}
@@ -378,8 +375,8 @@ Will output **3.14** for "**en**", but **3,14** for "**de**".
 
 ### _price
 
-Outputs a formatted currency string according to the language specific conventions of price representation, e.g. *
-*€9,999.99** for "**en**", but **9.999,99 €** for "**de**".
+Outputs a formatted currency string according to the language specific conventions of price representation, e.g. 
+**€9,999.99** for "**en**", but **9.999,99 €** for "**de**".
 
 ```
 {{_price 9999.99}}
@@ -451,6 +448,8 @@ Call a subset in template with the parameter format="custom-name", like:
 {{_date myDate format="year-only"}}
 ```
 
+Subsets must be defined per language, a subset for "all" is invalid.
+
 ### The lookup cascade
 
 The general lookup cascade is: