Merge branch 'gt-externalize-app-views-projects-ci' into 'master'

Externalize strings from `/app/views/projects/ci`

See merge request gitlab-org/gitlab-ce!24617

app/views/projects/ci/builds/_build.html.haml

@@ -25,7 +25,7 @@
           = job.tag? ? icon('tag') : sprite_icon('fork', css_class: 'sprite')
         = link_to job.ref, project_ref_path(job.project, job.ref), class: "ref-name"
       - else
-        .light none
+        .light= _('none')
       .icon-container.commit-icon
         = custom_icon("icon_commit")
 
@@ -33,10 +33,10 @@
       = link_to job.short_sha, project_commit_path(job.project, job.sha), class: "commit-sha"
 
     - if job.stuck?
-      = icon('warning', class: 'text-warning has-tooltip', title: 'Job is stuck. Check runners.')
+      = icon('warning', class: 'text-warning has-tooltip', title: _('Job is stuck. Check runners.'))
 
     - if retried
-      = icon('refresh', class: 'text-warning has-tooltip', title: 'Job was retried')
+      = icon('refresh', class: 'text-warning has-tooltip', title: _('Job was retried'))
 
     .label-container
       - if job.tags.any?
@@ -44,13 +44,13 @@
           %span.badge.badge-primary
             = tag
       - if job.try(:trigger_request)
-        %span.badge.badge-info triggered
+        %span.badge.badge-info= _('triggered')
       - if job.try(:allow_failure)
-        %span.badge.badge-danger allowed to fail
+        %span.badge.badge-danger= _('allowed to fail')
       - if job.schedulable?
         %span.badge.badge-info= s_('DelayedJobs|delayed')
       - elsif job.action?
-        %span.badge.badge-info manual
+        %span.badge.badge-info= _('manual')
 
   - if pipeline_link
     %td
@@ -70,7 +70,7 @@
       - if job.try(:runner)
         = runner_link(job.runner)
       - else
-        .light none
+        .light= _('none')
 
   - if stage
     %td
@@ -97,11 +97,11 @@
   %td
     .float-right
       - if can?(current_user, :read_build, job) && job.artifacts?
-        = link_to download_project_job_artifacts_path(job.project, job), rel: 'nofollow', download: '', title: 'Download artifacts', class: 'btn btn-build' do
+        = link_to download_project_job_artifacts_path(job.project, job), rel: 'nofollow', download: '', title: _('Download artifacts'), class: 'btn btn-build' do
           = sprite_icon('download')
       - if can?(current_user, :update_build, job)
         - if job.active?
-          = link_to cancel_project_job_path(job.project, job, continue: { to: request.fullpath }), method: :post, title: 'Cancel', class: 'btn btn-build' do
+          = link_to cancel_project_job_path(job.project, job, continue: { to: request.fullpath }), method: :post, title: _('Cancel'), class: 'btn btn-build' do
             = icon('remove', class: 'cred')
         - elsif job.scheduled?
           .btn-group
@@ -123,8 +123,8 @@
               = sprite_icon('time-out')
         - elsif allow_retry
           - if job.playable? && !admin && can?(current_user, :update_build, job)
-            = link_to play_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: 'Play', class: 'btn btn-build' do
+            = link_to play_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: _('Play'), class: 'btn btn-build' do
               = custom_icon('icon_play')
           - elsif job.retryable?
-            = link_to retry_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-build' do
+            = link_to retry_project_job_path(job.project, job, return_to: request.original_url), method: :post, title: _('Retry'), class: 'btn btn-build' do
               = icon('repeat')

app/views/projects/ci/lints/_create.html.haml

 - if @status
   %p
-    %b Status:
-    syntax is correct
+    %b= _("Status:")
+    = _("syntax is correct")
     %i.fa.fa-ok.correct-syntax
 
   .table-holder
     %table.table.table-bordered
       %thead
         %tr
-          %th Parameter
-          %th Value
+          %th= _("Parameter")
+          %th= _("Value")
       %tbody
         - @stages.each do |stage|
           - @builds.select { |build| build[:stage] == stage }.each do |build|
@@ -22,27 +22,27 @@
                 %pre= job[:after_script].to_a.join('\n')
 
                 %br
-                %b Tag list:
+                %b= _("Tag list:")
                 = build[:tag_list].to_a.join(", ")
                 %br
-                %b Only policy:
+                %b= _("Only policy:")
                 = job[:only].to_a.join(", ")
                 %br
-                %b Except policy:
+                %b= _("Except policy:")
                 = job[:except].to_a.join(", ")
                 %br
-                %b Environment:
+                %b= _("Environment:")
                 = build[:environment]
                 %br
-                %b When:
+                %b= _("When:")
                 = build[:when]
                 - if build[:allow_failure]
-                  %b Allowed to fail
+                  %b= _("Allowed to fail")
 
 - else
   %p
-    %b Status:
-    syntax is incorrect
+    %b= _("Status:")
+    = _("syntax is incorrect")
     %i.fa.fa-remove.incorrect-syntax
-  %b Error:
+  %b= _("Error:")
   = @error

app/views/projects/ci/lints/show.html.haml

-- page_title "CI Lint"
-- page_description "Validate your GitLab CI configuration file"
+- page_title _("CI Lint")
+- page_description _("Validate your GitLab CI configuration file")
 - content_for :library_javascripts do
   = page_specific_javascript_tag('lib/ace.js')
 
-%h2.pt-3.pb-3 Check your .gitlab-ci.yml
+%h2.pt-3.pb-3= _("Check your .gitlab-ci.yml")
 
 .project-ci-linter
   = form_tag project_ci_lint_path(@project), method: :post do
@@ -11,14 +11,14 @@
       .col-sm-12
         .file-holder
           .js-file-title.file-title.clearfix
-            Content of .gitlab-ci.yml
+            = _("Contents of .gitlab-ci.yml")
           #ci-editor.ci-editor= @content
         = text_area_tag(:content, @content, class: 'hidden form-control span1', rows: 7, require: true)
       .col-sm-12
         .float-left.prepend-top-10
-          = submit_tag('Validate', class: 'btn btn-success submit-yml')
+          = submit_tag(_('Validate'), class: 'btn btn-success submit-yml')
         .float-right.prepend-top-10
-          = button_tag('Clear', type: 'button', class: 'btn btn-default clear-yml')
+          = button_tag(_('Clear'), type: 'button', class: 'btn btn-default clear-yml')
 
   .row.prepend-top-20
     .col-sm-12

changelogs/unreleased/gt-externalize-app-views-projects-ci.yml

+---
+title: Externalize strings from `/app/views/projects/ci`
+merge_request: 24617
+author: George Tsiolis
+type: other

locale/gitlab.pot

@@ -528,6 +528,9 @@ msgstr ""
 msgid "Allow users to request access if visibility is public or internal."
 msgstr ""
 
+msgid "Allowed to fail"
+msgstr ""
+
 msgid "Allows you to add and manage Kubernetes clusters."
 msgstr ""
 
@@ -1179,6 +1182,9 @@ msgstr ""
 msgid "CI / CD Settings"
 msgstr ""
 
+msgid "CI Lint"
+msgstr ""
+
 msgid "CI/CD"
 msgstr ""
 
@@ -1287,6 +1293,9 @@ msgstr ""
 msgid "Check the %{docs_link_start}documentation%{docs_link_end}."
 msgstr ""
 
+msgid "Check your .gitlab-ci.yml"
+msgstr ""
+
 msgid "Checking %{text} availability…"
 msgstr ""
 
@@ -1428,6 +1437,9 @@ msgstr ""
 msgid "CiVariable|Validation failed"
 msgstr ""
 
+msgid "Clear"
+msgstr ""
+
 msgid "Clear search"
 msgstr ""
 
@@ -2120,6 +2132,9 @@ msgstr ""
 msgid "ContainerRegistry|You can also use a %{deploy_token} for read-only access to the registry images."
 msgstr ""
 
+msgid "Contents of .gitlab-ci.yml"
+msgstr ""
+
 msgid "Continue"
 msgstr ""
 
@@ -2677,6 +2692,9 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
+msgid "Download artifacts"
+msgstr ""
+
 msgid "Download asset"
 msgstr ""
 
@@ -2839,6 +2857,9 @@ msgstr ""
 msgid "Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default"
 msgstr ""
 
+msgid "Environment:"
+msgstr ""
+
 msgid "Environments"
 msgstr ""
 
@@ -2992,6 +3013,9 @@ msgstr ""
 msgid "Error while loading the merge request. Please try again."
 msgstr ""
 
+msgid "Error:"
+msgstr ""
+
 msgid "Errors"
 msgstr ""
 
@@ -3037,6 +3061,9 @@ msgstr ""
 msgid "Everyone can contribute"
 msgstr ""
 
+msgid "Except policy:"
+msgstr ""
+
 msgid "Existing Git repository"
 msgstr ""
 
@@ -3888,6 +3915,12 @@ msgstr ""
 msgid "Job has been erased"
 msgstr ""
 
+msgid "Job is stuck. Check runners."
+msgstr ""
+
+msgid "Job was retried"
+msgstr ""
+
 msgid "Jobs"
 msgstr ""
 
@@ -4820,6 +4853,9 @@ msgstr ""
 msgid "Only mirror protected branches"
 msgstr ""
 
+msgid "Only policy:"
+msgstr ""
+
 msgid "Only project members can comment."
 msgstr ""
 
@@ -4907,6 +4943,9 @@ msgstr ""
 msgid "Pagination|« First"
 msgstr ""
 
+msgid "Parameter"
+msgstr ""
+
 msgid "Part of merge request changes"
 msgstr ""
 
@@ -6665,6 +6704,9 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+msgid "Status:"
+msgstr ""
+
 msgid "Stop environment"
 msgstr ""
 
@@ -6740,6 +6782,9 @@ msgstr ""
 msgid "Tag"
 msgstr ""
 
+msgid "Tag list:"
+msgstr ""
+
 msgid "Tags"
 msgstr ""
 
@@ -7698,6 +7743,15 @@ msgstr ""
 msgid "Users requesting access to"
 msgstr ""
 
+msgid "Validate"
+msgstr ""
+
+msgid "Validate your GitLab CI configuration file"
+msgstr ""
+
+msgid "Value"
+msgstr ""
+
 msgid "Various container registry settings."
 msgstr ""
 
@@ -7812,6 +7866,9 @@ msgstr ""
 msgid "When enabled, users cannot use GitLab until the terms have been accepted."
 msgstr ""
 
+msgid "When:"
+msgstr ""
+
 msgid "Who can see this group?"
 msgstr ""
 
@@ -8178,6 +8235,9 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
+msgid "allowed to fail"
+msgstr ""
+
 msgid "among other things"
 msgstr ""
 
@@ -8296,6 +8356,9 @@ msgstr ""
 msgid "latest version"
 msgstr ""
 
+msgid "manual"
+msgstr ""
+
 msgid "merge request"
 msgid_plural "merge requests"
 msgstr[0] ""
@@ -8502,6 +8565,9 @@ msgstr ""
 msgid "new merge request"
 msgstr ""
 
+msgid "none"
+msgstr ""
+
 msgid "notification emails"
 msgstr ""
 
@@ -8574,9 +8640,18 @@ msgstr ""
 msgid "stuck"
 msgstr ""
 
+msgid "syntax is correct"
+msgstr ""
+
+msgid "syntax is incorrect"
+msgstr ""
+
 msgid "this document"
 msgstr ""
 
+msgid "triggered"
+msgstr ""
+
 msgid "updated"
 msgstr ""