fix: actually support ordinal plurals

leuchtturm-dev · Sep 6, 2023 · 2eda631 · 2eda631
1 parent ac5c0c5
commit 2eda631
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/lib/idiom.ex b/lib/idiom.ex
@@ -24,6 +24,7 @@ defmodule Idiom do
           to: String.t(),
           fallback: String.t() | list(String.t()),
           count: integer() | float() | Decimal.t() | String.t(),
+          plural: :cardinal | :ordinal,
           cache_table_name: atom()
         ]
 
@@ -91,6 +92,7 @@ defmodule Idiom do
       Keyword.get(opts, :fallback) || Application.get_env(:idiom, :default_fallback)
 
     count = Keyword.get(opts, :count)
+    plural = Keyword.get(opts, :plural, :cardinal)
     bindings = Map.put_new(bindings, :count, count)
 
     locale_resolve_hierarchy =
@@ -106,7 +108,7 @@ defmodule Idiom do
           |> Enum.flat_map(fn key ->
             [
               {locale, namespace, key},
-              {locale, namespace, "#{key}_#{Plural.get_suffix(locale, count)}"}
+              {locale, namespace, "#{key}_#{Plural.get_suffix(locale, count, type: plural)}"}
             ]
           end)
 

diff --git a/test/data.json b/test/data.json
@@ -7,6 +7,9 @@
       "Natural language: the colon-ing": "Colons",
       "carrot_one": "1 carrot",
       "carrot_other": "{{count}} carrots",
+      "cake_one": "1st cake",
+      "cake_two": "2nd cake",
+      "cake_other": "{{count}}th cake",
       "welcome": "welcome, {{name}}",
       "Welcome to our site 😊": "Welcome to our site 😊"
     },

diff --git a/test/idiom/cache/init_test.exs b/test/idiom/cache/init_test.exs
@@ -57,7 +57,10 @@ defmodule Idiom.Cache.InitTest do
                {"ar", "default", "Hello world"} => "مرحبا بالعالم",
                {"en", "default", "Welcome to our site 😊"} => "Welcome to our site 😊",
                {"ja", "default", "Hello world"} => "こんにちは世界",
-               {"zh", "default", "Hello world"} => "你好世界"
+               {"zh", "default", "Hello world"} => "你好世界",
+               {"en", "default", "cake_one"} => "1st cake",
+               {"en", "default", "cake_other"} => "{{count}}th cake",
+               {"en", "default", "cake_two"} => "2nd cake"
              }
   end
 end
diff --git a/test/idiom/idiom/t_test.exs b/test/idiom/idiom/t_test.exs
@@ -58,6 +58,22 @@ defmodule Idiom.Idiom.TTest do
         opts: [count: 2, cache_table_name: :t_test],
         expected: "2 carrots"
       },
+      # With ordinal plural
+      %{
+        key: "cake",
+        opts: [count: 1, plural: :ordinal, cache_table_name: :t_test],
+        expected: "1st cake"
+      },
+      %{
+        key: "cake",
+        opts: [count: 2, plural: :ordinal, cache_table_name: :t_test],
+        expected: "2nd cake"
+      },
+      %{
+        key: "cake",
+        opts: [count: 10, plural: :ordinal, cache_table_name: :t_test],
+        expected: "10th cake"
+      },
       # With plural key and explicit suffix
       %{
         key: "carrot_one",