Remove HTML in contribution analytics translations

Replace usage of HTML in these translations with variables so that they
can be removed from the todolist and translated again.

Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/228846

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

@@ -30,7 +30,7 @@
     - commits_count = @data_collector.total_commit_count
     - person_count = @data_collector.total_push_author_count
     - person_count_string = pluralize person_count, 'person'
-    - pushes_string = s_('ContributionAnalytics|<strong>%{pushes}</strong> pushes, more than <strong>%{commits}</strong> commits by <strong>%{people}</strong> contributors.').html_safe % { pushes: code_push_count, commits: commits_count , people: person_count_string }
+    - 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) }
     - if code_push_count > 0 || commits_count > 0 || person_count > 0
       = pushes_string
     - else
@@ -45,7 +45,7 @@
     - mr_created_count = @data_collector.total_merge_requests_created_count
     - mr_merged_count = @data_collector.total_merge_requests_merged_count
     - if mr_created_count > 0 || mr_merged_count > 0
-      = s_('ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{merged_count}</strong> merged.').html_safe % { created_count: mr_created_count, merged_count: mr_merged_count }
+      = html_escape(s_('ContributionAnalytics|%{created_count} created, %{merged_count} merged.')) % { created_count: tag.strong(mr_created_count), merged_count: tag.strong(mr_merged_count) }
     - else
       = s_('ContributionAnalytics|No merge requests for the selected time period.')
 
@@ -58,7 +58,7 @@
     - issues_created_count = @data_collector.total_issues_created_count
     - issues_closed_count = @data_collector.total_issues_closed_count
     - if issues_created_count > 0 && issues_closed_count > 0
-      = s_('ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{closed_count}</strong> closed.').html_safe % { created_count: issues_created_count, closed_count: issues_closed_count }
+      = html_escape(s_('ContributionAnalytics|%{created_count} created, %{closed_count} closed.')) % { created_count: tag.strong(issues_created_count), closed_count: tag.strong(issues_closed_count) }
     - else
       = s_('ContributionAnalytics|No issues for the selected time period.')
 

lib/gitlab/i18n/html_todo.yml

@@ -154,23 +154,6 @@
     - "Налаштуйте файл <code>.gitlab-webide.yml</code> у директорії <code>.gitlab</code>, щоб почати використовувати Веб-термінал. %{helpStart}Докладніше.%{helpEnd}"
     - "웹 터미널 사용을 시작하도록 <code>.gitlab</code> 디렉토리에서 <code>.gitlab-webide.yml</code> 파일을 구성하십시오. %{helpStart}자세히 알아보십시오.%{helpEnd}"
     - "Configure un archivo <code>.gitlab-webide.yml</code> en el directorio <code>.gitlab</code> para comenzar a utilizar el Terminal Web. %{helpStart}Aprende más.%{helpEnd}"
-"ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{closed_count}</strong> closed.":
-  plural_id:
-  translations:
-    - "<strong>%{created_count}</strong> 件を作成、<strong>%{closed_count}</strong>件をクローズしました。"
-    - "已创建<strong>%{created_count}</strong> 个，已关闭<strong>%{closed_count}</strong>个。"
-    - "<strong>%{created_count}</strong> створено, <strong>%{closed_count}</strong> закрито."
-    - "<strong>%{created_count}</strong> creado, <strong>%{closed_count}</strong> cerrado."
-    - "<strong>%{created_count}</strong> oluşturuldu, <strong>%{closed_count}</strong> kapatıldı."
-"ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{merged_count}</strong> merged.":
-  plural_id:
-  translations:
-"ContributionAnalytics|<strong>%{pushes}</strong> pushes, more than <strong>%{commits}</strong> commits by <strong>%{people}</strong> contributors.":
-  plural_id:
-  translations:
-    - "<strong>%{pushes}</strong>回のプッシュ、<strong>%{commits}</strong>回以上のコミットが貢献者<strong>%{people}</strong>によって行われました。"
-    - "<strong>%{pushes}</strong>次推送，含来自<strong>%{people}</strong>位贡献者的<strong>%{commits}</strong>次以上提交。"
-    - "<strong>%{pushes}</strong> отправок — больше чем <strong>%{commits}</strong> коммитов от <strong>%{people}</strong> участников."
 "Contributions for <strong>%{calendar_date}</strong>":
   plural_id:
   translations:
@@ -696,6 +679,23 @@
 "Your license will be included in your GitLab backup and will survive upgrades, so in normal usage you should never need to re-upload your <code>.gitlab-license</code> file.":
   plural_id:
   translations:
+"ContributionAnalytics|<strong>%{pushes}</strong> pushes, more than <strong>%{commits}</strong> commits by <strong>%{people}</strong> contributors.":
+  plural_id:
+  translations:
+    - "<strong>%{pushes}</strong>回のプッシュ、<strong>%{commits}</strong>回以上のコミットが貢献者<strong>%{people}</strong>によって行われました。"
+    - "<strong>%{pushes}</strong>次推送，含来自<strong>%{people}</strong>位贡献者的<strong>%{commits}</strong>次以上提交。"
+    - "<strong>%{pushes}</strong> отправок — больше чем <strong>%{commits}</strong> коммитов от <strong>%{people}</strong> участников."
+"ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{closed_count}</strong> closed.":
+  plural_id:
+  translations:
+    - "<strong>%{created_count}</strong> 件を作成、<strong>%{closed_count}</strong>件をクローズしました。"
+    - "已创建<strong>%{created_count}</strong> 个，已关闭<strong>%{closed_count}</strong>个。"
+    - "<strong>%{created_count}</strong> створено, <strong>%{closed_count}</strong> закрито."
+    - "<strong>%{created_count}</strong> creado, <strong>%{closed_count}</strong> cerrado."
+    - "<strong>%{created_count}</strong> oluşturuldu, <strong>%{closed_count}</strong> kapatıldı."
+"ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{merged_count}</strong> merged.":
+  plural_id:
+  translations:
 "<code>\\\"johnsmith@example.com\\\": \\\"@johnsmith\\\"</code> will add \\\"By <a href=\\\"#\\\">@johnsmith</a>\\\" to all issues and comments originally created by johnsmith@example.com, and will set <a href=\\\"#\\\">@johnsmith</a> as the assignee on all issues originally assigned to johnsmith@example.com.":
   plural_id:
   translations:

locale/gitlab.pot

@@ -6647,13 +6647,13 @@ msgstr ""
 msgid "Contribution Analytics"
 msgstr ""
 
-msgid "ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{closed_count}</strong> closed."
+msgid "ContributionAnalytics|%{created_count} created, %{closed_count} closed."
 msgstr ""
 
-msgid "ContributionAnalytics|<strong>%{created_count}</strong> created, <strong>%{merged_count}</strong> merged."
+msgid "ContributionAnalytics|%{created_count} created, %{merged_count} merged."
 msgstr ""
 
-msgid "ContributionAnalytics|<strong>%{pushes}</strong> pushes, more than <strong>%{commits}</strong> commits by <strong>%{people}</strong> contributors."
+msgid "ContributionAnalytics|%{pushes} pushes, more than %{commits} commits by %{people} contributors."
 msgstr ""
 
 msgid "ContributionAnalytics|Contribution analytics for issues, merge requests and push events since %{start_date}"