From 9c0a8d83290b716ec2b69223f0e1a1aecc635ac4 Mon Sep 17 00:00:00 2001
From: Eemeli Aro <eemeli@gmail.com>
Date: Wed, 21 Aug 2019 00:21:15 +0300
Subject: [PATCH] feat(cli): Improve category printing, including vars for
 strings

---
 packages/cli/src/common-categories.js |  15 ++++
 packages/cli/src/common.js            |  12 ---
 packages/cli/src/print-categories.js  |  21 +++--
 packages/plurals/pluralCategories.js  | 112 +++++++++++++-------------
 packages/plurals/pluralCategories.mjs | 112 +++++++++++++-------------
 5 files changed, 144 insertions(+), 128 deletions(-)
 create mode 100644 packages/cli/src/common-categories.js

diff --git a/packages/cli/src/common-categories.js b/packages/cli/src/common-categories.js
new file mode 100644
index 0000000..6f6b09b
--- /dev/null
+++ b/packages/cli/src/common-categories.js
@@ -0,0 +1,15 @@
+export const combinedCategories = [
+  '{cardinal:[x],ordinal:[x]}',
+  '{cardinal:[o,x],ordinal:[x]}',
+  '{cardinal:[o,x],ordinal:[o,x]}',
+  '{cardinal:[o,t,x],ordinal:[x]}',
+  '{cardinal:[o,f,m,x],ordinal:[x]}'
+]
+
+export const cardinalCategories = [
+  '{cardinal:[x],ordinal:[]}',
+  '{cardinal:[o,x],ordinal:[]}',
+  '{cardinal:[o,t,x],ordinal:[]}',
+  '{cardinal:[o,f,x],ordinal:[]}',
+  '{cardinal:[o,f,m,x],ordinal:[]}'
+]
diff --git a/packages/cli/src/common.js b/packages/cli/src/common.js
index 042dd89..c9614c9 100644
--- a/packages/cli/src/common.js
+++ b/packages/cli/src/common.js
@@ -28,12 +28,6 @@ export const combined = {
         return (n == 1 && v0) ? 'one' : 'other';
       }
     `
-  ],
-  categories: [
-    '{cardinal:["other"],ordinal:["other"]}',
-    '{cardinal:["one","other"],ordinal:["other"]}',
-    '{cardinal:["one","other"],ordinal:["one","other"]}',
-    '{cardinal:["one","two","other"],ordinal:["other"]}'
   ]
 }
 
@@ -61,11 +55,5 @@ export const cardinals = {
         return (n == 1 && v0) ? 'one' : 'other';
       }
     `
-  ],
-  categories: [
-    '{cardinal:["other"],ordinal:[]}',
-    '{cardinal:["one","other"],ordinal:[]}',
-    '{cardinal:["one","other"],ordinal:[]}',
-    '{cardinal:["one","two","other"],ordinal:[]}'
   ]
 }
diff --git a/packages/cli/src/print-categories.js b/packages/cli/src/print-categories.js
index f7ebf13..c54c553 100644
--- a/packages/cli/src/print-categories.js
+++ b/packages/cli/src/print-categories.js
@@ -1,23 +1,31 @@
 import { identifier } from 'safe-identifier'
-import * as common from './common'
+import { cardinalCategories, combinedCategories } from './common-categories'
 import getCompiler from './get-compiler'
 import printUMD from './print-umd'
 
+const NAMES = { zero: 'z', one: 'o', two: 't', few: 'f', many: 'm', other: 'x' }
+
+function stringifyCategories({ cardinal, ordinal }) {
+  function catList(list) {
+    const vars = list.map(name => NAMES[name])
+    return vars.join(',')
+  }
+  return `{cardinal:[${catList(cardinal)}],ordinal:[${catList(ordinal)}]}`
+}
+
 export default function printCategoriesModule(args) {
   const MakePlural = getCompiler(args)
   const { locale, ordinals, umd } = args
   const locales =
     locale.length === 0 ? Object.keys(MakePlural.rules.cardinal) : locale.sort()
-  const commonCategories = ordinals
-    ? common.combined.categories
-    : common.cardinals.categories
+  const commonCategories = ordinals ? combinedCategories : cardinalCategories
 
   const usedCommonCategories = {}
   const categories = locales.map(lc => {
     const mpc = new MakePlural(lc)
     mpc.compile()
     mpc.test()
-    const cat = JSON.stringify(mpc.categories).replace(/"(\w+)":/g, '$1:')
+    const cat = stringifyCategories(mpc.categories)
     const i = commonCategories.indexOf(cat)
     if (i === -1) {
       return [lc, cat]
@@ -28,7 +36,8 @@ export default function printCategoriesModule(args) {
   })
 
   const varType = umd ? 'var' : 'const'
-  let str = ''
+  const varNames = Object.keys(NAMES).map(name => `${NAMES[name]} = "${name}"`)
+  let str = `${varType} ${varNames.join(', ')};\n`
   for (let i = 0; i < commonCategories.length; ++i) {
     if (usedCommonCategories[i])
       str += `${varType} _${i} = ${commonCategories[i]};\n`
diff --git a/packages/plurals/pluralCategories.js b/packages/plurals/pluralCategories.js
index be964cd..e6fa1f4 100644
--- a/packages/plurals/pluralCategories.js
+++ b/packages/plurals/pluralCategories.js
@@ -1,7 +1,9 @@
-var _0 = {cardinal:["other"],ordinal:["other"]};
-var _1 = {cardinal:["one","other"],ordinal:["other"]};
-var _2 = {cardinal:["one","other"],ordinal:["one","other"]};
-var _3 = {cardinal:["one","two","other"],ordinal:["other"]};
+var z = "zero", o = "one", t = "two", f = "few", m = "many", x = "other";
+var _0 = {cardinal:[x],ordinal:[x]};
+var _1 = {cardinal:[o,x],ordinal:[x]};
+var _2 = {cardinal:[o,x],ordinal:[o,x]};
+var _3 = {cardinal:[o,t,x],ordinal:[x]};
+var _4 = {cardinal:[o,f,m,x],ordinal:[x]};
 
 (function (root, pluralCategories) {
   if (typeof define === 'function' && define.amd) {
@@ -15,38 +17,38 @@ var _3 = {cardinal:["one","two","other"],ordinal:["other"]};
 af: _1,
 ak: _1,
 am: _1,
-ar: {cardinal:["zero","one","two","few","many","other"],ordinal:["other"]},
-ars: {cardinal:["zero","one","two","few","many","other"],ordinal:["other"]},
-as: {cardinal:["one","other"],ordinal:["one","two","few","many","other"]},
+ar: {cardinal:[z,o,t,f,m,x],ordinal:[x]},
+ars: {cardinal:[z,o,t,f,m,x],ordinal:[x]},
+as: {cardinal:[o,x],ordinal:[o,t,f,m,x]},
 asa: _1,
 ast: _1,
-az: {cardinal:["one","other"],ordinal:["one","few","many","other"]},
-be: {cardinal:["one","few","many","other"],ordinal:["few","other"]},
+az: {cardinal:[o,x],ordinal:[o,f,m,x]},
+be: {cardinal:[o,f,m,x],ordinal:[f,x]},
 bem: _1,
 bez: _1,
 bg: _1,
 bh: _1,
 bm: _0,
-bn: {cardinal:["one","other"],ordinal:["one","two","few","many","other"]},
+bn: {cardinal:[o,x],ordinal:[o,t,f,m,x]},
 bo: _0,
-br: {cardinal:["one","two","few","many","other"],ordinal:["other"]},
+br: {cardinal:[o,t,f,m,x],ordinal:[x]},
 brx: _1,
-bs: {cardinal:["one","few","other"],ordinal:["other"]},
-ca: {cardinal:["one","other"],ordinal:["one","two","few","other"]},
+bs: {cardinal:[o,f,x],ordinal:[x]},
+ca: {cardinal:[o,x],ordinal:[o,t,f,x]},
 ce: _1,
 cgg: _1,
 chr: _1,
 ckb: _1,
-cs: {cardinal:["one","few","many","other"],ordinal:["other"]},
-cy: {cardinal:["zero","one","two","few","many","other"],ordinal:["zero","one","two","few","many","other"]},
+cs: _4,
+cy: {cardinal:[z,o,t,f,m,x],ordinal:[z,o,t,f,m,x]},
 da: _1,
 de: _1,
-dsb: {cardinal:["one","two","few","other"],ordinal:["other"]},
+dsb: {cardinal:[o,t,f,x],ordinal:[x]},
 dv: _1,
 dz: _0,
 ee: _1,
 el: _1,
-en: {cardinal:["one","other"],ordinal:["one","two","few","other"]},
+en: {cardinal:[o,x],ordinal:[o,t,f,x]},
 eo: _1,
 es: _1,
 et: _1,
@@ -59,19 +61,19 @@ fo: _1,
 fr: _2,
 fur: _1,
 fy: _1,
-ga: {cardinal:["one","two","few","many","other"],ordinal:["one","other"]},
-gd: {cardinal:["one","two","few","other"],ordinal:["one","two","few","other"]},
+ga: {cardinal:[o,t,f,m,x],ordinal:[o,x]},
+gd: {cardinal:[o,t,f,x],ordinal:[o,t,f,x]},
 gl: _1,
 gsw: _1,
-gu: {cardinal:["one","other"],ordinal:["one","two","few","many","other"]},
+gu: {cardinal:[o,x],ordinal:[o,t,f,m,x]},
 guw: _1,
-gv: {cardinal:["one","two","few","many","other"],ordinal:["other"]},
+gv: {cardinal:[o,t,f,m,x],ordinal:[x]},
 ha: _1,
 haw: _1,
-he: {cardinal:["one","two","many","other"],ordinal:["other"]},
-hi: {cardinal:["one","other"],ordinal:["one","two","few","many","other"]},
-hr: {cardinal:["one","few","other"],ordinal:["other"]},
-hsb: {cardinal:["one","two","few","other"],ordinal:["other"]},
+he: {cardinal:[o,t,m,x],ordinal:[x]},
+hi: {cardinal:[o,x],ordinal:[o,t,f,m,x]},
+hr: {cardinal:[o,f,x],ordinal:[x]},
+hsb: {cardinal:[o,t,f,x],ordinal:[x]},
 hu: _2,
 hy: _2,
 ia: _1,
@@ -81,9 +83,9 @@ ii: _0,
 _in: _0,
 io: _1,
 is: _1,
-it: {cardinal:["one","other"],ordinal:["many","other"]},
+it: {cardinal:[o,x],ordinal:[m,x]},
 iu: _3,
-iw: {cardinal:["one","two","many","other"],ordinal:["other"]},
+iw: {cardinal:[o,t,m,x],ordinal:[x]},
 ja: _0,
 jbo: _0,
 jgo: _1,
@@ -91,13 +93,13 @@ ji: _1,
 jmc: _1,
 jv: _0,
 jw: _0,
-ka: {cardinal:["one","other"],ordinal:["one","many","other"]},
+ka: {cardinal:[o,x],ordinal:[o,m,x]},
 kab: _1,
 kaj: _1,
 kcg: _1,
 kde: _0,
 kea: _0,
-kk: {cardinal:["one","other"],ordinal:["many","other"]},
+kk: {cardinal:[o,x],ordinal:[m,x]},
 kkj: _1,
 kl: _1,
 km: _0,
@@ -105,28 +107,28 @@ kn: _1,
 ko: _0,
 ks: _1,
 ksb: _1,
-ksh: {cardinal:["zero","one","other"],ordinal:["other"]},
+ksh: {cardinal:[z,o,x],ordinal:[x]},
 ku: _1,
 kw: _3,
 ky: _1,
-lag: {cardinal:["zero","one","other"],ordinal:["other"]},
+lag: {cardinal:[z,o,x],ordinal:[x]},
 lb: _1,
 lg: _1,
 lkt: _0,
 ln: _1,
-lo: {cardinal:["other"],ordinal:["one","other"]},
-lt: {cardinal:["one","few","many","other"],ordinal:["other"]},
-lv: {cardinal:["zero","one","other"],ordinal:["other"]},
+lo: {cardinal:[x],ordinal:[o,x]},
+lt: _4,
+lv: {cardinal:[z,o,x],ordinal:[x]},
 mas: _1,
 mg: _1,
 mgo: _1,
-mk: {cardinal:["one","other"],ordinal:["one","two","many","other"]},
+mk: {cardinal:[o,x],ordinal:[o,t,m,x]},
 ml: _1,
 mn: _1,
-mo: {cardinal:["one","few","other"],ordinal:["one","other"]},
-mr: {cardinal:["one","other"],ordinal:["one","two","few","other"]},
-ms: {cardinal:["other"],ordinal:["one","other"]},
-mt: {cardinal:["one","few","many","other"],ordinal:["other"]},
+mo: {cardinal:[o,f,x],ordinal:[o,x]},
+mr: {cardinal:[o,x],ordinal:[o,t,f,x]},
+ms: {cardinal:[x],ordinal:[o,x]},
+mt: _4,
 my: _0,
 nah: _1,
 naq: _3,
@@ -143,36 +145,36 @@ nso: _1,
 ny: _1,
 nyn: _1,
 om: _1,
-or: {cardinal:["one","other"],ordinal:["one","two","few","many","other"]},
+or: {cardinal:[o,x],ordinal:[o,t,f,m,x]},
 os: _1,
 pa: _1,
 pap: _1,
-pl: {cardinal:["one","few","many","other"],ordinal:["other"]},
-prg: {cardinal:["zero","one","other"],ordinal:["other"]},
+pl: _4,
+prg: {cardinal:[z,o,x],ordinal:[x]},
 ps: _1,
 pt: _1,
 pt_PT: _1,
 rm: _1,
-ro: {cardinal:["one","few","other"],ordinal:["one","other"]},
+ro: {cardinal:[o,f,x],ordinal:[o,x]},
 rof: _1,
 root: _0,
-ru: {cardinal:["one","few","many","other"],ordinal:["other"]},
+ru: _4,
 rwk: _1,
 sah: _0,
 saq: _1,
-sc: {cardinal:["one","other"],ordinal:["many","other"]},
-scn: {cardinal:["one","other"],ordinal:["many","other"]},
+sc: {cardinal:[o,x],ordinal:[m,x]},
+scn: {cardinal:[o,x],ordinal:[m,x]},
 sd: _1,
 sdh: _1,
 se: _3,
 seh: _1,
 ses: _0,
 sg: _0,
-sh: {cardinal:["one","few","other"],ordinal:["other"]},
-shi: {cardinal:["one","few","other"],ordinal:["other"]},
+sh: {cardinal:[o,f,x],ordinal:[x]},
+shi: {cardinal:[o,f,x],ordinal:[x]},
 si: _1,
-sk: {cardinal:["one","few","many","other"],ordinal:["other"]},
-sl: {cardinal:["one","two","few","other"],ordinal:["other"]},
+sk: _4,
+sl: {cardinal:[o,t,f,x],ordinal:[x]},
 sma: _3,
 smi: _3,
 smj: _3,
@@ -180,8 +182,8 @@ smn: _3,
 sms: _3,
 sn: _1,
 so: _1,
-sq: {cardinal:["one","other"],ordinal:["one","many","other"]},
-sr: {cardinal:["one","few","other"],ordinal:["other"]},
+sq: {cardinal:[o,x],ordinal:[o,m,x]},
+sr: {cardinal:[o,f,x],ordinal:[x]},
 ss: _1,
 ssy: _1,
 st: _1,
@@ -194,7 +196,7 @@ teo: _1,
 th: _0,
 ti: _1,
 tig: _1,
-tk: {cardinal:["one","other"],ordinal:["few","other"]},
+tk: {cardinal:[o,x],ordinal:[f,x]},
 tl: _2,
 tn: _1,
 to: _0,
@@ -202,11 +204,11 @@ tr: _1,
 ts: _1,
 tzm: _1,
 ug: _1,
-uk: {cardinal:["one","few","many","other"],ordinal:["few","other"]},
+uk: {cardinal:[o,f,m,x],ordinal:[f,x]},
 ur: _1,
 uz: _1,
 ve: _1,
-vi: {cardinal:["other"],ordinal:["one","other"]},
+vi: {cardinal:[x],ordinal:[o,x]},
 vo: _1,
 vun: _1,
 wa: _1,
diff --git a/packages/plurals/pluralCategories.mjs b/packages/plurals/pluralCategories.mjs
index 3006f90..ea45355 100644
--- a/packages/plurals/pluralCategories.mjs
+++ b/packages/plurals/pluralCategories.mjs
@@ -1,43 +1,45 @@
-const _0 = {cardinal:["other"],ordinal:["other"]};
-const _1 = {cardinal:["one","other"],ordinal:["other"]};
-const _2 = {cardinal:["one","other"],ordinal:["one","other"]};
-const _3 = {cardinal:["one","two","other"],ordinal:["other"]};
+const z = "zero", o = "one", t = "two", f = "few", m = "many", x = "other";
+const _0 = {cardinal:[x],ordinal:[x]};
+const _1 = {cardinal:[o,x],ordinal:[x]};
+const _2 = {cardinal:[o,x],ordinal:[o,x]};
+const _3 = {cardinal:[o,t,x],ordinal:[x]};
+const _4 = {cardinal:[o,f,m,x],ordinal:[x]};
 
 export const af = _1;
 export const ak = _1;
 export const am = _1;
-export const ar = {cardinal:["zero","one","two","few","many","other"],ordinal:["other"]};
-export const ars = {cardinal:["zero","one","two","few","many","other"],ordinal:["other"]};
-export const as = {cardinal:["one","other"],ordinal:["one","two","few","many","other"]};
+export const ar = {cardinal:[z,o,t,f,m,x],ordinal:[x]};
+export const ars = {cardinal:[z,o,t,f,m,x],ordinal:[x]};
+export const as = {cardinal:[o,x],ordinal:[o,t,f,m,x]};
 export const asa = _1;
 export const ast = _1;
-export const az = {cardinal:["one","other"],ordinal:["one","few","many","other"]};
-export const be = {cardinal:["one","few","many","other"],ordinal:["few","other"]};
+export const az = {cardinal:[o,x],ordinal:[o,f,m,x]};
+export const be = {cardinal:[o,f,m,x],ordinal:[f,x]};
 export const bem = _1;
 export const bez = _1;
 export const bg = _1;
 export const bh = _1;
 export const bm = _0;
-export const bn = {cardinal:["one","other"],ordinal:["one","two","few","many","other"]};
+export const bn = {cardinal:[o,x],ordinal:[o,t,f,m,x]};
 export const bo = _0;
-export const br = {cardinal:["one","two","few","many","other"],ordinal:["other"]};
+export const br = {cardinal:[o,t,f,m,x],ordinal:[x]};
 export const brx = _1;
-export const bs = {cardinal:["one","few","other"],ordinal:["other"]};
-export const ca = {cardinal:["one","other"],ordinal:["one","two","few","other"]};
+export const bs = {cardinal:[o,f,x],ordinal:[x]};
+export const ca = {cardinal:[o,x],ordinal:[o,t,f,x]};
 export const ce = _1;
 export const cgg = _1;
 export const chr = _1;
 export const ckb = _1;
-export const cs = {cardinal:["one","few","many","other"],ordinal:["other"]};
-export const cy = {cardinal:["zero","one","two","few","many","other"],ordinal:["zero","one","two","few","many","other"]};
+export const cs = _4;
+export const cy = {cardinal:[z,o,t,f,m,x],ordinal:[z,o,t,f,m,x]};
 export const da = _1;
 export const de = _1;
-export const dsb = {cardinal:["one","two","few","other"],ordinal:["other"]};
+export const dsb = {cardinal:[o,t,f,x],ordinal:[x]};
 export const dv = _1;
 export const dz = _0;
 export const ee = _1;
 export const el = _1;
-export const en = {cardinal:["one","other"],ordinal:["one","two","few","other"]};
+export const en = {cardinal:[o,x],ordinal:[o,t,f,x]};
 export const eo = _1;
 export const es = _1;
 export const et = _1;
@@ -50,19 +52,19 @@ export const fo = _1;
 export const fr = _2;
 export const fur = _1;
 export const fy = _1;
-export const ga = {cardinal:["one","two","few","many","other"],ordinal:["one","other"]};
-export const gd = {cardinal:["one","two","few","other"],ordinal:["one","two","few","other"]};
+export const ga = {cardinal:[o,t,f,m,x],ordinal:[o,x]};
+export const gd = {cardinal:[o,t,f,x],ordinal:[o,t,f,x]};
 export const gl = _1;
 export const gsw = _1;
-export const gu = {cardinal:["one","other"],ordinal:["one","two","few","many","other"]};
+export const gu = {cardinal:[o,x],ordinal:[o,t,f,m,x]};
 export const guw = _1;
-export const gv = {cardinal:["one","two","few","many","other"],ordinal:["other"]};
+export const gv = {cardinal:[o,t,f,m,x],ordinal:[x]};
 export const ha = _1;
 export const haw = _1;
-export const he = {cardinal:["one","two","many","other"],ordinal:["other"]};
-export const hi = {cardinal:["one","other"],ordinal:["one","two","few","many","other"]};
-export const hr = {cardinal:["one","few","other"],ordinal:["other"]};
-export const hsb = {cardinal:["one","two","few","other"],ordinal:["other"]};
+export const he = {cardinal:[o,t,m,x],ordinal:[x]};
+export const hi = {cardinal:[o,x],ordinal:[o,t,f,m,x]};
+export const hr = {cardinal:[o,f,x],ordinal:[x]};
+export const hsb = {cardinal:[o,t,f,x],ordinal:[x]};
 export const hu = _2;
 export const hy = _2;
 export const ia = _1;
@@ -72,9 +74,9 @@ export const ii = _0;
 export const _in = _0;
 export const io = _1;
 export const is = _1;
-export const it = {cardinal:["one","other"],ordinal:["many","other"]};
+export const it = {cardinal:[o,x],ordinal:[m,x]};
 export const iu = _3;
-export const iw = {cardinal:["one","two","many","other"],ordinal:["other"]};
+export const iw = {cardinal:[o,t,m,x],ordinal:[x]};
 export const ja = _0;
 export const jbo = _0;
 export const jgo = _1;
@@ -82,13 +84,13 @@ export const ji = _1;
 export const jmc = _1;
 export const jv = _0;
 export const jw = _0;
-export const ka = {cardinal:["one","other"],ordinal:["one","many","other"]};
+export const ka = {cardinal:[o,x],ordinal:[o,m,x]};
 export const kab = _1;
 export const kaj = _1;
 export const kcg = _1;
 export const kde = _0;
 export const kea = _0;
-export const kk = {cardinal:["one","other"],ordinal:["many","other"]};
+export const kk = {cardinal:[o,x],ordinal:[m,x]};
 export const kkj = _1;
 export const kl = _1;
 export const km = _0;
@@ -96,28 +98,28 @@ export const kn = _1;
 export const ko = _0;
 export const ks = _1;
 export const ksb = _1;
-export const ksh = {cardinal:["zero","one","other"],ordinal:["other"]};
+export const ksh = {cardinal:[z,o,x],ordinal:[x]};
 export const ku = _1;
 export const kw = _3;
 export const ky = _1;
-export const lag = {cardinal:["zero","one","other"],ordinal:["other"]};
+export const lag = {cardinal:[z,o,x],ordinal:[x]};
 export const lb = _1;
 export const lg = _1;
 export const lkt = _0;
 export const ln = _1;
-export const lo = {cardinal:["other"],ordinal:["one","other"]};
-export const lt = {cardinal:["one","few","many","other"],ordinal:["other"]};
-export const lv = {cardinal:["zero","one","other"],ordinal:["other"]};
+export const lo = {cardinal:[x],ordinal:[o,x]};
+export const lt = _4;
+export const lv = {cardinal:[z,o,x],ordinal:[x]};
 export const mas = _1;
 export const mg = _1;
 export const mgo = _1;
-export const mk = {cardinal:["one","other"],ordinal:["one","two","many","other"]};
+export const mk = {cardinal:[o,x],ordinal:[o,t,m,x]};
 export const ml = _1;
 export const mn = _1;
-export const mo = {cardinal:["one","few","other"],ordinal:["one","other"]};
-export const mr = {cardinal:["one","other"],ordinal:["one","two","few","other"]};
-export const ms = {cardinal:["other"],ordinal:["one","other"]};
-export const mt = {cardinal:["one","few","many","other"],ordinal:["other"]};
+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 = _4;
 export const my = _0;
 export const nah = _1;
 export const naq = _3;
@@ -134,36 +136,36 @@ export const nso = _1;
 export const ny = _1;
 export const nyn = _1;
 export const om = _1;
-export const or = {cardinal:["one","other"],ordinal:["one","two","few","many","other"]};
+export const or = {cardinal:[o,x],ordinal:[o,t,f,m,x]};
 export const os = _1;
 export const pa = _1;
 export const pap = _1;
-export const pl = {cardinal:["one","few","many","other"],ordinal:["other"]};
-export const prg = {cardinal:["zero","one","other"],ordinal:["other"]};
+export const pl = _4;
+export const prg = {cardinal:[z,o,x],ordinal:[x]};
 export const ps = _1;
 export const pt = _1;
 export const pt_PT = _1;
 export const rm = _1;
-export const ro = {cardinal:["one","few","other"],ordinal:["one","other"]};
+export const ro = {cardinal:[o,f,x],ordinal:[o,x]};
 export const rof = _1;
 export const root = _0;
-export const ru = {cardinal:["one","few","many","other"],ordinal:["other"]};
+export const ru = _4;
 export const rwk = _1;
 export const sah = _0;
 export const saq = _1;
-export const sc = {cardinal:["one","other"],ordinal:["many","other"]};
-export const scn = {cardinal:["one","other"],ordinal:["many","other"]};
+export const sc = {cardinal:[o,x],ordinal:[m,x]};
+export const scn = {cardinal:[o,x],ordinal:[m,x]};
 export const sd = _1;
 export const sdh = _1;
 export const se = _3;
 export const seh = _1;
 export const ses = _0;
 export const sg = _0;
-export const sh = {cardinal:["one","few","other"],ordinal:["other"]};
-export const shi = {cardinal:["one","few","other"],ordinal:["other"]};
+export const sh = {cardinal:[o,f,x],ordinal:[x]};
+export const shi = {cardinal:[o,f,x],ordinal:[x]};
 export const si = _1;
-export const sk = {cardinal:["one","few","many","other"],ordinal:["other"]};
-export const sl = {cardinal:["one","two","few","other"],ordinal:["other"]};
+export const sk = _4;
+export const sl = {cardinal:[o,t,f,x],ordinal:[x]};
 export const sma = _3;
 export const smi = _3;
 export const smj = _3;
@@ -171,8 +173,8 @@ export const smn = _3;
 export const sms = _3;
 export const sn = _1;
 export const so = _1;
-export const sq = {cardinal:["one","other"],ordinal:["one","many","other"]};
-export const sr = {cardinal:["one","few","other"],ordinal:["other"]};
+export const sq = {cardinal:[o,x],ordinal:[o,m,x]};
+export const sr = {cardinal:[o,f,x],ordinal:[x]};
 export const ss = _1;
 export const ssy = _1;
 export const st = _1;
@@ -185,7 +187,7 @@ export const teo = _1;
 export const th = _0;
 export const ti = _1;
 export const tig = _1;
-export const tk = {cardinal:["one","other"],ordinal:["few","other"]};
+export const tk = {cardinal:[o,x],ordinal:[f,x]};
 export const tl = _2;
 export const tn = _1;
 export const to = _0;
@@ -193,11 +195,11 @@ export const tr = _1;
 export const ts = _1;
 export const tzm = _1;
 export const ug = _1;
-export const uk = {cardinal:["one","few","many","other"],ordinal:["few","other"]};
+export const uk = {cardinal:[o,f,m,x],ordinal:[f,x]};
 export const ur = _1;
 export const uz = _1;
 export const ve = _1;
-export const vi = {cardinal:["other"],ordinal:["one","other"]};
+export const vi = {cardinal:[x],ordinal:[o,x]};
 export const vo = _1;
 export const vun = _1;
 export const wa = _1;