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

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

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

app/views/projects/pipelines/_with_tabs.html.haml

@@ -2,15 +2,15 @@
   %ul.pipelines-tabs.nav-links.no-top.no-bottom.mobile-separator.nav.nav-tabs
     %li.js-pipeline-tab-link
       = link_to project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-pipeline', action: 'pipelines', toggle: 'tab' }, class: 'pipeline-tab' do
-        = _("Pipeline")
+        = _('Pipeline')
     %li.js-builds-tab-link
       = link_to builds_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-builds', action: 'builds', toggle: 'tab' }, class: 'builds-tab' do
-        = _("Jobs")
+        = _('Jobs')
         %span.badge.badge-pill.js-builds-counter= pipeline.total_size
     - if @pipeline.failed_builds.present?
       %li.js-failures-tab-link
         = link_to failures_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-failures', action: 'failures', toggle: 'tab' }, class: 'failures-tab' do
-          = _("Failed Jobs")
+          = _('Failed Jobs')
           %span.badge.badge-pill.js-failures-counter= @pipeline.failed_builds.count
     = render_if_exists "projects/pipelines/tabs_holder", pipeline: @pipeline, project: @project
 
@@ -24,41 +24,41 @@
         %table.table.ci-table.pipeline
           %thead
             %tr
-              %th Status
-              %th Job ID
-              %th Name
+              %th= _('Status')
+              %th= _('Job ID')
+              %th= _('Name')
               %th
-              %th Coverage
+              %th= _('Coverage')
               %th
           = render partial: "projects/stage/stage", collection: pipeline.legacy_stages, as: :stage
 
     - elsif pipeline.project.builds_enabled? && !pipeline.ci_yaml_file
       .bs-callout.bs-callout-warning
-        \.gitlab-ci.yml not found in this commit
+        = _("%{gitlab_ci_yml} not found in this commit") % { gitlab_ci_yml: ".gitlab-ci.yml" }
 
   - if @pipeline.failed_builds.present?
     #js-tab-failures.build-failures.tab-pane.build-page
       %table.table.responsive-table.ci-table.responsive-table-sm-rounded
         %thead
           %th.table-th-transparent
-          %th.table-th-transparent= _("Name")
-          %th.table-th-transparent= _("Stage")
-          %th.table-th-transparent= _("Failure")
+          %th.table-th-transparent= _('Name')
+          %th.table-th-transparent= _('Stage')
+          %th.table-th-transparent= _('Failure')
 
         %tbody
           - @pipeline.failed_builds.each_with_index do |build, index|
             - job = build.present(current_user: current_user)
             %tr.build-state.responsive-table-border-start
-              %td.responsive-table-cell.ci-status-icon-failed{ data: { column: "Status"} }
+              %td.responsive-table-cell.ci-status-icon-failed{ data: { column: _('Status')} }
                 .d-none.d-md-block.build-icon
                   = custom_icon("icon_status_#{build.status}")
                 .d-md-none.build-badge
                   = render "ci/status/badge", link: false, status: job.detailed_status(current_user)
-              %td.responsive-table-cell.build-name{ data: { column: _("Name")} }
+              %td.responsive-table-cell.build-name{ data: { column: _('Name')} }
                 = link_to build.name, pipeline_job_url(pipeline, build)
-              %td.responsive-table-cell.build-stage{ data: { column: _("Stage")} }
+              %td.responsive-table-cell.build-stage{ data: { column: _('Stage')} }
                 = build.stage.titleize
-              %td.responsive-table-cell.build-failure{ data: { column: _("Failure")} }
+              %td.responsive-table-cell.build-failure{ data: { column: _('Failure')} }
                 = build.present.callout_failure_message
               %td.responsive-table-cell.build-actions
                 - if can?(current_user, :update_build, job)

app/views/projects/pipelines/charts.html.haml

 - @no_container = true
-- page_title _("CI / CD Charts")
+- page_title _('CI / CD Charts')
 
 %div{ class: container_class }
   .sub-header-block

app/views/projects/pipelines/index.html.haml

 - @no_container = true
-- page_title "Pipelines"
+- page_title _('Pipelines')
 
 %div{ 'class' => container_class }
   #pipelines-list-vue{ data: { endpoint: project_pipelines_path(@project, format: :json),

app/views/projects/pipelines/new.html.haml

-- breadcrumb_title "Pipelines"
-- page_title s_("Pipeline|Run Pipeline")
+- breadcrumb_title _('Pipelines')
+- page_title s_('Pipeline|Run Pipeline')
 - settings_link = link_to _('CI/CD settings'), project_settings_ci_cd_path(@project)
 
 %h3.page-title
-  = s_("Pipeline|Run Pipeline")
+  = s_('Pipeline|Run Pipeline')
 %hr
 
 = form_for @pipeline, as: :pipeline, url: project_pipelines_path(@project), html: { id: "new-pipeline-form", class: "js-new-pipeline-form js-requires-input" } do |f|
@@ -29,7 +29,7 @@
 
   .form-actions
     = f.submit s_('Pipeline|Create pipeline'), class: 'btn btn-success js-variables-save-button', tabindex: 3
-    = link_to 'Cancel', project_pipelines_path(@project), class: 'btn btn-default float-right'
+    = link_to _('Cancel'), project_pipelines_path(@project), class: 'btn btn-default float-right'
 
 -# haml-lint:disable InlineJavaScript
 %script#availableRefs{ type: "application/json" }= @project.repository.ref_names.to_json.html_safe

app/views/projects/pipelines/show.html.haml

 - @no_container = true
-- add_to_breadcrumbs "Pipelines", project_pipelines_path(@project)
+- add_to_breadcrumbs _('Pipelines'), project_pipelines_path(@project)
 - breadcrumb_title "##{@pipeline.id}"
-- page_title "Pipeline"
+- page_title _('Pipeline')
 
 .js-pipeline-container{ class: container_class, data: { controller_action: "#{controller.action_name}" } }
   #js-pipeline-header-vue.pipeline-header-container
@@ -11,11 +11,13 @@
 
   - if @pipeline.builds.empty? && @pipeline.yaml_errors.present?
     .bs-callout.bs-callout-danger
-      %h4 Found errors in your .gitlab-ci.yml:
+      %h4= _('Found errors in your %{gitlab_ci_yml}:') % { gitlab_ci_yml: '.gitlab-ci.yml' }
       %ul
         - @pipeline.yaml_errors.split(",").each do |error|
           %li= error
-      You can test your .gitlab-ci.yml in #{link_to "CI Lint", project_ci_lint_path(@project)}.
+      - lint_link_url = project_ci_lint_path(@project)
+      - lint_link_start = '<a href="%{url}">'.html_safe % { url: lint_link_url }
+      = s_('You can also test your %{gitlab_ci_yml} in %{lint_link_start}CI Lint%{lint_link_end}').html_safe % { gitlab_ci_yml: '.gitlab-ci.yml', lint_link_start: lint_link_start, lint_link_end: '</a>'.html_safe }
   - else
     = render "projects/pipelines/with_tabs", pipeline: @pipeline
 

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

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

locale/gitlab.pot

@@ -111,6 +111,9 @@ msgstr ""
 msgid "%{firstLabel} +%{labelCount} more"
 msgstr ""
 
+msgid "%{gitlab_ci_yml} not found in this commit"
+msgstr ""
+
 msgid "%{group_docs_link_start}Groups%{group_docs_link_end} allow you to manage and collaborate across multiple projects. Members of a group have access to all of its projects."
 msgstr ""
 
@@ -2411,6 +2414,9 @@ msgstr ""
 msgid "Could not retrieve the pipeline status. For troubleshooting steps, read the %{linkStart}documentation.%{linkEnd}"
 msgstr ""
 
+msgid "Coverage"
+msgstr ""
+
 msgid "Create"
 msgstr ""
 
@@ -3648,6 +3654,9 @@ msgstr ""
 msgid "Format"
 msgstr ""
 
+msgid "Found errors in your %{gitlab_ci_yml}:"
+msgstr ""
+
 msgid "Found errors in your .gitlab-ci.yml:"
 msgstr ""
 
@@ -4376,6 +4385,9 @@ msgstr ""
 msgid "Job"
 msgstr ""
 
+msgid "Job ID"
+msgstr ""
+
 msgid "Job has been erased"
 msgstr ""
 
@@ -8852,6 +8864,9 @@ msgstr ""
 msgid "You can also star a label to make it a priority label."
 msgstr ""
 
+msgid "You can also test your %{gitlab_ci_yml} in %{lint_link_start}CI Lint%{lint_link_end}"
+msgstr ""
+
 msgid "You can also upload existing files from your computer using the instructions below."
 msgstr ""