Commit 16a9080f authored by Fatih Acet's avatar Fatih Acet

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
parents aed88cd4 ae86a65d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%hr %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 .row
.col-sm-6 .col-sm-6
= render 'projects/runners/specific_runners' = render 'projects/runners/specific_runners'
......
...@@ -5,21 +5,19 @@ ...@@ -5,21 +5,19 @@
- if Gitlab::CurrentSettings.shared_runners_text.present? - if Gitlab::CurrentSettings.shared_runners_text.present?
= markdown_field(Gitlab::CurrentSettings.current_application_settings, :shared_runners_text) = markdown_field(Gitlab::CurrentSettings.current_application_settings, :shared_runners_text)
- else - else
GitLab Shared Runners execute code of different projects on the same Runner = _('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).')
unless you configure GitLab Runner Autoscale with MaxBuilds 1 (which it is
on GitLab.com).
%hr %hr
- if @project.shared_runners_enabled? - if @project.shared_runners_enabled?
= link_to toggle_shared_runners_project_runners_path(@project), class: 'btn btn-close', method: :post do = link_to toggle_shared_runners_project_runners_path(@project), class: 'btn btn-close', method: :post do
Disable shared Runners = _('Disable shared Runners')
- else - else
= link_to toggle_shared_runners_project_runners_path(@project), class: 'btn btn-success', method: :post do = 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   for this project
- if @shared_runners_count.zero? - 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.') = _('This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area.')
- else - 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 %ul.bordered-list.available-shared-runners
= render partial: 'projects/runners/runner', collection: @shared_runners, as: :runner = render partial: 'projects/runners/runner', collection: @shared_runners, as: :runner
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
reset_token_url: reset_registration_token_namespace_project_settings_ci_cd_path } reset_token_url: reset_registration_token_namespace_project_settings_ci_cd_path }
- if @project_runners.any? - 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 %ul.bordered-list.activated-specific-runners
= render partial: 'projects/runners/runner', collection: @project_runners, as: :runner = render partial: 'projects/runners/runner', collection: @project_runners, as: :runner
- if @assignable_runners.any? - if @assignable_runners.any?
%h4.underlined-title Available specific runners %h4.underlined-title= _('Available specific runners')
%ul.bordered-list.available-specific-runners %ul.bordered-list.available-specific-runners
= render partial: 'projects/runners/runner', collection: @assignable_runners, as: :runner = render partial: 'projects/runners/runner', collection: @assignable_runners, as: :runner
= paginate @assignable_runners, theme: "gitlab", :params => { :anchor => '#js-runners-settings' } = paginate @assignable_runners, theme: "gitlab", :params => { :anchor => '#js-runners-settings' }
- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", 'Runners' - page_title _('Edit'), "#{@runner.description} ##{@runner.id}", _('Runners')
%h4 Runner ##{@runner.id} %h4 Runner ##{@runner.id}
......
---
title: Externalize strings from `/app/views/project/runners`
merge_request: 23208
author: Tao Wang
type: other
...@@ -810,6 +810,12 @@ msgstr "" ...@@ -810,6 +810,12 @@ msgstr ""
msgid "Available group Runners : %{runners}." msgid "Available group Runners : %{runners}."
msgstr "" msgstr ""
msgid "Available shared Runners :"
msgstr ""
msgid "Available specific runners"
msgstr ""
msgid "Avatar will be removed. Are you sure?" msgid "Avatar will be removed. Are you sure?"
msgstr "" msgstr ""
...@@ -2459,6 +2465,9 @@ msgstr "" ...@@ -2459,6 +2465,9 @@ msgstr ""
msgid "Disable group Runners" msgid "Disable group Runners"
msgstr "" msgstr ""
msgid "Disable shared Runners"
msgstr ""
msgid "Discard" msgid "Discard"
msgstr "" msgstr ""
...@@ -2600,6 +2609,9 @@ msgstr "" ...@@ -2600,6 +2609,9 @@ msgstr ""
msgid "Enable reCAPTCHA or Akismet and set IP limits." msgid "Enable reCAPTCHA or Akismet and set IP limits."
msgstr "" msgstr ""
msgid "Enable shared Runners"
msgstr ""
msgid "Enable the Performance Bar for a given group." msgid "Enable the Performance Bar for a given group."
msgstr "" msgstr ""
...@@ -3059,6 +3071,9 @@ msgstr "" ...@@ -3059,6 +3071,9 @@ msgstr ""
msgid "GitLab Import" msgid "GitLab Import"
msgstr "" 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" msgid "GitLab User"
msgstr "" msgstr ""
...@@ -5479,6 +5494,9 @@ msgstr "" ...@@ -5479,6 +5494,9 @@ msgstr ""
msgid "Runners API" msgid "Runners API"
msgstr "" msgstr ""
msgid "Runners activated for this project"
msgstr ""
msgid "Runners can be placed on separate users, servers, and even on your local machine." msgid "Runners can be placed on separate users, servers, and even on your local machine."
msgstr "" msgstr ""
...@@ -6726,6 +6744,9 @@ msgstr "" ...@@ -6726,6 +6744,9 @@ msgstr ""
msgid "To start serving your jobs you can add Runners to your group" msgid "To start serving your jobs you can add Runners to your group"
msgstr "" 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" msgid "To this GitLab instance"
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