fix[Op#40437]: switch to i18n pluralization

See: https://guides.rubyonrails.org/i18n.html#pluralization Co-authored-by: Eric Schubert <[email protected]>
opf · Oct 25, 2024 · 99f264f · 99f264f
1 parent 54c0ff6
commit 99f264f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/components/work_packages/activities_tab/journals/item_component/reactions.rb b/app/components/work_packages/activities_tab/journals/item_component/reactions.rb
@@ -75,10 +75,10 @@ def number_of_user_reactions_text(users, max_displayed_users_count: 5)
           if user_count <= max_displayed_users_count
             "#{displayed_users[0..-2].join(', ')} #{I18n.t('reactions.and_user', user: displayed_users.last)}"
           elsif user_count == max_displayed_users_count + 1
-            "#{displayed_users.join(', ')} #{I18n.t('reactions.and_n_others_singular', n: 1)}"
+            "#{displayed_users.join(', ')} #{I18n.t('reactions.and_others', count: 1)}"
           else
-            "#{displayed_users.join(', ')} #{I18n.t('reactions.and_n_others_plural',
-                                                    n: user_count - max_displayed_users_count)}"
+            "#{displayed_users.join(', ')} #{I18n.t('reactions.and_others',
+                                                    count: user_count - max_displayed_users_count)}"
           end
         end
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -551,8 +551,9 @@ en:
     add_reaction: "Add reaction"
     react_with: "React with %{reaction}"
     and_user: "and %{user}"
-    and_n_others_singular: "and %{n} other"
-    and_n_others_plural: "and %{n} others"
+    and_others:
+      one: and 1 other
+      other: and %{count} others
     reaction_by: "%{reaction} by"
 
   reportings: