Merge branch '233972-update-shared-specific-runner-l10n' into 'master'

Refactor: Update runner type/state translations

See merge request gitlab-org/gitlab!66277

app/assets/javascripts/runner/components/cells/runner_type_cell.vue

@@ -32,11 +32,11 @@ export default {
     <runner-type-badge :type="runnerType" size="sm" />
 
     <gl-badge v-if="locked" variant="warning" size="sm">
-      {{ __('locked') }}
+      {{ s__('Runners|locked') }}
     </gl-badge>
 
     <gl-badge v-if="paused" variant="danger" size="sm">
-      {{ __('paused') }}
+      {{ s__('Runners|paused') }}
     </gl-badge>
   </div>
 </template>

app/assets/javascripts/runner/components/runner_type_help.vue

@@ -44,13 +44,13 @@ export default {
         </li>
         <li>
           <gl-badge variant="warning" size="sm">
-            {{ __('locked') }}
+            {{ s__('Runners|locked') }}
           </gl-badge>
           - {{ __('Cannot be assigned to other projects.') }}
         </li>
         <li>
           <gl-badge variant="danger" size="sm">
-            {{ __('paused') }}
+            {{ s__('Runners|paused') }}
           </gl-badge>
           - {{ __('Not available to run jobs.') }}
         </li>

app/views/admin/runners/_runner.html.haml

@@ -6,15 +6,15 @@
     .table-mobile-header{ role: 'rowheader' }= _('Type')
     .table-mobile-content
       - if runner.instance_type?
-        %span.badge.badge-pill.gl-badge.sm.badge-success= _("shared")
+        %span.badge.badge-pill.gl-badge.sm.badge-success= s_('Runners|shared')
       - elsif runner.group_type?
-        %span.badge.badge-pill.gl-badge.sm.badge-success= _("group")
+        %span.badge.badge-pill.gl-badge.sm.badge-success= s_('Runners|group')
       - else
-        %span.badge.badge-pill.gl-badge.sm.badge-info= _("specific")
+        %span.badge.badge-pill.gl-badge.sm.badge-info= s_('Runners|specific')
       - if runner.locked?
-        %span.badge.badge-pill.gl-badge.sm.badge-warning= _("locked")
+        %span.badge.badge-pill.gl-badge.sm.badge-warning= s_('Runners|locked')
       - unless runner.active?
-        %span.badge.badge-pill.gl-badge.sm.badge-danger= _("paused")
+        %span.badge.badge-pill.gl-badge.sm.badge-danger= s_('Runners|paused')
 
   .table-section.section-30
     .table-mobile-header{ role: 'rowheader' }= s_('Runners|Runner')

app/views/admin/runners/index.html.haml

@@ -17,23 +17,23 @@
           %span= _('Runners can be:')
           %ul
             %li
-              %span.badge.badge-pill.gl-badge.sm.badge-success shared
+              %span.badge.badge-pill.gl-badge.sm.badge-success= s_('Runners|shared')
               \-
               = _('Runs jobs from all unassigned projects.')
             %li
-              %span.badge.badge-pill.gl-badge.sm.badge-success group
+              %span.badge.badge-pill.gl-badge.sm.badge-success= s_('Runners|group')
               \-
               = _('Runs jobs from all unassigned projects in its group.')
             %li
-              %span.badge.badge-pill.gl-badge.sm.badge-info specific
+              %span.badge.badge-pill.gl-badge.sm.badge-info= s_('Runners|specific')
               \-
               = _('Runs jobs from assigned projects.')
             %li
-              %span.badge.badge-pill.gl-badge.sm.badge-warning locked
+              %span.badge.badge-pill.gl-badge.sm.badge-warning= s_('Runners|locked')
               \-
               = _('Cannot be assigned to other projects.')
             %li
-              %span.badge.badge-pill.gl-badge.sm.badge-danger paused
+              %span.badge.badge-pill.gl-badge.sm.badge-danger= s_('Runners|paused')
               \-
               = _('Not available to run jobs.')
 
@@ -41,7 +41,7 @@
       .bs-callout
         = render partial: 'ci/runner/how_to_setup_runner',
                   locals: { registration_token: Gitlab::CurrentSettings.runners_registration_token,
-                            type: 'shared',
+                            type: s_('Runners|shared'),
                             reset_token_url: reset_registration_token_admin_application_settings_path,
                             project_path: '',
                             group_path: '' }

app/views/groups/runners/_runner.html.haml

@@ -7,16 +7,16 @@
     .table-mobile-content
       - if runner.group_type?
         %span.badge.badge-pill.gl-badge.sm.badge-success
-          = _('group')
+          = s_('Runners|group')
       - else
         %span.badge.badge-pill.gl-badge.sm.badge-info
-          = _('specific')
+          = s_('Runners|specific')
       - if runner.locked?
         %span.badge.badge-pill.gl-badge.sm.badge-warning
-          = _('locked')
+          = s_('Runners|locked')
       - unless runner.active?
         %span.badge.badge-pill.gl-badge.sm.badge-danger
-          = _('paused')
+          = s_('Runners|paused')
 
   .table-section.section-30
     .table-mobile-header{ role: 'rowheader' }= s_('Runners|Runner')

app/views/projects/runners/_specific_runners.html.haml

@@ -6,7 +6,7 @@
     = _('These runners are specific to this project.')
     %hr
     = render partial: 'ci/runner/how_to_setup_runner_automatically',
-             locals: { type: 'specific',
+             locals: { type: s_('Runners|specific'),
                        clusters_path: project_clusters_path(@project) }
     - if params[:ci_runner_templates]
       %hr
@@ -15,7 +15,7 @@
     %hr
     = render partial: 'ci/runner/how_to_setup_runner',
             locals: { registration_token: @project.runners_token,
-                      type: 'specific',
+                      type: s_('Runners|specific'),
                       reset_token_url: reset_registration_token_namespace_project_settings_ci_cd_path,
                       project_path: @project.path_with_namespace,
                       group_path: '' }

locale/gitlab.pot

@@ -28369,6 +28369,12 @@ msgstr ""
 msgid "Runners|instance"
 msgstr ""
 
+msgid "Runners|locked"
+msgstr ""
+
+msgid "Runners|paused"
+msgstr ""
+
 msgid "Runners|project"
 msgstr ""
 
@@ -38959,9 +38965,6 @@ msgstr ""
 msgid "loading"
 msgstr ""
 
-msgid "locked"
-msgstr ""
-
 msgid "locked by %{path_lock_user_name} %{created_at}"
 msgstr ""
 
@@ -39412,9 +39415,6 @@ msgstr[1] ""
 msgid "password"
 msgstr ""
 
-msgid "paused"
-msgstr ""
-
 msgid "pending comment"
 msgstr ""
 
@@ -39586,9 +39586,6 @@ msgstr ""
 msgid "severity|Unknown"
 msgstr ""
 
-msgid "shared"
-msgstr ""
-
 msgid "should be an array of %{object_name} objects"
 msgstr ""
 
@@ -39619,9 +39616,6 @@ msgstr ""
 msgid "source diff"
 msgstr ""
 
-msgid "specific"
-msgstr ""
-
 msgid "specified top is not part of the tree"
 msgstr ""