make-plural 4.2.0 → 4.3.0

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,45 +1,59 @@
 #!/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
+ *
+ *  Usage:
+ *    ./bin/make-plural                 // checks all locale rules
+ *    ./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']
-}); /** A compiler for make-plural.js
-     *
-     *  Usage:
-     *    ./bin/make-plural                 // checks all locale rules
-     *    ./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 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;
 }
 
@@ -48,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')));
@@ -66,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')));
@@ -93,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: 13819 $",
-      "_unicodeVersion": "10.0.0",
-      "_cldrVersion": "33"
+      "_number": "$Revision: 14397 $",
+      "_unicodeVersion": "11.0.0",
+      "_cldrVersion": "34"
     },
     "plurals-type-ordinal": {
       "af": {
@@ -113,6 +113,12 @@
         "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, …"
       },
@@ -150,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, …"
       },
@@ -271,6 +280,10 @@
       "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, …"
@@ -350,4 +363,4 @@
       }
     }
   }
-}
+}

package/data/plurals.json

@@ -1,9 +1,9 @@
 {
   "supplemental": {
     "version": {
-      "_number": "$Revision: 13898 $",
-      "_unicodeVersion": "10.0.0",
-      "_cldrVersion": "33"
+      "_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, …"
       },
@@ -626,6 +630,10 @@
         "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, …"
@@ -866,4 +874,4 @@
       }
     }
   }
-}
+}

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,6 +68,7 @@ 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],
@@ -153,6 +154,7 @@ 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],