Merge branch '330161-aqualls-instance-templates' into 'master'

Update shared template UI: style, phrasing

See merge request gitlab-org/gitlab!62526

ee/app/views/admin/application_settings/_templates.html.haml

@@ -6,17 +6,18 @@
       %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
         = expanded ? _('Collapse') : _('Expand')
       %p
-        = _('Set instance-wide template repository')
+        = _('Select a shared template repository for all projects on this instance.')
     .settings-content
       = form_for @application_setting, url: templates_admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
         = form_errors(@application_setting)
 
         %fieldset
           .form-group
-            = f.label :file_template_project_id, class: 'label-light' do
-              .form-text.text-muted
-                Select a
-                = link_to 'template repository', help_page_path("user/admin_area/settings/instance_template_repository")
+            = f.label :file_template_project_id, class: 'label-bold' do
+              .form-text
+                = _('Select a template repository')
             = project_select_tag('application_setting[file_template_project_id]', class: 'project-item-select hidden-filter-value', toggle_class: 'js-project-search js-project-filter js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-project js-filter-submit',
               placeholder: _('Search projects'), idAttribute: 'id', data: { order_by: 'last_activity_at', idattribute: 'id', all_projects: 'true', simple_filter: true, allow_clear: true }, value: @application_setting.file_template_project_id)
+            - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('user/admin_area/settings/instance_template_repository') }
+            = s_('TemplateRepository|Select a repository to make its templates available to all projects. %{link_start}What should the repository contain?%{link_end} ').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
         = f.submit 'Save changes', class: "gl-button btn btn-confirm"

locale/gitlab.pot

@@ -29357,6 +29357,9 @@ msgstr ""
 msgid "Select a repository"
 msgstr ""
 
+msgid "Select a shared template repository for all projects on this instance."
+msgstr ""
+
 msgid "Select a template repository"
 msgstr ""
 
@@ -29747,9 +29750,6 @@ msgstr ""
 msgid "Set due date"
 msgstr ""
 
-msgid "Set instance-wide template repository"
-msgstr ""
-
 msgid "Set iteration"
 msgstr ""
 
@@ -31998,6 +31998,9 @@ msgstr ""
 msgid "Template to append to all Service Desk issues"
 msgstr ""
 
+msgid "TemplateRepository|Select a repository to make its templates available to all projects. %{link_start}What should the repository contain?%{link_end} "
+msgstr ""
+
 msgid "Templates"
 msgstr ""