summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bennett <lbennett@gitlab.com>2019-01-28 04:20:23 +0000
committerLuke Bennett <lbennett@gitlab.com>2019-01-28 05:09:48 +0000
commitd46537b0c6e1d91add4b96d6cde69ef2904eeedf (patch)
treef92a57383d739d3218da257a5cb7f3c32168ad10
parentc243b154abf5c29ba35fd2fab2ca3bc010fdc324 (diff)
downloadgitlab-ce-runners-ext.tar.gz
Externalize admin runners settings stringsrunners-ext
-rw-r--r--app/views/admin/runners/index.html.haml10
-rw-r--r--app/views/admin/runners/show.html.haml38
-rw-r--r--changelogs/unreleased/runners-ext.yml5
-rw-r--r--locale/gitlab.pot45
4 files changed, 74 insertions, 24 deletions
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index e9e4e0847d3..09a9fd577d0 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -15,23 +15,23 @@
%span= _('Each Runner can be in one of the following states:')
%ul
%li
- %span.badge.badge-success shared
+ %span.badge.badge-success= _('shared')
\-
= _('Runner runs jobs from all unassigned projects')
%li
- %span.badge.badge-success group
+ %span.badge.badge-success= _('group')
\-
= _('Runner runs jobs from all unassigned projects in its group')
%li
- %span.badge.badge-info specific
+ %span.badge.badge-info= _('specific')
\-
= _('Runner runs jobs from assigned projects')
%li
- %span.badge.badge-warning locked
+ %span.badge.badge-warning= _('locked')
\-
= _('Runner cannot be assigned to other projects')
%li
- %span.badge.badge-danger paused
+ %span.badge.badge-danger= _('paused')
\-
= _('Runner will not receive any new jobs')
diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml
index 62be38e9dd2..0e7db54280f 100644
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -1,30 +1,30 @@
= content_for :title do
%h3.project-title
- Runner ##{@runner.id}
+ = _("Runner #%{runner_id}") % { runner_id: @runner.id }
.float-right
- if @runner.instance_type?
%span.runner-state.runner-state-shared
- Shared
+ = _('Shared')
- else
%span.runner-state.runner-state-specific
- Specific
+ = _('Specific')
- add_to_breadcrumbs _("Runners"), admin_runners_path
- breadcrumb_title "##{@runner.id}"
- if @runner.instance_type?
.bs-callout.bs-callout-success
- %h4 This Runner will process jobs from ALL UNASSIGNED projects
+ %h4= _('This Runner will process jobs from ALL UNASSIGNED projects')
%p
If you want Runners to build only specific projects, enable them in the table below.
Keep in mind that this is a one way transition.
- elsif @runner.group_type?
.bs-callout.bs-callout-success
- %h4 This runner will process jobs from all projects in its group and subgroups
+ %h4= _('This runner will process jobs from all projects in its group and subgroups')
- else
.bs-callout.bs-callout-info
- %h4 This Runner will process jobs only from ASSIGNED projects
- %p You can't make this a shared Runner.
+ %h4= _('This Runner will process jobs only from ASSIGNED projects')
+ %p= _("You can't make this a shared Runner.")
%hr
.append-bottom-20
@@ -32,12 +32,12 @@
.row
.col-md-6
- %h4 Restrict projects for this Runner
+ %h4= _('Restrict projects for this Runner')
- if @runner.projects.any?
%table.table.assigned-projects
%thead
%tr
- %th Assigned projects
+ %th= _('Assigned projects')
%th
- @runner.runner_projects.each do |runner_project|
- project = runner_project.project
@@ -48,12 +48,12 @@
= project.full_name
%td
.float-right
- = link_to 'Disable', [:admin, project.namespace.becomes(Namespace), project, runner_project], method: :delete, class: 'btn btn-danger btn-sm'
+ = link_to _('Disable'), [:admin, project.namespace.becomes(Namespace), project, runner_project], method: :delete, class: 'btn btn-danger btn-sm'
%table.table.unassigned-projects
%thead
%tr
- %th Project
+ %th= _('Project')
%th
%tr
@@ -61,7 +61,7 @@
= form_tag admin_runner_path(@runner), id: 'runner-projects-search', class: 'form-inline', method: :get do
.form-group
= search_field_tag :search, params[:search], class: 'form-control', spellcheck: false
- = submit_tag 'Search', class: 'btn'
+ = submit_tag _('Search'), class: 'btn'
%td
- @projects.each do |project|
@@ -72,19 +72,19 @@
.float-right
= form_for [:admin, project.namespace.becomes(Namespace), project, project.runner_projects.new] do |f|
= f.hidden_field :runner_id, value: @runner.id
- = f.submit 'Enable', class: 'btn btn-sm'
+ = f.submit _('Enable'), class: 'btn btn-sm'
= paginate @projects, theme: "gitlab"
.col-md-6
- %h4 Recent jobs served by this Runner
+ %h4= _('Recent jobs served by this Runner')
%table.table.ci-table.runner-builds
%thead
%tr
- %th Job
- %th Status
- %th Project
- %th Commit
- %th Finished at
+ %th= _('Job')
+ %th= _('Status')
+ %th= _('Project')
+ %th= _('Commit')
+ %th= _('Finished at')
- @builds.each do |build|
- project = build.project
diff --git a/changelogs/unreleased/runners-ext.yml b/changelogs/unreleased/runners-ext.yml
new file mode 100644
index 00000000000..6a1419b9964
--- /dev/null
+++ b/changelogs/unreleased/runners-ext.yml
@@ -0,0 +1,5 @@
+---
+title: Externalize admin runners settings strings
+merge_request:
+author:
+type: other
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a72e921dcce..50f155f29f4 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -768,6 +768,9 @@ msgstr ""
msgid "Assigned Merge Requests"
msgstr ""
+msgid "Assigned projects"
+msgstr ""
+
msgid "Assigned to :name"
msgstr ""
@@ -3205,6 +3208,9 @@ msgstr ""
msgid "Finished"
msgstr ""
+msgid "Finished at"
+msgstr ""
+
msgid "FirstPushedBy|First"
msgstr ""
@@ -5720,6 +5726,9 @@ msgstr ""
msgid "Real-time features"
msgstr ""
+msgid "Recent jobs served by this Runner"
+msgstr ""
+
msgid "Recent searches"
msgstr ""
@@ -5929,6 +5938,9 @@ msgstr ""
msgid "Response metrics (NGINX)"
msgstr ""
+msgid "Restrict projects for this Runner"
+msgstr ""
+
msgid "Resume"
msgstr ""
@@ -5970,6 +5982,9 @@ msgstr ""
msgid "Run untagged jobs"
msgstr ""
+msgid "Runner #%{runner_id}"
+msgstr ""
+
msgid "Runner cannot be assigned to other projects"
msgstr ""
@@ -6336,6 +6351,9 @@ msgstr ""
msgid "Share"
msgstr ""
+msgid "Shared"
+msgstr ""
+
msgid "Shared Runners"
msgstr ""
@@ -6572,6 +6590,9 @@ msgstr ""
msgid "Spam and Anti-bot Protection"
msgstr ""
+msgid "Specific"
+msgstr ""
+
msgid "Specific Runners"
msgstr ""
@@ -7004,6 +7025,12 @@ msgstr ""
msgid "This GitLab instance does not provide any shared Runners yet. Instance administrators can register shared Runners in the admin area."
msgstr ""
+msgid "This Runner will process jobs from ALL UNASSIGNED projects"
+msgstr ""
+
+msgid "This Runner will process jobs only from ASSIGNED projects"
+msgstr ""
+
msgid "This application was created by %{link_to_owner}."
msgstr ""
@@ -7148,6 +7175,9 @@ msgstr ""
msgid "This runner will only run on pipelines triggered on protected branches"
msgstr ""
+msgid "This runner will process jobs from all projects in its group and subgroups"
+msgstr ""
+
msgid "This setting can be overridden in each project."
msgstr ""
@@ -8025,6 +8055,9 @@ msgstr ""
msgid "You can test your .gitlab-ci.yml in %{linkStart}CI Lint%{linkEnd}."
msgstr ""
+msgid "You can't make this a shared Runner."
+msgstr ""
+
msgid "You cannot write to this read-only GitLab instance."
msgstr ""
@@ -8290,6 +8323,9 @@ msgstr ""
msgid "latest version"
msgstr ""
+msgid "locked"
+msgstr ""
+
msgid "merge request"
msgid_plural "merge requests"
msgstr[0] ""
@@ -8515,6 +8551,9 @@ msgstr[1] ""
msgid "password"
msgstr ""
+msgid "paused"
+msgstr ""
+
msgid "personal access token"
msgstr ""
@@ -8544,6 +8583,9 @@ msgid_plural "replies"
msgstr[0] ""
msgstr[1] ""
+msgid "shared"
+msgstr ""
+
msgid "should be higher than %{access} inherited membership from group %{group_name}"
msgstr ""
@@ -8559,6 +8601,9 @@ msgstr ""
msgid "source diff"
msgstr ""
+msgid "specific"
+msgstr ""
+
msgid "spendCommand|%{slash_command} will update the sum of the time spent."
msgstr ""