diff options
author | Fatih Acet <acetfatih@gmail.com> | 2018-11-26 12:54:26 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-11-26 12:54:26 +0300 |
commit | 16a9080f9b235ab0115e7efc63e4eee6743b66ce (patch) | |
tree | f27a25e0fc14722f6078b75df5312aa1bdd71c79 /app/views | |
parent | aed88cd40d44ade30f5fe6dc8b572f3ace71f74f (diff) | |
parent | ae86a65dba661499a392125cce205025a013c59c (diff) |
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
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/runners/_index.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/runners/_shared_runners.html.haml | 10 | ||||
-rw-r--r-- | app/views/projects/runners/_specific_runners.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/runners/edit.html.haml | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/app/views/projects/runners/_index.html.haml b/app/views/projects/runners/_index.html.haml index 022687b831f..ae4fee1e14c 100644 --- a/app/views/projects/runners/_index.html.haml +++ b/app/views/projects/runners/_index.html.haml @@ -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' diff --git a/app/views/projects/runners/_shared_runners.html.haml b/app/views/projects/runners/_shared_runners.html.haml index 20a5ef039f8..dc3fb43526a 100644 --- a/app/views/projects/runners/_shared_runners.html.haml +++ b/app/views/projects/runners/_shared_runners.html.haml @@ -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 diff --git a/app/views/projects/runners/_specific_runners.html.haml b/app/views/projects/runners/_specific_runners.html.haml index ec503cd8bef..dc56a515d4c 100644 --- a/app/views/projects/runners/_specific_runners.html.haml +++ b/app/views/projects/runners/_specific_runners.html.haml @@ -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' } diff --git a/app/views/projects/runners/edit.html.haml b/app/views/projects/runners/edit.html.haml index d59f9c19862..b9d8e154913 100644 --- a/app/views/projects/runners/edit.html.haml +++ b/app/views/projects/runners/edit.html.haml @@ -1,4 +1,4 @@ -- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", 'Runners' +- page_title _('Edit'), "#{@runner.description} ##{@runner.id}", _('Runners') %h4 Runner ##{@runner.id} |