Merge branch 'jh-remove_html_project_translations' into 'master'

Remove HTML in project related translations

See merge request gitlab-org/gitlab!37699

app/views/projects/commit/_same_user_different_email_signature_badge.html.haml

 - title = capture do
-  = _('This commit was signed with a verified signature, but the committer email is <strong>not verified</strong> to belong to the same user.').html_safe
+  = html_escape(_('This commit was signed with a verified signature, but the committer email is %{strong_open}not verified%{strong_close} to belong to the same user.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
 
 - locals = { signature: signature, title: title, label: _('Unverified'), css_class: ['invalid'], icon: 'status_notfound_borderless', show_user: true }
 

app/views/projects/commit/_unverified_signature_badge.html.haml

 - title = capture do
-  = _('This commit was signed with an <strong>unverified</strong> signature.').html_safe
+  = html_escape(_('This commit was signed with an %{strong_open}unverified%{strong_close} signature.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
 
 - locals = { signature: signature, title: title, label: _('Unverified'), css_class: 'invalid', icon: 'status_notfound_borderless' }
 

app/views/projects/commit/x509/_verified_signature_badge.html.haml

 - title = capture do
-  = _('This commit was signed with a <strong>verified</strong> signature and the committer email is verified to belong to the same user.').html_safe
+  = html_escape(_('This commit was signed with a %{strong_open}verified%{strong_close} signature and the committer email is verified to belong to the same user.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
 
 - locals = { signature: signature, title: title, label: _('Verified'), css_class: 'valid', icon: 'status_success_borderless', show_user: true }
 

app/views/projects/compare/index.html.haml

@@ -8,9 +8,9 @@
     %code.ref-name master
   - example_sha = capture do
     %code.ref-name 4eedf23
-  = (_("Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request.") % { master: example_master, sha: example_sha }).html_safe
+  = html_escape(_("Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request.")) % { master: example_master.html_safe, sha: example_sha.html_safe }
   %br
-  = (_("Changes are shown as if the <b>source</b> revision was being merged into the <b>target</b> revision.")).html_safe
+  = html_escape(_("Changes are shown as if the %{b_open}source%{b_close} revision was being merged into the %{b_open}target%{b_close} revision.")) % { b_open: '<b>'.html_safe, b_close: '</b>'.html_safe }
 
 .prepend-top-20
   = render "form"

app/views/projects/diffs/_warning.html.haml

@@ -9,4 +9,4 @@
         = link_to _("Plain diff"), merge_request_path(@merge_request, format: :diff), class: "btn btn-sm"
         = link_to _("Email patch"), merge_request_path(@merge_request, format: :patch), class: "btn btn-sm"
   %p
-    = _("To preserve performance only <strong>%{display_size} of %{real_size}</strong> files are displayed.").html_safe % { display_size: diff_files.size, real_size: diff_files.real_size }
+    = html_escape(_("To preserve performance only %{strong_open}%{display_size} of %{real_size}%{strong_close} files are displayed.")) % { display_size: diff_files.size, real_size: diff_files.real_size, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }

app/views/projects/environments/show.html.haml

@@ -65,7 +65,7 @@
           %h4.state-title
             = _("You don't have any deployments right now.")
           %p.blank-state-text
-            = _("Define environments in the deploy stage(s) in <code>.gitlab-ci.yml</code> to track deployments here.").html_safe
+            = html_escape(_("Define environments in the deploy stage(s) in %{code_open}.gitlab-ci.yml%{code_close} to track deployments here.")) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
           .text-center
             = link_to _("Read more"), help_page_path("ci/environments"), class: "btn btn-success"
     - else

app/views/projects/forks/new.html.haml

@@ -5,7 +5,9 @@
     %h4.gl-mt-0
       = _("Fork project")
     %p
-      = _("A fork is a copy of a project.<br />Forking a repository allows you to make changes without affecting the original project.").html_safe
+      = _("A fork is a copy of a project.")
+      %br
+      = _('Forking a repository allows you to make changes without affecting the original project.')
   .col-lg-9
     - if @own_namespace.present?
       .fork-thumbnail-container.js-fork-content

app/views/projects/mirrors/_instructions.html.haml

 .account-well.gl-mt-3.gl-mb-3
   %ul
     %li
-      = _('The repository must be accessible over <code>http://</code>,
-      <code>https://</code>, <code>ssh://</code> or <code>git://</code>.').html_safe
-    %li= _('When using the <code>http://</code> or <code>https://</code> protocols, please provide the exact URL to the repository. HTTP redirects will not be followed.').html_safe
-    %li= _('Include the username in the URL if required: <code>https://username@gitlab.company.com/group/project.git</code>.').html_safe
+      = html_escape(_('The repository must be accessible over %{code_open}http://%{code_close},
+      %{code_open}https://%{code_close}, %{code_open}ssh://%{code_close} or %{code_open}git://%{code_close}.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
+    %li= html_escape(_('When using the %{code_open}http://%{code_close} or %{code_open}https://%{code_close} protocols, please provide the exact URL to the repository. HTTP redirects will not be followed.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
+    %li= html_escape(_('Include the username in the URL if required: %{code_open}https://username@gitlab.company.com/group/project.git%{code_close}.')) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
     %li
       - minutes = Gitlab.config.gitlab_shell.git_timeout / 60
       = _("The update action will time out after %{number_of_minutes} minutes. For big repositories, use a clone/push combination.") % { number_of_minutes: minutes }

app/views/projects/pipelines/_info.html.haml

@@ -35,7 +35,7 @@
       %span.js-pipeline-url-failure.badge.badge-danger.has-tooltip{ title: @pipeline.failure_reason }
         error
     - if @pipeline.auto_devops_source?
-      - popover_title_text = _('This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b>').html_safe
+      - popover_title_text = html_escape(_('This pipeline makes use of a predefined CI/CD configuration enabled by %{b_open}Auto DevOps.%{b_close}')) % { b_open: '<b>'.html_safe, b_close: '</b>'.html_safe }
       - popover_content_url = help_page_path('topics/autodevops/index.md')
       - popover_content_text = _('Learn more about Auto DevOps')
       %a.js-pipeline-url-autodevops.badge.badge-info.autodevops-badge{ href: "#", tabindex: "0", role: "button", data: { container: "body",

app/views/projects/project_members/_groups.html.haml

 .card.project-members-groups
   .card-header
-    = _("Groups with access to <strong>%{project_name}</strong>").html_safe % { project_name: sanitize(@project.name, tags: []) }
+    = html_escape(_("Groups with access to %{strong_open}%{project_name}%{strong_close}")) % { project_name: sanitize(@project.name, tags: []), strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
     %span.badge.badge-pill= group_links.size
   %ul.content-list.members-list
     - can_admin_member = can?(current_user, :admin_project_member, @project)

app/views/projects/project_members/_team.html.haml

@@ -4,7 +4,7 @@
 .card
   .card-header.flex-project-members-panel
     %span.flex-project-title
-      = _("Members of <strong>%{project_name}</strong>").html_safe % { project_name: sanitize(project.name, tags: []) }
+      = html_escape(_("Members of %{strong_open}%{project_name}%{strong_close}")) % { project_name: sanitize(project.name, tags: []), strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
     %span.badge.badge-pill= members.total_count
     = form_tag project_project_members_path(project), method: :get, class: 'form-inline user-search-form flex-users-form' do
       .form-group

app/views/projects/project_members/index.html.haml

@@ -11,7 +11,7 @@
         %p= share_project_description(@project)
       - else
         %p
-          = _("Members can be added by project <i>Maintainers</i> or <i>Owners</i>").html_safe
+          = html_escape(_("Members can be added by project %{i_open}Maintainers%{i_close} or %{i_open}Owners%{i_close}")) % { i_open: '<i>'.html_safe, i_close: '</i>'.html_safe }
 
     .light
       - if can_admin_project_members && project_can_be_shared?

app/views/projects/services/slack/_help.haml

@@ -6,11 +6,11 @@
     %p= s_('SlackIntegration|This service send notifications about projects\' events to Slack channels. To set up this service:')
     %ol
       %li
-        = s_('SlackIntegration|%{webhooks_link_start}Add an incoming webhook%{webhooks_link_end} in your Slack team. The default channel can be overridden for each event.').html_safe % { webhooks_link_start: webhooks_link_start, webhooks_link_end: '</a>'.html_safe }
+        = html_escape(s_('SlackIntegration|%{webhooks_link_start}Add an incoming webhook%{webhooks_link_end} in your Slack team. The default channel can be overridden for each event.')) % { webhooks_link_start: webhooks_link_start.html_safe, webhooks_link_end: '</a>'.html_safe }
       %li
-        = s_('SlackIntegration|Paste the <strong>Webhook URL</strong> into the field below.').html_safe
+        = html_escape(s_('SlackIntegration|Paste the %{strong_open}Webhook URL%{strong_close} into the field below.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
       %li
-        = s_('SlackIntegration|Select events below to enable notifications. The <strong>Slack channel names</strong> and <strong>Slack username</strong> fields are optional.').html_safe
+        = html_escape(s_('SlackIntegration|Select events below to enable notifications. The %{strong_open}Slack channel names%{strong_close} and %{strong_open}Slack username%{strong_close} fields are optional.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
     %p.mt-3.mb-0
-      = s_('SlackIntegration|<strong>Note:</strong> Usernames and private channels are not supported.').html_safe
+      = html_escape(s_('SlackIntegration|%{strong_open}Note:%{strong_close} Usernames and private channels are not supported.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
       = link_to _('Learn more'), help_page_path('user/project/integrations/slack')

app/views/projects/services/slack_slash_commands/_help.html.haml

@@ -89,6 +89,6 @@
 
       %ul.list-unstyled.indent-list
         %li
-          = s_("SlackService|2. Paste the <strong>Token</strong> into the field below").html_safe
+          = html_escape(s_("SlackService|2. Paste the %{strong_open}Token%{strong_close} into the field below")) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
         %li
-          = s_("SlackService|3. Select the <strong>Active</strong> checkbox, press <strong>Save changes</strong> and start using GitLab inside Slack!").html_safe
+          = html_escape(s_("SlackService|3. Select the %{strong_open}Active%{strong_close} checkbox, press %{strong_open}Save changes%{strong_close} and start using GitLab inside Slack!")) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }

app/views/projects/settings/ci_cd/_form.html.haml

@@ -7,7 +7,7 @@
           %h5.gl-mt-0
             = _("Git strategy for pipelines")
           %p
-            = _("Choose between <code>clone</code> or <code>fetch</code> to get the recent application code").html_safe
+            = html_escape(_("Choose between %{code_open}clone%{code_close} or %{code_open}fetch%{code_close} to get the recent application code")) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
             = link_to icon('question-circle'), help_page_path('ci/pipelines/settings', anchor: 'git-strategy'), target: '_blank'
           .form-check
             = f.radio_button :build_allow_git_fetch, 'false', { class: 'form-check-input' }
@@ -54,7 +54,7 @@
           = f.label :ci_config_path, _('Custom CI configuration path'), class: 'label-bold'
           = f.text_field :ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml'
           %p.form-text.text-muted
-            = _("The path to the CI configuration file. Defaults to <code>.gitlab-ci.yml</code>").html_safe
+            = html_escape(_("The path to the CI configuration file. Defaults to %{code_open}.gitlab-ci.yml%{code_close}")) % { code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
             = link_to icon('question-circle'), help_page_path('ci/pipelines/settings', anchor: 'custom-ci-configuration-path'), target: '_blank'
 
         %hr

app/views/shared/issuable/form/_branch_chooser.html.haml

@@ -9,7 +9,7 @@
 .form-group.row.d-flex.gl-pl-3-deprecated-no-really-do-not-use-me.gl-pr-3-deprecated-no-really-do-not-use-me.branch-selector
   .align-self-center
     %span
-      = _('From <code>%{source_title}</code> into').html_safe % { source_title: source_title }
+      = html_escape(_('From %{code_open}%{source_title}%{code_close} into')) % { source_title: source_title, code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
 
     - if issuable.new_record?
       %code#js-target-branch-title= target_title

ee/app/helpers/ee/mirror_helper.rb

@@ -41,7 +41,8 @@ module EE
       docs_link_url = help_page_path('topics/git/lfs/index')
       docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: docs_link_url }
 
-      _('Git LFS objects will be synced in pull mirrors if LFS is %{docs_link_start}enabled for the project%{docs_link_end}. They will <strong>not</strong> be synced in push mirrors.').html_safe % { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe }
+      html_escape(_('Git LFS objects will be synced in pull mirrors if LFS is %{docs_link_start}enabled for the project%{docs_link_end}. They will %{strong_open}not%{strong_close} be synced in push mirrors.')) %
+        { docs_link_start: docs_link_start, docs_link_end: '</a>'.html_safe, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
     end
   end
 end

ee/app/views/projects/_new_ci_cd_banner_external_repo.html.haml

 - if ci_cd_projects_available?
   %p
-    = _('To only use CI/CD features for an external repository, choose <strong>CI/CD for external repo</strong>.').html_safe
+    = html_escape(_('To only use CI/CD features for an external repository, choose %{strong_open}CI/CD for external repo%{strong_close}.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }

ee/app/views/registrations/projects/new.html.haml

@@ -7,7 +7,7 @@
       #progress-bar{ data: { is_in_subscription_flow: in_subscription_flow?.to_s } }
       %h2.center= _('Create/import your first project')
       %p
-        .center= _('This project will live in your group <strong>%{namespace}</strong>. A project is where you house your files (repository), plan your work (issues), publish your documentation (wiki), and so much more.').html_safe % { namespace: html_escape(@project.namespace.name) }
+        .center= html_escape(_('This project will live in your group %{strong_open}%{namespace}%{strong_close}. A project is where you house your files (repository), plan your work (issues), publish your documentation (wiki), and so much more.')) % { namespace: html_escape(@project.namespace.name), strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
 
       .js-toggle-container.w-100
         %ul.nav.nav-tabs.nav-links.gitlab-tabs{ role: 'tablist' }