Merge branch 'gt-externalize-app-views-project-runners' into 'master'

Externalize strings from `/app/views/project/runners`

See merge request gitlab-org/gitlab-ce!23208
This commit is contained in:
Fatih Acet 2018-11-26 09:54:26 +00:00
commit 16a9080f9b
6 changed files with 34 additions and 10 deletions

View File

@ -2,7 +2,7 @@
%hr
%p.lead To start serving your jobs you can either add specific Runners to your project or use shared Runners
%p.lead= _('To start serving your jobs you can either add specific Runners to your project or use shared Runners')
.row
.col-sm-6
= render 'projects/runners/specific_runners'

View File

@ -5,21 +5,19 @@
- if Gitlab::CurrentSettings.shared_runners_text.present?
= markdown_field(Gitlab::CurrentSettings.current_application_settings, :shared_runners_text)
- else
GitLab Shared Runners execute code of different projects on the same Runner
unless you configure GitLab Runner Autoscale with MaxBuilds 1 (which it is
on GitLab.com).
= _('GitLab Shared Runners execute code of different projects on the same Runner unless you configure GitLab Runner Autoscale with MaxBuilds 1 (which it is on GitLab.com).')
%hr
- if @project.shared_runners_enabled?
= link_to toggle_shared_runners_project_runners_path(@project), class: 'btn btn-close', method: :post do
Disable shared Runners
= _('Disable shared Runners')
- else
= link_to toggle_shared_runners_project_runners_path(@project), class: 'btn btn-success', method: :post do
Enable shared Runners
= _('Enable shared Runners')
  for this project
- if @shared_runners_count.zero?
= _('This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area.')
- else
%h4.underlined-title Available shared Runners : #{@shared_runners_count}
%h4.underlined-title #{_('Available shared Runners :')} #{@shared_runners_count}
%ul.bordered-list.available-shared-runners
= render partial: 'projects/runners/runner', collection: @shared_runners, as: :runner

View File

@ -31,12 +31,12 @@
reset_token_url: reset_registration_token_namespace_project_settings_ci_cd_path }
- if @project_runners.any?
%h4.underlined-title Runners activated for this project
%h4.underlined-title= _('Runners activated for this project')
%ul.bordered-list.activated-specific-runners
= render partial: 'projects/runners/runner', collection: @project_runners, as: :runner
- if @assignable_runners.any?
%h4.underlined-title Available specific runners
%h4.underlined-title= _('Available specific runners')
%ul.bordered-list.available-specific-runners
= render partial: 'projects/runners/runner', collection: @assignable_runners, as: :runner
= paginate @assignable_runners, theme: "gitlab", :params => { :anchor => '#js-runners-settings' }

View File

@ -1,4 +1,4 @@
- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", 'Runners'
- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", _('Runners')
%h4 Runner ##{@runner.id}

View File

@ -0,0 +1,5 @@
---
title: Externalize strings from `/app/views/project/runners`
merge_request: 23208
author: Tao Wang
type: other

View File

@ -810,6 +810,12 @@ msgstr ""
msgid "Available group Runners : %{runners}."
msgstr ""
msgid "Available shared Runners :"
msgstr ""
msgid "Available specific runners"
msgstr ""
msgid "Avatar will be removed. Are you sure?"
msgstr ""
@ -2459,6 +2465,9 @@ msgstr ""
msgid "Disable group Runners"
msgstr ""
msgid "Disable shared Runners"
msgstr ""
msgid "Discard"
msgstr ""
@ -2600,6 +2609,9 @@ msgstr ""
msgid "Enable reCAPTCHA or Akismet and set IP limits."
msgstr ""
msgid "Enable shared Runners"
msgstr ""
msgid "Enable the Performance Bar for a given group."
msgstr ""
@ -3059,6 +3071,9 @@ msgstr ""
msgid "GitLab Import"
msgstr ""
msgid "GitLab Shared Runners execute code of different projects on the same Runner unless you configure GitLab Runner Autoscale with MaxBuilds 1 (which it is on GitLab.com)."
msgstr ""
msgid "GitLab User"
msgstr ""
@ -5479,6 +5494,9 @@ msgstr ""
msgid "Runners API"
msgstr ""
msgid "Runners activated for this project"
msgstr ""
msgid "Runners can be placed on separate users, servers, and even on your local machine."
msgstr ""
@ -6726,6 +6744,9 @@ msgstr ""
msgid "To start serving your jobs you can add Runners to your group"
msgstr ""
msgid "To start serving your jobs you can either add specific Runners to your project or use shared Runners"
msgstr ""
msgid "To this GitLab instance"
msgstr ""