@pushwoosh/dumb-components 2.8.2 → 2.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushwoosh/dumb-components",
-  "version": "2.8.2",
+  "version": "2.9.0",
   "description": "React components to build Pushwoosh products",
   "main": "index.js",
   "module": "index.js",

package/polyglot/__tests__/filters.test.js

@@ -72,6 +72,35 @@ describe('filters', () => {
       expect(filters.pluralize('not a number', [scalar('a'), scalar('b')], createContext())).toBe('not a number');
     });
   });
+  describe('pluralize with CLDR forms', () => {
+    const arabic = ['صفر', 'صف', 'صفان', 'صفوف', 'صفًا', 'صف*'].map(scalar);
+    test('picks each of the six Arabic forms', () => {
+      const ctx = createContext('ar');
+      expect(filters.pluralize(0, arabic, ctx)).toBe('صفر');
+      expect(filters.pluralize(1, arabic, ctx)).toBe('صف');
+      expect(filters.pluralize(2, arabic, ctx)).toBe('صفان');
+      expect(filters.pluralize(3, arabic, ctx)).toBe('صفوف');
+      expect(filters.pluralize(10, arabic, ctx)).toBe('صفوف');
+      expect(filters.pluralize(11, arabic, ctx)).toBe('صفًا');
+      expect(filters.pluralize(99, arabic, ctx)).toBe('صفًا');
+      expect(filters.pluralize(100, arabic, ctx)).toBe('صف*');
+      expect(filters.pluralize(103, arabic, ctx)).toBe('صفوف');
+    });
+    test('keeps the legacy one/other split when fewer forms are given', () => {
+      const ctx = createContext('ar');
+      expect(filters.pluralize(1, [scalar('صف'), scalar('صفوف')], ctx)).toBe('صف');
+      expect(filters.pluralize(0, [scalar('صف'), scalar('صفوف')], ctx)).toBe('صفوف');
+      expect(filters.pluralize(2, [scalar('صف'), scalar('صفوف')], ctx)).toBe('صفوف');
+    });
+    test('Russian three-form rule matches CLDR one/few/many for integers', () => {
+      const ctx = createContext('ru');
+      const forms = [scalar('one'), scalar('few'), scalar('many')];
+      const rules = new Intl.PluralRules('ru');
+      for (let n = 0; n <= 1000; n += 1) {
+        expect(filters.pluralize(n, forms, ctx)).toBe(rules.select(n));
+      }
+    });
+  });
   describe('formatNumber', () => {
     test('formats integer with spaces', () => {
       expect(filters.formatNumber('1000000', [], createContext())).toBe('1 000 000');

package/polyglot/liquid/filters.js

@@ -15,6 +15,20 @@ const pluralizers = {
   de: universalPluralize,
   es: universalPluralize
 };
+const CLDR_CATEGORY_ORDER = ['zero', 'one', 'two', 'few', 'many', 'other'];
+const cldrPluralize = (language, num, plurals) => {
+  let rules;
+  try {
+    rules = new Intl.PluralRules(language);
+  } catch {
+    return undefined;
+  }
+  const categories = CLDR_CATEGORY_ORDER.filter(c => rules.resolvedOptions().pluralCategories.includes(c));
+  if (categories.length < 2 || plurals.length < categories.length) {
+    return undefined;
+  }
+  return plurals[categories.indexOf(rules.select(num))];
+};
 export const filters = {
   capitalize: value => typeof value === 'string' ? value.charAt(0).toUpperCase() + value.slice(1) : value,
   upperCase: value => typeof value === 'string' ? value.toUpperCase() : value,
@@ -24,6 +38,10 @@ export const filters = {
       return value;
     }
     const variants = args.map(arg => unpackScalarOrValue(arg, context));
+    const cldr = cldrPluralize(context.language, value, variants);
+    if (cldr !== undefined) {
+      return cldr;
+    }
     const pluralizer = pluralizers[context.language] || universalPluralize;
     return pluralizer(value, variants);
   },