Merge branch 'fix/contribution-analytics-weird-string' into 'master'

Fix: weird expression for contribution analytics

See merge request gitlab-org/gitlab!96235

ee/app/views/groups/contribution_analytics/show.html.haml

@@ -13,8 +13,10 @@
   - code_push_count = @data_collector.total_push_count
   - commits_count = @data_collector.total_commit_count
   - person_count = @data_collector.total_push_author_count
-  - person_count_string = pluralize person_count, 'person'
-  - pushes_string = html_escape(s_('ContributionAnalytics|%{pushes} pushes, more than %{commits} commits by %{people} contributors.')) % { pushes: tag.strong(code_push_count), commits: tag.strong(commits_count), people: tag.strong(person_count_string) }
+  - pushes = n_('%d push', '%d pushes', code_push_count) % code_push_count
+  - commits = n_('%d commit', '%d commits', commits_count) % commits_count
+  - contributor_count = n_('%d contributor', '%d contributors', person_count) % person_count
+  - pushes_string = html_escape(s_('ContributionAnalytics|%{pushes}, more than %{commits} by %{contributors}.')) % { pushes: tag.strong(pushes), commits: tag.strong(commits), contributors: tag.strong(contributor_count) }
   - if code_push_count > 0 || commits_count > 0 || person_count > 0
     = pushes_string
   - else

locale/gitlab.pot

@@ -218,6 +218,11 @@ msgid_plural "%d contributions"
 msgstr[0] ""
 msgstr[1] ""
+msgid "%d contributor"
+msgid_plural "%d contributors"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
@@ -368,6 +373,11 @@ msgid_plural "%d projects selected"
 msgstr[0] ""
 msgstr[1] ""
+msgid "%d push"
+msgid_plural "%d pushes"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%d remaining"
 msgid_plural "%d remaining"
 msgstr[0] ""
@@ -10418,7 +10428,7 @@ msgstr ""
 msgid "ContributionAnalytics|%{created_count} created, %{merged_count} merged, %{closed_count} closed."
 msgstr ""
-msgid "ContributionAnalytics|%{pushes} pushes, more than %{commits} commits by %{people} contributors."
+msgid "ContributionAnalytics|%{pushes}, more than %{commits} by %{contributors}."
 msgstr ""
 msgid "ContributionAnalytics|Contribution analytics for issues, merge requests and push events since %{start_date}"