From 40d57a20391caa3c485abcce8ae480194cbe77d8 Mon Sep 17 00:00:00 2001
From: Ryan Miller <ryan.m@getsession.org>
Date: Mon, 19 Aug 2024 15:43:17 +1000
Subject: [PATCH] fix: plurals arg type

---
 ts/types/Localizer.ts | 4 ++--
 ts/util/i18n.ts       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ts/types/Localizer.ts b/ts/types/Localizer.ts
index a31621fe0..e38c25a96 100644
--- a/ts/types/Localizer.ts
+++ b/ts/types/Localizer.ts
@@ -23,9 +23,9 @@ export type DictionaryWithoutPluralStrings = Omit<Dictionary, PluralString>;
 type DynamicArgs<LocalizedString extends string> =
   /** If a string follows the plural format use its plural variable name and recursively check for
    *  dynamic args inside all plural forms */
-  LocalizedString extends `{${infer PluralVar}, plural, one {${infer PluralOne}} other {${infer PluralOther}}}`
+  LocalizedString extends `{${infer PluralVar}, plural, one [${infer PluralOne}] other [${infer PluralOther}]}`
     ? PluralVar | DynamicArgs<PluralOne> | DynamicArgs<PluralOther>
-    : /** If a string segment has follows the variable form parse its variable name and recursively
+    : /** If a string segment follows the variable form parse its variable name and recursively
        * check for more dynamic args */
       // eslint-disable-next-line @typescript-eslint/no-unused-vars -- We dont care about _Pre TODO: see if we can remove this infer
       LocalizedString extends `${infer _Pre}{${infer Var}}${infer Rest}`
diff --git a/ts/util/i18n.ts b/ts/util/i18n.ts
index ed556aba2..cb657196e 100644
--- a/ts/util/i18n.ts
+++ b/ts/util/i18n.ts
@@ -219,7 +219,7 @@ export const setupi18n = (locale: Locale, dictionary: LocalizerDictionary) => {
             `i18n: Attempted to nonexistent pluralKey for plural form string '${localizedString}'`
           );
         } else {
-          const num = args?.[pluralKey] ?? 0;
+          const num = args?.[pluralKey as keyof typeof args] ?? 0;
 
           const cardinalRule = new Intl.PluralRules(locale).select(num);