Commit e7e8eb49 authored by Miguel Rincon's avatar Miguel Rincon

Update "shared" and "specific" runner translations

This change unifies some runner types labels to use the `Runners|`
namespace, this will help reduce the amount of translations of
runner types.
parent 0d066422
...@@ -32,11 +32,11 @@ export default { ...@@ -32,11 +32,11 @@ export default {
<runner-type-badge :type="runnerType" size="sm" /> <runner-type-badge :type="runnerType" size="sm" />
<gl-badge v-if="locked" variant="warning" size="sm"> <gl-badge v-if="locked" variant="warning" size="sm">
{{ __('locked') }} {{ s__('Runners|locked') }}
</gl-badge> </gl-badge>
<gl-badge v-if="paused" variant="danger" size="sm"> <gl-badge v-if="paused" variant="danger" size="sm">
{{ __('paused') }} {{ s__('Runners|paused') }}
</gl-badge> </gl-badge>
</div> </div>
</template> </template>
...@@ -44,13 +44,13 @@ export default { ...@@ -44,13 +44,13 @@ export default {
</li> </li>
<li> <li>
<gl-badge variant="warning" size="sm"> <gl-badge variant="warning" size="sm">
{{ __('locked') }} {{ s__('Runners|locked') }}
</gl-badge> </gl-badge>
- {{ __('Cannot be assigned to other projects.') }} - {{ __('Cannot be assigned to other projects.') }}
</li> </li>
<li> <li>
<gl-badge variant="danger" size="sm"> <gl-badge variant="danger" size="sm">
{{ __('paused') }} {{ s__('Runners|paused') }}
</gl-badge> </gl-badge>
- {{ __('Not available to run jobs.') }} - {{ __('Not available to run jobs.') }}
</li> </li>
......
...@@ -6,15 +6,15 @@ ...@@ -6,15 +6,15 @@
.table-mobile-header{ role: 'rowheader' }= _('Type') .table-mobile-header{ role: 'rowheader' }= _('Type')
.table-mobile-content .table-mobile-content
- if runner.instance_type? - 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? - 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 - 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? - 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? - 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-section.section-30
.table-mobile-header{ role: 'rowheader' }= s_('Runners|Runner') .table-mobile-header{ role: 'rowheader' }= s_('Runners|Runner')
......
...@@ -17,23 +17,23 @@ ...@@ -17,23 +17,23 @@
%span= _('Runners can be:') %span= _('Runners can be:')
%ul %ul
%li %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.') = _('Runs jobs from all unassigned projects.')
%li %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.') = _('Runs jobs from all unassigned projects in its group.')
%li %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.') = _('Runs jobs from assigned projects.')
%li %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.') = _('Cannot be assigned to other projects.')
%li %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.') = _('Not available to run jobs.')
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
.bs-callout .bs-callout
= render partial: 'ci/runner/how_to_setup_runner', = render partial: 'ci/runner/how_to_setup_runner',
locals: { registration_token: Gitlab::CurrentSettings.runners_registration_token, locals: { registration_token: Gitlab::CurrentSettings.runners_registration_token,
type: 'shared', type: s_('Runners|shared'),
reset_token_url: reset_registration_token_admin_application_settings_path, reset_token_url: reset_registration_token_admin_application_settings_path,
project_path: '', project_path: '',
group_path: '' } group_path: '' }
......
...@@ -7,16 +7,16 @@ ...@@ -7,16 +7,16 @@
.table-mobile-content .table-mobile-content
- if runner.group_type? - if runner.group_type?
%span.badge.badge-pill.gl-badge.sm.badge-success %span.badge.badge-pill.gl-badge.sm.badge-success
= _('group') = s_('Runners|group')
- else - else
%span.badge.badge-pill.gl-badge.sm.badge-info %span.badge.badge-pill.gl-badge.sm.badge-info
= _('specific') = s_('Runners|specific')
- if runner.locked? - if runner.locked?
%span.badge.badge-pill.gl-badge.sm.badge-warning %span.badge.badge-pill.gl-badge.sm.badge-warning
= _('locked') = s_('Runners|locked')
- unless runner.active? - unless runner.active?
%span.badge.badge-pill.gl-badge.sm.badge-danger %span.badge.badge-pill.gl-badge.sm.badge-danger
= _('paused') = s_('Runners|paused')
.table-section.section-30 .table-section.section-30
.table-mobile-header{ role: 'rowheader' }= s_('Runners|Runner') .table-mobile-header{ role: 'rowheader' }= s_('Runners|Runner')
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= _('These runners are specific to this project.') = _('These runners are specific to this project.')
%hr %hr
= render partial: 'ci/runner/how_to_setup_runner_automatically', = render partial: 'ci/runner/how_to_setup_runner_automatically',
locals: { type: 'specific', locals: { type: s_('Runners|specific'),
clusters_path: project_clusters_path(@project) } clusters_path: project_clusters_path(@project) }
- if params[:ci_runner_templates] - if params[:ci_runner_templates]
%hr %hr
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
%hr %hr
= render partial: 'ci/runner/how_to_setup_runner', = render partial: 'ci/runner/how_to_setup_runner',
locals: { registration_token: @project.runners_token, locals: { registration_token: @project.runners_token,
type: 'specific', type: s_('Runners|specific'),
reset_token_url: reset_registration_token_namespace_project_settings_ci_cd_path, reset_token_url: reset_registration_token_namespace_project_settings_ci_cd_path,
project_path: @project.path_with_namespace, project_path: @project.path_with_namespace,
group_path: '' } group_path: '' }
......
...@@ -28498,6 +28498,12 @@ msgstr "" ...@@ -28498,6 +28498,12 @@ msgstr ""
msgid "Runners|instance" msgid "Runners|instance"
msgstr "" msgstr ""
msgid "Runners|locked"
msgstr ""
msgid "Runners|paused"
msgstr ""
msgid "Runners|project" msgid "Runners|project"
msgstr "" msgstr ""
...@@ -39160,9 +39166,6 @@ msgstr "" ...@@ -39160,9 +39166,6 @@ msgstr ""
msgid "loading" msgid "loading"
msgstr "" msgstr ""
msgid "locked"
msgstr ""
msgid "locked by %{path_lock_user_name} %{created_at}" msgid "locked by %{path_lock_user_name} %{created_at}"
msgstr "" msgstr ""
...@@ -39613,9 +39616,6 @@ msgstr[1] "" ...@@ -39613,9 +39616,6 @@ msgstr[1] ""
msgid "password" msgid "password"
msgstr "" msgstr ""
msgid "paused"
msgstr ""
msgid "pending comment" msgid "pending comment"
msgstr "" msgstr ""
...@@ -39787,9 +39787,6 @@ msgstr "" ...@@ -39787,9 +39787,6 @@ msgstr ""
msgid "severity|Unknown" msgid "severity|Unknown"
msgstr "" msgstr ""
msgid "shared"
msgstr ""
msgid "should be an array of %{object_name} objects" msgid "should be an array of %{object_name} objects"
msgstr "" msgstr ""
...@@ -39820,9 +39817,6 @@ msgstr "" ...@@ -39820,9 +39817,6 @@ msgstr ""
msgid "source diff" msgid "source diff"
msgstr "" msgstr ""
msgid "specific"
msgstr ""
msgid "specified top is not part of the tree" msgid "specified top is not part of the tree"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment