make-plural 4.0.1 → 4.3.0

package/README.md

@@ -1,5 +1,5 @@
 [![ISC License](https://img.shields.io/npm/l/make-plural.svg)](http://en.wikipedia.org/wiki/ISC_license)
-[![Build Status](https://travis-ci.org/eemeli/make-plural.js.svg?branch=master)](https://travis-ci.org/eemeli/make-plural.js)
+[![Build Status](https://travis-ci.org/eemeli/make-plural.svg?branch=master)](https://travis-ci.org/eemeli/make-plural)
 
 
 make-plural
@@ -33,13 +33,13 @@ bower install make-plural
 ```
 _or_
 ```
-git clone https://github.com/eemeli/make-plural.js.git
-cd make-plural.js
+git clone https://github.com/eemeli/make-plural.git
+cd make-plural
 npm install
 make all
 ```
 _or_ download the latest release from
-[here](https://github.com/eemeli/make-plural.js/releases/latest)
+[here](https://github.com/eemeli/make-plural/releases/latest)
 
 
 ## Precompiled plurals
@@ -249,7 +249,7 @@ console.log(sk.toString())
 // }
 ```
 
-`make-plural.js` may also be used in browser environments; see `test/index.html`
+`make-plural` may also be used in browser environments; see `test/index.html`
 for an example of its use.
 
 

package/bin/common.js

@@ -1,15 +1,17 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var combined = exports.combined = {
-  plurals: ['function(n, ord) {\n  if (ord) return \'other\';\n  return \'other\';\n}', 'function(n, ord) {\n  if (ord) return \'other\';\n  return (n == 1) ? \'one\' : \'other\';\n}', 'function(n, ord) {\n  if (ord) return \'other\';\n  return ((n == 0\n          || n == 1)) ? \'one\' : \'other\';\n}', 'function(n, ord) {\n  var s = String(n).split(\'.\'), v0 = !s[1];\n  if (ord) return \'other\';\n  return (n == 1 && v0) ? \'one\' : \'other\';\n}'],
+exports.cardinals = exports.combined = void 0;
+var combined = {
+  plurals: ["function(n, ord) {\n  if (ord) return 'other';\n  return 'other';\n}", "function(n, ord) {\n  if (ord) return 'other';\n  return (n == 1) ? 'one' : 'other';\n}", "function(n, ord) {\n  if (ord) return 'other';\n  return ((n == 0\n          || n == 1)) ? 'one' : 'other';\n}", "function(n, ord) {\n  var s = String(n).split('.'), v0 = !s[1];\n  if (ord) return 'other';\n  return (n == 1 && v0) ? 'one' : 'other';\n}"],
   categories: ['{cardinal:["other"],ordinal:["other"]}', '{cardinal:["one","other"],ordinal:["other"]}', '{cardinal:["one","other"],ordinal:["one","other"]}', '{cardinal:["one","two","other"],ordinal:["other"]}']
 };
-
-var cardinals = exports.cardinals = {
-  plurals: ['function(n) {\n  return \'other\';\n}', 'function(n) {\n  return (n == 1) ? \'one\' : \'other\';\n}', 'function(n) {\n  return ((n == 0\n          || n == 1)) ? \'one\' : \'other\';\n}', 'function(n) {\n  var s = String(n).split(\'.\'), v0 = !s[1];\n  return (n == 1 && v0) ? \'one\' : \'other\';\n}'],
+exports.combined = combined;
+var cardinals = {
+  plurals: ["function(n) {\n  return 'other';\n}", "function(n) {\n  return (n == 1) ? 'one' : 'other';\n}", "function(n) {\n  return ((n == 0\n          || n == 1)) ? 'one' : 'other';\n}", "function(n) {\n  var s = String(n).split('.'), v0 = !s[1];\n  return (n == 1 && v0) ? 'one' : 'other';\n}"],
   categories: ['{cardinal:["other"],ordinal:[]}', '{cardinal:["one","other"],ordinal:[]}', '{cardinal:["one","other"],ordinal:[]}', '{cardinal:["one","two","other"],ordinal:[]}']
 };
+exports.cardinals = cardinals;
 

package/bin/make-plural

@@ -1,12 +1,10 @@
 #!/usr/bin/env node
 
-'use strict';
+"use strict";
 
-var _common = require('./common');
+var common = _interopRequireWildcard(require("./common"));
 
-var common = _interopRequireWildcard(_common);
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
 
 /** A compiler for make-plural.js
  *
@@ -15,32 +13,47 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
  *    ./bin/make-plural [lc]            // prints the locale function for LC
  *    ./bin/make-plural [lc] [n] [ord]  // prints the (ORD ? ordinal : plural) category for N in locale LC
  */
-
 var argv = require('minimist')(process.argv.slice(2), {
-  default: { locale: null, value: null, ordinal: null, cardinal: null, categories: false, es6: false },
-  alias: { locale: 'l', value: 'v', ordinal: 'o', cardinal: 'c', es6: 'e' },
+  default: {
+    locale: null,
+    value: null,
+    ordinal: null,
+    cardinal: null,
+    categories: false,
+    es6: false
+  },
+  alias: {
+    locale: 'l',
+    value: 'v',
+    ordinal: 'o',
+    cardinal: 'c',
+    es6: 'e'
+  },
   string: ['locale', 'value'],
   boolean: ['categories', 'es6']
 });
+
 var MakePlural = require('../make-plural').load(require('../data/plurals.json'), require('../data/ordinals.json'));
 
 var es6module = function es6module(value) {
-  return '\nexport default {\n' + value + '\n}';
-};
+  return "\nexport default {\n".concat(value, "\n}");
+}; // UMD pattern adapted from https://github.com/umdjs/umd/blob/master/returnExports.js
+
 
-// UMD pattern adapted from https://github.com/umdjs/umd/blob/master/returnExports.js
 var umd = function umd(global, value) {
-  return '\n(function (root, ' + global + ') {\n  if (typeof define === \'function\' && define.amd) {\n    define(' + global + ');\n  } else if (typeof exports === \'object\') {\n    module.exports = ' + global + ';\n  } else {\n    root.' + global + ' = ' + global + ';\n  }\n}(this, {\n' + value + '\n}));';
+  return "\n(function (root, ".concat(global, ") {\n  if (typeof define === 'function' && define.amd) {\n    define(").concat(global, ");\n  } else if (typeof exports === 'object') {\n    module.exports = ").concat(global, ";\n  } else {\n    root.").concat(global, " = ").concat(global, ";\n  }\n}(this, {\n").concat(value, "\n}));");
 };
 
 function mapForEachLanguage(cb, opt) {
   var style = opt && !opt.cardinals ? 'ordinal' : 'cardinal';
   var languages = [];
+
   for (var lc in MakePlural.rules[style]) {
     var key = /^[A-Z_$][0-9A-Z_$]*$/i.test(lc) && lc !== 'in' ? lc : JSON.stringify(lc);
     var mp = new MakePlural(lc, opt).test();
     languages.push(key + ': ' + cb(mp));
   }
+
   return languages;
 }
 
@@ -49,10 +62,11 @@ function printPluralsModule(es6) {
   var plurals = mapForEachLanguage(function (mp) {
     var fn = mp.toString();
     cp.forEach(function (p, i) {
-      if (fn === p) fn = '_cp[' + i + ']';
+      if (fn === p) fn = "_cp[".concat(i, "]");
     });
     return fn;
   });
+
   if (es6) {
     console.log('const _cp = [\n' + cp.join(',\n') + '\n];');
     console.log(es6module(plurals.join(',\n\n')));
@@ -67,10 +81,11 @@ function printCategoriesModule(es6) {
   var categories = mapForEachLanguage(function (mp) {
     var cat = JSON.stringify(mp.categories).replace(/"(\w+)":/g, '$1:');
     cc.forEach(function (c, i) {
-      if (cat === c) cat = '_cc[' + i + ']';
+      if (cat === c) cat = "_cc[".concat(i, "]");
     });
     return cat;
   });
+
   if (es6) {
     console.log('const _cc = [\n  ' + cc.join(',\n  ') + '\n];');
     console.log(es6module(categories.join(',\n')));
@@ -94,6 +109,7 @@ MakePlural.ordinals = argv.ordinal !== null ? truthy(argv.ordinal) : true;
 
 if (argv.locale) {
   var mp = new MakePlural(argv.locale).test();
+
   if (argv.categories) {
     var cats = mp.categories.cardinal.concat(mp.categories.ordinal).filter(function (v, i, self) {
       return self.indexOf(v) === i;

package/data/ordinals.json

@@ -1,9 +1,9 @@
 {
   "supplemental": {
     "version": {
-      "_number": "$Revision: 12595 $",
-      "_unicodeVersion": "9.0.0",
-      "_cldrVersion": "30"
+      "_number": "$Revision: 14397 $",
+      "_unicodeVersion": "11.0.0",
+      "_cldrVersion": "34"
     },
     "plurals-type-ordinal": {
       "af": {
@@ -113,9 +113,18 @@
         "pluralRule-count-one": "n = 1 @integer 1",
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …"
       },
+      "gd": {
+        "pluralRule-count-one": "n = 1,11 @integer 1, 11",
+        "pluralRule-count-two": "n = 2,12 @integer 2, 12",
+        "pluralRule-count-few": "n = 3,13 @integer 3, 13",
+        "pluralRule-count-other": " @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …"
+      },
       "gl": {
         "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
       },
+      "gsw": {
+        "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
+      },
       "gu": {
         "pluralRule-count-one": "n = 1 @integer 1",
         "pluralRule-count-two": "n = 2,3 @integer 2, 3",
@@ -147,6 +156,9 @@
         "pluralRule-count-one": "n = 1 @integer 1",
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …"
       },
+      "ia": {
+        "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
+      },
       "id": {
         "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
       },
@@ -236,6 +248,13 @@
       "nl": {
         "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
       },
+      "or": {
+        "pluralRule-count-one": "n = 1,5,7..9 @integer 1, 5, 7~9",
+        "pluralRule-count-two": "n = 2,3 @integer 2, 3",
+        "pluralRule-count-few": "n = 4 @integer 4",
+        "pluralRule-count-many": "n = 6 @integer 6",
+        "pluralRule-count-other": " @integer 0, 10~24, 100, 1000, 10000, 100000, 1000000, …"
+      },
       "pa": {
         "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
       },
@@ -245,6 +264,9 @@
       "prg": {
         "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
       },
+      "ps": {
+        "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
+      },
       "pt": {
         "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
       },
@@ -258,6 +280,17 @@
       "ru": {
         "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
       },
+      "sc": {
+        "pluralRule-count-many": "n = 11,8,80,800 @integer 8, 11, 80, 800",
+        "pluralRule-count-other": " @integer 0~7, 9, 10, 12~17, 100, 1000, 10000, 100000, 1000000, …"
+      },
+      "scn": {
+        "pluralRule-count-many": "n = 11,8,80,800 @integer 8, 11, 80, 800",
+        "pluralRule-count-other": " @integer 0~7, 9, 10, 12~17, 100, 1000, 10000, 100000, 1000000, …"
+      },
+      "sd": {
+        "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
+      },
       "sh": {
         "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
       },
@@ -294,6 +327,10 @@
       "th": {
         "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, …"
       },
+      "tk": {
+        "pluralRule-count-few": "n % 10 = 6,9 or n = 10 @integer 6, 9, 10, 16, 19, 26, 29, 36, 39, 106, 1006, …",
+        "pluralRule-count-other": " @integer 0~5, 7, 8, 11~15, 17, 18, 20, 100, 1000, 10000, 100000, 1000000, …"
+      },
       "tl": {
         "pluralRule-count-one": "n = 1 @integer 1",
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, …"

package/data/plurals.json

@@ -1,9 +1,9 @@
 {
   "supplemental": {
     "version": {
-      "_number": "$Revision: 12805 $",
-      "_unicodeVersion": "9.0.0",
-      "_cldrVersion": "30"
+      "_number": "$Revision: 14397 $",
+      "_unicodeVersion": "11.0.0",
+      "_cldrVersion": "34"
     },
     "plurals-type-cardinal": {
       "af": {
@@ -286,6 +286,10 @@
         "pluralRule-count-one": "i = 0,1 @integer 0, 1 @decimal 0.0~1.5",
         "pluralRule-count-other": " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
+      "ia": {
+        "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
+        "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+      },
       "id": {
         "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
@@ -298,6 +302,10 @@
       "in": {
         "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
+      "io": {
+        "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
+        "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+      },
       "is": {
         "pluralRule-count-one": "t = 0 and i % 10 = 1 and i % 100 != 11 or t != 0 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1~1.6, 10.1, 100.1, 1000.1, …",
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
@@ -458,8 +466,8 @@
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
       "mk": {
-        "pluralRule-count-one": "v = 0 and i % 10 = 1 or f % 10 = 1 @integer 1, 11, 21, 31, 41, 51, 61, 71, 101, 1001, … @decimal 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 10.1, 100.1, 1000.1, …",
-        "pluralRule-count-other": " @integer 0, 2~10, 12~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0, 0.2~1.0, 1.2~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+        "pluralRule-count-one": "v = 0 and i % 10 = 1 and i % 100 != 11 or f % 10 = 1 and f % 100 != 11 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 10.1, 100.1, 1000.1, …",
+        "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0, 0.2~1.0, 1.2~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
       "ml": {
         "pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000",
@@ -582,11 +590,11 @@
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
       "pt": {
-        "pluralRule-count-one": "n = 0..2 and n != 2 @integer 0, 1 @decimal 0.0, 1.0, 0.00, 1.00, 0.000, 1.000, 0.0000, 1.0000",
-        "pluralRule-count-other": " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+        "pluralRule-count-one": "i = 0..1 @integer 0, 1 @decimal 0.0~1.5",
+        "pluralRule-count-other": " @integer 2~17, 100, 1000, 10000, 100000, 1000000, … @decimal 2.0~3.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
       "pt-PT": {
-        "pluralRule-count-one": "n = 1 and v = 0 @integer 1",
+        "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
       "rm": {
@@ -622,6 +630,18 @@
         "pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000",
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
       },
+      "sc": {
+        "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
+        "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+      },
+      "scn": {
+        "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
+        "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+      },
+      "sd": {
+        "pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000",
+        "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
+      },
       "sdh": {
         "pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000",
         "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"

package/es6/pluralCategories.js

@@ -54,7 +54,7 @@ fr: _cc[2],
 fur: _cc[1],
 fy: _cc[1],
 ga: {cardinal:["one","two","few","many","other"],ordinal:["one","other"]},
-gd: {cardinal:["one","two","few","other"],ordinal:["other"]},
+gd: {cardinal:["one","two","few","other"],ordinal:["one","two","few","other"]},
 gl: _cc[1],
 gsw: _cc[1],
 gu: {cardinal:["one","other"],ordinal:["one","two","few","many","other"]},
@@ -68,10 +68,12 @@ hr: {cardinal:["one","few","other"],ordinal:["other"]},
 hsb: {cardinal:["one","two","few","other"],ordinal:["other"]},
 hu: _cc[2],
 hy: _cc[2],
+ia: _cc[1],
 id: _cc[0],
 ig: _cc[0],
 ii: _cc[0],
 "in": _cc[0],
+io: _cc[1],
 is: _cc[1],
 it: {cardinal:["one","other"],ordinal:["many","other"]},
 iu: _cc[3],
@@ -135,7 +137,7 @@ nso: _cc[1],
 ny: _cc[1],
 nyn: _cc[1],
 om: _cc[1],
-or: _cc[1],
+or: {cardinal:["one","other"],ordinal:["one","two","few","many","other"]},
 os: _cc[1],
 pa: _cc[1],
 pap: _cc[1],
@@ -152,6 +154,9 @@ ru: {cardinal:["one","few","many","other"],ordinal:["other"]},
 rwk: _cc[1],
 sah: _cc[0],
 saq: _cc[1],
+sc: {cardinal:["one","other"],ordinal:["many","other"]},
+scn: {cardinal:["one","other"],ordinal:["many","other"]},
+sd: _cc[1],
 sdh: _cc[1],
 se: _cc[3],
 seh: _cc[1],
@@ -183,7 +188,7 @@ teo: _cc[1],
 th: _cc[0],
 ti: _cc[1],
 tig: _cc[1],
-tk: _cc[1],
+tk: {cardinal:["one","other"],ordinal:["few","other"]},
 tl: _cc[2],
 tn: _cc[1],
 to: _cc[0],