Merge branch '247476-remove-angle-brackets-in-project-name' into 'master'

Remove brackets of "project name" message See merge request gitlab-org/gitlab!47642

Merge branch '247476-remove-angle-brackets-in-project-name' into 'master'
Remove brackets of "project name" message See merge request gitlab-org/gitlab!47642
b7c0606e · Olena Horal-Koretska · 8aa3973a · a1260c7f · b7c0606e · b7c0606e
Commit b7c0606e authored Nov 19, 2020 by Olena Horal-Koretska
3 changed files
--- a/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml
+++ b/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml
- pretty_name = html_escape(@project&.full_name) || html_escape_once(_('&lt;project name&gt;')).html_safe
+- pretty_name = @project&.full_name ? html_escape(@project&.full_name) : '<' + _('project name') + '>'
 - run_actions_text = html_escape(s_("ProjectService|Perform common operations on GitLab project: %{project_name}")) % { project_name: pretty_name }

 %p= s_("ProjectService|To set up this service:")

--- a/app/views/projects/services/slack_slash_commands/_help.html.haml
+++ b/app/views/projects/services/slack_slash_commands/_help.html.haml
- pretty_name = @project&.full_name || _('&lt;project name&gt;')
+- pretty_name = @project&.full_name ? html_escape(@project&.full_name) : '<' + _('project name') + '>'
 - run_actions_text = html_escape_once(s_("ProjectService|Perform common operations on GitLab project: %{project_name}") % { project_name: pretty_name })

 .info-well

--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -906,9 +906,6 @@ msgstr ""
 msgid "&lt;no scopes selected&gt;"
 msgstr ""

-msgid "&lt;project name&gt;"
-msgstr ""
-
 msgid "'%{data}' at %{location} does not match format: %{format}"
 msgstr ""

@@ -32777,6 +32774,9 @@ msgstr ""
 msgid "project members"
 msgstr ""

+msgid "project name"
+msgstr ""
+
 msgid "projects"
 msgstr ""