make-plural 7.1.0 → 7.2.0

package/pluralCategories.mjs

@@ -2,8 +2,7 @@ const z = "zero", o = "one", t = "two", f = "few", m = "many", x = "other";
 const a = {cardinal:[o,x],ordinal:[x]};
 const b = {cardinal:[o,x],ordinal:[o,x]};
 const c = {cardinal:[x],ordinal:[x]};
-const d = {cardinal:[o,f,m,x],ordinal:[x]};
-const e = {cardinal:[o,t,x],ordinal:[x]};
+const d = {cardinal:[o,t,x],ordinal:[x]};
 
 export const af = a;
 export const ak = a;
@@ -27,13 +26,13 @@ export const bo = c;
 export const br = {cardinal:[o,t,f,m,x],ordinal:[x]};
 export const brx = a;
 export const bs = {cardinal:[o,f,x],ordinal:[x]};
-export const ca = {cardinal:[o,x],ordinal:[o,t,f,x]};
+export const ca = {cardinal:[o,m,x],ordinal:[o,t,f,x]};
 export const ce = a;
 export const ceb = a;
 export const cgg = a;
 export const chr = a;
 export const ckb = a;
-export const cs = d;
+export const cs = {cardinal:[o,f,m,x],ordinal:[x]};
 export const cy = {cardinal:[z,o,t,f,m,x],ordinal:[z,o,t,f,m,x]};
 export const da = a;
 export const de = a;
@@ -65,7 +64,7 @@ export const guw = a;
 export const gv = {cardinal:[o,t,f,m,x],ordinal:[x]};
 export const ha = a;
 export const haw = a;
-export const he = {cardinal:[o,t,m,x],ordinal:[x]};
+export const he = d;
 export const hi = {cardinal:[o,x],ordinal:[o,t,f,m,x]};
 export const hnj = c;
 export const hr = {cardinal:[o,f,x],ordinal:[x]};
@@ -79,7 +78,7 @@ export const ii = c;
 export const io = a;
 export const is = a;
 export const it = {cardinal:[o,m,x],ordinal:[m,x]};
-export const iu = e;
+export const iu = d;
 export const ja = c;
 export const jbo = c;
 export const jgo = a;
@@ -111,7 +110,7 @@ export const lij = {cardinal:[o,x],ordinal:[m,x]};
 export const lkt = c;
 export const ln = a;
 export const lo = {cardinal:[x],ordinal:[o,x]};
-export const lt = d;
+export const lt = {cardinal:[o,f,m,x],ordinal:[x]};
 export const lv = {cardinal:[z,o,x],ordinal:[x]};
 export const mas = a;
 export const mg = a;
@@ -122,10 +121,10 @@ export const mn = a;
 export const mo = {cardinal:[o,f,x],ordinal:[o,x]};
 export const mr = {cardinal:[o,x],ordinal:[o,t,f,x]};
 export const ms = {cardinal:[x],ordinal:[o,x]};
-export const mt = d;
+export const mt = {cardinal:[o,t,f,m,x],ordinal:[x]};
 export const my = c;
 export const nah = a;
-export const naq = e;
+export const naq = d;
 export const nb = a;
 export const nd = a;
 export const ne = b;
@@ -145,7 +144,7 @@ export const osa = c;
 export const pa = a;
 export const pap = a;
 export const pcm = a;
-export const pl = d;
+export const pl = {cardinal:[o,f,m,x],ordinal:[x]};
 export const prg = {cardinal:[z,o,x],ordinal:[x]};
 export const ps = a;
 export const pt = {cardinal:[o,m,x],ordinal:[x]};
@@ -153,29 +152,29 @@ export const pt_PT = {cardinal:[o,m,x],ordinal:[x]};
 export const rm = a;
 export const ro = {cardinal:[o,f,x],ordinal:[o,x]};
 export const rof = a;
-export const ru = d;
+export const ru = {cardinal:[o,f,m,x],ordinal:[x]};
 export const rwk = a;
 export const sah = c;
 export const saq = a;
-export const sat = e;
+export const sat = d;
 export const sc = {cardinal:[o,x],ordinal:[m,x]};
 export const scn = {cardinal:[o,x],ordinal:[m,x]};
 export const sd = a;
 export const sdh = a;
-export const se = e;
+export const se = d;
 export const seh = a;
 export const ses = c;
 export const sg = c;
 export const sh = {cardinal:[o,f,x],ordinal:[x]};
 export const shi = {cardinal:[o,f,x],ordinal:[x]};
 export const si = a;
-export const sk = d;
+export const sk = {cardinal:[o,f,m,x],ordinal:[x]};
 export const sl = {cardinal:[o,t,f,x],ordinal:[x]};
-export const sma = e;
-export const smi = e;
-export const smj = e;
-export const smn = e;
-export const sms = e;
+export const sma = d;
+export const smi = d;
+export const smj = d;
+export const smn = d;
+export const sms = d;
 export const sn = a;
 export const so = a;
 export const sq = {cardinal:[o,x],ordinal:[o,m,x]};
@@ -207,6 +206,7 @@ export const und = c;
 export const ur = a;
 export const uz = a;
 export const ve = a;
+export const vec = {cardinal:[o,m,x],ordinal:[m,x]};
 export const vi = {cardinal:[x],ordinal:[o,x]};
 export const vo = a;
 export const vun = a;

package/plurals.d.ts

@@ -22,7 +22,7 @@ export const bo: (n: number | string, ord?: boolean) => "other";
 export const br: (n: number | string, ord?: boolean) => "one" | "two" | "few" | "many" | "other";
 export const brx: (n: number | string, ord?: boolean) => "one" | "other";
 export const bs: (n: number | string, ord?: boolean) => "one" | "few" | "other";
-export const ca: (n: number | string, ord?: boolean) => "one" | "two" | "few" | "other";
+export const ca: (n: number | string, ord?: boolean) => "one" | "two" | "few" | "many" | "other";
 export const ce: (n: number | string, ord?: boolean) => "one" | "other";
 export const ceb: (n: number | string, ord?: boolean) => "one" | "other";
 export const cgg: (n: number | string, ord?: boolean) => "one" | "other";
@@ -60,7 +60,7 @@ export const guw: (n: number | string, ord?: boolean) => "one" | "other";
 export const gv: (n: number | string, ord?: boolean) => "one" | "two" | "few" | "many" | "other";
 export const ha: (n: number | string, ord?: boolean) => "one" | "other";
 export const haw: (n: number | string, ord?: boolean) => "one" | "other";
-export const he: (n: number | string, ord?: boolean) => "one" | "two" | "many" | "other";
+export const he: (n: number | string, ord?: boolean) => "one" | "two" | "other";
 export const hi: (n: number | string, ord?: boolean) => "one" | "two" | "few" | "many" | "other";
 export const hnj: (n: number | string, ord?: boolean) => "other";
 export const hr: (n: number | string, ord?: boolean) => "one" | "few" | "other";
@@ -117,7 +117,7 @@ export const mn: (n: number | string, ord?: boolean) => "one" | "other";
 export const mo: (n: number | string, ord?: boolean) => "one" | "few" | "other";
 export const mr: (n: number | string, ord?: boolean) => "one" | "two" | "few" | "other";
 export const ms: (n: number | string, ord?: boolean) => "one" | "other";
-export const mt: (n: number | string, ord?: boolean) => "one" | "few" | "many" | "other";
+export const mt: (n: number | string, ord?: boolean) => "one" | "two" | "few" | "many" | "other";
 export const my: (n: number | string, ord?: boolean) => "other";
 export const nah: (n: number | string, ord?: boolean) => "one" | "other";
 export const naq: (n: number | string, ord?: boolean) => "one" | "two" | "other";
@@ -202,6 +202,7 @@ export const und: (n: number | string, ord?: boolean) => "other";
 export const ur: (n: number | string, ord?: boolean) => "one" | "other";
 export const uz: (n: number | string, ord?: boolean) => "one" | "other";
 export const ve: (n: number | string, ord?: boolean) => "one" | "other";
+export const vec: (n: number | string, ord?: boolean) => "one" | "many" | "other";
 export const vi: (n: number | string, ord?: boolean) => "one" | "other";
 export const vo: (n: number | string, ord?: boolean) => "one" | "other";
 export const vun: (n: number | string, ord?: boolean) => "one" | "other";

package/plurals.js

@@ -134,12 +134,14 @@ bs: (n, ord) => {
 },
 
 ca: (n, ord) => {
-  const s = String(n).split('.'), v0 = !s[1];
+  const s = String(n).split('.'), i = s[0], v0 = !s[1], i1000000 = i.slice(-6);
   if (ord) return (n == 1 || n == 3) ? 'one'
     : n == 2 ? 'two'
     : n == 4 ? 'few'
     : 'other';
-  return n == 1 && v0 ? 'one' : 'other';
+  return n == 1 && v0 ? 'one'
+    : i != 0 && i1000000 == 0 && v0 ? 'many'
+    : 'other';
 },
 
 ce: a,
@@ -311,11 +313,10 @@ ha: a,
 haw: a,
 
 he: (n, ord) => {
-  const s = String(n).split('.'), i = s[0], v0 = !s[1], t0 = Number(s[0]) == n, n10 = t0 && s[0].slice(-1);
+  const s = String(n).split('.'), i = s[0], v0 = !s[1];
   if (ord) return 'other';
-  return n == 1 && v0 ? 'one'
+  return i == 1 && v0 || i == 0 && !v0 ? 'one'
     : i == 2 && v0 ? 'two'
-    : v0 && (n < 0 || n > 10) && t0 && n10 == 0 ? 'many'
     : 'other';
 },
 
@@ -368,9 +369,9 @@ ii: e,
 io: d,
 
 is: (n, ord) => {
-  const s = String(n).split('.'), i = s[0], t0 = Number(s[0]) == n, i10 = i.slice(-1), i100 = i.slice(-2);
+  const s = String(n).split('.'), i = s[0], t = (s[1] || '').replace(/0+$/, ''), t0 = Number(s[0]) == n, i10 = i.slice(-1), i100 = i.slice(-2);
   if (ord) return 'other';
-  return t0 && i10 == 1 && i100 != 11 || !t0 ? 'one' : 'other';
+  return t0 && i10 == 1 && i100 != 11 || t % 10 == 1 && t % 100 != 11 ? 'one' : 'other';
 },
 
 it: (n, ord) => {
@@ -527,7 +528,7 @@ mo: (n, ord) => {
   const s = String(n).split('.'), v0 = !s[1], t0 = Number(s[0]) == n, n100 = t0 && s[0].slice(-2);
   if (ord) return n == 1 ? 'one' : 'other';
   return n == 1 && v0 ? 'one'
-    : !v0 || n == 0 || (n100 >= 2 && n100 <= 19) ? 'few'
+    : !v0 || n == 0 || n != 1 && (n100 >= 1 && n100 <= 19) ? 'few'
     : 'other';
 },
 
@@ -548,7 +549,8 @@ mt: (n, ord) => {
   const s = String(n).split('.'), t0 = Number(s[0]) == n, n100 = t0 && s[0].slice(-2);
   if (ord) return 'other';
   return n == 1 ? 'one'
-    : n == 0 || (n100 >= 2 && n100 <= 10) ? 'few'
+    : n == 2 ? 'two'
+    : n == 0 || (n100 >= 3 && n100 <= 10) ? 'few'
     : (n100 >= 11 && n100 <= 19) ? 'many'
     : 'other';
 },
@@ -650,7 +652,7 @@ ro: (n, ord) => {
   const s = String(n).split('.'), v0 = !s[1], t0 = Number(s[0]) == n, n100 = t0 && s[0].slice(-2);
   if (ord) return n == 1 ? 'one' : 'other';
   return n == 1 && v0 ? 'one'
-    : !v0 || n == 0 || (n100 >= 2 && n100 <= 19) ? 'few'
+    : !v0 || n == 0 || n != 1 && (n100 >= 1 && n100 <= 19) ? 'few'
     : 'other';
 },
 
@@ -844,6 +846,14 @@ uz: a,
 
 ve: a,
 
+vec: (n, ord) => {
+  const s = String(n).split('.'), i = s[0], v0 = !s[1], i1000000 = i.slice(-6);
+  if (ord) return (n == 11 || n == 8 || n == 80 || n == 800) ? 'many' : 'other';
+  return n == 1 && v0 ? 'one'
+    : i != 0 && i1000000 == 0 && v0 ? 'many'
+    : 'other';
+},
+
 vi: (n, ord) => {
   if (ord) return n == 1 ? 'one' : 'other';
   return 'other';

package/plurals.mjs

@@ -106,12 +106,14 @@ export const bs = (n, ord) => {
     : 'other';
 };
 export const ca = (n, ord) => {
-  const s = String(n).split('.'), v0 = !s[1];
+  const s = String(n).split('.'), i = s[0], v0 = !s[1], i1000000 = i.slice(-6);
   if (ord) return (n == 1 || n == 3) ? 'one'
     : n == 2 ? 'two'
     : n == 4 ? 'few'
     : 'other';
-  return n == 1 && v0 ? 'one' : 'other';
+  return n == 1 && v0 ? 'one'
+    : i != 0 && i1000000 == 0 && v0 ? 'many'
+    : 'other';
 };
 export const ce = a;
 export const ceb = (n, ord) => {
@@ -245,11 +247,10 @@ export const gv = (n, ord) => {
 export const ha = a;
 export const haw = a;
 export const he = (n, ord) => {
-  const s = String(n).split('.'), i = s[0], v0 = !s[1], t0 = Number(s[0]) == n, n10 = t0 && s[0].slice(-1);
+  const s = String(n).split('.'), i = s[0], v0 = !s[1];
   if (ord) return 'other';
-  return n == 1 && v0 ? 'one'
+  return i == 1 && v0 || i == 0 && !v0 ? 'one'
     : i == 2 && v0 ? 'two'
-    : v0 && (n < 0 || n > 10) && t0 && n10 == 0 ? 'many'
     : 'other';
 };
 export const hi = (n, ord) => {
@@ -290,9 +291,9 @@ export const ig = e;
 export const ii = e;
 export const io = d;
 export const is = (n, ord) => {
-  const s = String(n).split('.'), i = s[0], t0 = Number(s[0]) == n, i10 = i.slice(-1), i100 = i.slice(-2);
+  const s = String(n).split('.'), i = s[0], t = (s[1] || '').replace(/0+$/, ''), t0 = Number(s[0]) == n, i10 = i.slice(-1), i100 = i.slice(-2);
   if (ord) return 'other';
-  return t0 && i10 == 1 && i100 != 11 || !t0 ? 'one' : 'other';
+  return t0 && i10 == 1 && i100 != 11 || t % 10 == 1 && t % 100 != 11 ? 'one' : 'other';
 };
 export const it = (n, ord) => {
   const s = String(n).split('.'), i = s[0], v0 = !s[1], i1000000 = i.slice(-6);
@@ -407,7 +408,7 @@ export const mo = (n, ord) => {
   const s = String(n).split('.'), v0 = !s[1], t0 = Number(s[0]) == n, n100 = t0 && s[0].slice(-2);
   if (ord) return n == 1 ? 'one' : 'other';
   return n == 1 && v0 ? 'one'
-    : !v0 || n == 0 || (n100 >= 2 && n100 <= 19) ? 'few'
+    : !v0 || n == 0 || n != 1 && (n100 >= 1 && n100 <= 19) ? 'few'
     : 'other';
 };
 export const mr = (n, ord) => {
@@ -425,7 +426,8 @@ export const mt = (n, ord) => {
   const s = String(n).split('.'), t0 = Number(s[0]) == n, n100 = t0 && s[0].slice(-2);
   if (ord) return 'other';
   return n == 1 ? 'one'
-    : n == 0 || (n100 >= 2 && n100 <= 10) ? 'few'
+    : n == 2 ? 'two'
+    : n == 0 || (n100 >= 3 && n100 <= 10) ? 'few'
     : (n100 >= 11 && n100 <= 19) ? 'many'
     : 'other';
 };
@@ -498,7 +500,7 @@ export const ro = (n, ord) => {
   const s = String(n).split('.'), v0 = !s[1], t0 = Number(s[0]) == n, n100 = t0 && s[0].slice(-2);
   if (ord) return n == 1 ? 'one' : 'other';
   return n == 1 && v0 ? 'one'
-    : !v0 || n == 0 || (n100 >= 2 && n100 <= 19) ? 'few'
+    : !v0 || n == 0 || n != 1 && (n100 >= 1 && n100 <= 19) ? 'few'
     : 'other';
 };
 export const rof = a;
@@ -636,6 +638,13 @@ export const und = e;
 export const ur = d;
 export const uz = a;
 export const ve = a;
+export const vec = (n, ord) => {
+  const s = String(n).split('.'), i = s[0], v0 = !s[1], i1000000 = i.slice(-6);
+  if (ord) return (n == 11 || n == 8 || n == 80 || n == 800) ? 'many' : 'other';
+  return n == 1 && v0 ? 'one'
+    : i != 0 && i1000000 == 0 && v0 ? 'many'
+    : 'other';
+};
 export const vi = (n, ord) => {
   if (ord) return n == 1 ? 'one' : 'other';
   return 'other';

package/ranges.d.ts

@@ -29,7 +29,7 @@ export const ga: (start: PluralCategory, end: PluralCategory) => "one" | "two" |
 export const gl: (start: PluralCategory, end: PluralCategory) => "one" | "other";
 export const gsw: (start: PluralCategory, end: PluralCategory) => "one" | "other";
 export const gu: (start: PluralCategory, end: PluralCategory) => "one" | "other";
-export const he: (start: PluralCategory, end: PluralCategory) => "many" | "other";
+export const he: (start: PluralCategory, end: PluralCategory) => "other";
 export const hi: (start: PluralCategory, end: PluralCategory) => "one" | "other";
 export const hr: (start: PluralCategory, end: PluralCategory) => "one" | "few" | "other";
 export const hu: (start: PluralCategory, end: PluralCategory) => "one" | "other";

package/ranges.js

@@ -72,13 +72,7 @@ gsw: c,
 
 gu: c,
 
-he: (start, end) => (
-  (start === "many" && end === "many") ? "many"
-  : (start === "many" && end === "other") ? "many"
-  : (start === "one" && end === "many") ? "many"
-  : (start === "other" && end === "many") ? "many"
-  : "other"
-),
+he: a,
 
 hi: c,
 

package/ranges.mjs

@@ -37,13 +37,7 @@ export const ga = c;
 export const gl = c;
 export const gsw = c;
 export const gu = c;
-export const he = (start, end) => (
-  (start === "many" && end === "many") ? "many"
-  : (start === "many" && end === "other") ? "many"
-  : (start === "one" && end === "many") ? "many"
-  : (start === "other" && end === "many") ? "many"
-  : "other"
-);
+export const he = a;
 export const hi = c;
 export const hr = c;
 export const hu = c;