fix: Don't crash if no "other" case is provided.

schummar · Sep 21, 2021 · bc32164 · bc32164
1 parent a92c0a5
commit bc32164
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/translate.ts b/src/translate.ts
@@ -1,3 +1,4 @@
+import { parse } from '@formatjs/icu-messageformat-parser';
 import { IntlMessageFormat } from 'intl-messageformat';
 import { mapPotentialArray } from './mapPotentialArray';
 import { FlatDict } from './types';
@@ -53,7 +54,8 @@ export function translate<F = never>({
 
 export function format(template: string, values?: Record<string, unknown>, locale?: string): string {
   try {
-    const f = new IntlMessageFormat(template, locale);
+    const ast = parse(template, { requiresOtherClause: false });
+    const f = new IntlMessageFormat(ast, locale);
     const msg = f.format(values);
     if (msg instanceof Array) return msg.join(' ');
     return String(msg);

diff --git a/test/translator.test.ts b/test/translator.test.ts
@@ -78,3 +78,10 @@ test('locale', async (t) => {
   t.is(en.locale, 'en');
   t.is(de.locale, 'de');
 });
+
+test('plural without other', async (t) => {
+  const ru = await getTranslator('ru');
+  t.is(ru.format('{x, plural, one {# one} few {# few} many {# many}}', { x: 1 }), '1 one');
+  t.is(ru.format('{x, plural, one {# one} few {# few} many {# many}}', { x: 2 }), '2 few');
+  t.is(ru.format('{x, plural, one {# one} few {# few} many {# many}}', { x: 5 }), '5 many');
+});