From ff9cc3c311c3adc640d47f083323d07e2b5854df Mon Sep 17 00:00:00 2001 From: Tao Wang Date: Thu, 14 Jun 2018 19:40:38 +1000 Subject: [PATCH] i18n: externalize strings from 'app/views/projects/jobs' Signed-off-by: Tao Wang --- app/views/projects/jobs/_header.html.haml | 21 ++--- app/views/projects/jobs/_sidebar.html.haml | 28 +++--- app/views/projects/jobs/_table.html.haml | 18 ++-- app/views/projects/jobs/index.html.haml | 10 +-- app/views/projects/jobs/show.html.haml | 42 ++++----- locale/gitlab.pot | 99 ++++++++++++++++++++++ 6 files changed, 155 insertions(+), 63 deletions(-) diff --git a/app/views/projects/jobs/_header.html.haml b/app/views/projects/jobs/_header.html.haml index b83e8dddccb9ad..ba3b159bcfbc5f 100644 --- a/app/views/projects/jobs/_header.html.haml +++ b/app/views/projects/jobs/_header.html.haml @@ -4,18 +4,11 @@ .content-block.build-header.top-area.page-content-header .header-content = render 'ci/status/badge', status: @build.detailed_status(current_user), link: false, title: @build.status_title - %strong - Job - = link_to "##{@build.id}", project_job_path(@project, @build), class: 'js-build-id' - in pipeline - %strong - = link_to "##{pipeline.id}", pipeline_path(pipeline) - for - %strong - = link_to pipeline.short_sha, project_commit_path(@project, pipeline.sha), class: 'commit-sha' - from - %strong - = link_to @build.ref, project_ref_path(@project, @build.ref), class: 'ref-name' + - link_to_job_id = link_to("##{@build.id}", project_job_path(@project, @build), class: 'js-build-id') + - link_to_pipeline_id = link_to("##{pipeline.id}", pipeline_path(pipeline)) + - link_to_commit = link_to(pipeline.short_sha, project_commit_path(@project, pipeline.sha), class: 'commit-sha') + - link_to_build = link_to(@build.ref, project_ref_path(@project, @build.ref), class: 'ref-name') + = _("Job %{link_to_job_id} in pipeline %{link_to_pipeline_id} for %{link_to_commit} from %{link_to_build}").html_safe % { link_to_job_id: link_to_job_id, link_to_pipeline_id: link_to_pipeline_id, link_to_commit: link_to_commit, link_to_build: link_to_build } = render "projects/jobs/user" if @build.user @@ -24,8 +17,8 @@ - if show_controls .nav-controls - if can?(current_user, :create_issue, @project) && @build.failed? - = link_to "New issue", new_project_issue_path(@project, issue: build_failed_issue_options), class: 'btn btn-new btn-inverted' + = link_to _("New issue"), new_project_issue_path(@project, issue: build_failed_issue_options), class: 'btn btn-new btn-inverted' - if can?(current_user, :update_build, @build) && @build.retryable? - = link_to "Retry job", retry_project_job_path(@project, @build), class: 'btn btn-inverted-secondary', method: :post + = link_to _("Retry job"), retry_project_job_path(@project, @build), class: 'btn btn-inverted-secondary', method: :post %button.btn.btn-default.float-right.d-block.d-sm-none.d-md-none.build-gutter-toggle.js-sidebar-build-toggle{ role: "button", type: "button" } = icon('angle-double-left') diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml index 759efd4e9d4ff8..ab0191ef40504a 100644 --- a/app/views/projects/jobs/_sidebar.html.haml +++ b/app/views/projects/jobs/_sidebar.html.haml @@ -11,37 +11,35 @@ - if can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?) .block .title - Job artifacts + = _("Job artifacts") - if @build.artifacts_expired? %p.build-detail-row - The artifacts were removed - #{time_ago_with_tooltip(@build.artifacts_expire_at)} + = _("The artifacts were removed %{expire_time}").html_safe % { expire_time: time_ago_with_tooltip(@build.artifacts_expire_at) } - elsif @build.has_expiring_artifacts? %p.build-detail-row - The artifacts will be removed - #{time_ago_with_tooltip(@build.artifacts_expire_at)} + = _("The artifacts will be removed %{expire_time}").html_safe % { expire_time: time_ago_with_tooltip(@build.artifacts_expire_at) } - if @build.artifacts? .btn-group.d-flex{ role: :group } - if @build.has_expiring_artifacts? && can?(current_user, :update_build, @build) = link_to keep_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default', method: :post do - Keep + = _("Keep") = link_to download_project_job_artifacts_path(@project, @build), rel: 'nofollow', download: '', class: 'btn btn-sm btn-default' do - Download + = _("Download") - if @build.browsable_artifacts? = link_to browse_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default' do - Browse + = _("Browse") - if @build.trigger_request .build-widget.block %h4.title - Trigger + = _("Trigger") - if @build.trigger_request&.trigger&.short_token %p - %span.build-light-text Token: + %span.build-light-text= _("Token:") #{@build.trigger_request.trigger.short_token} - if @build.trigger_variables.any? @@ -55,9 +53,9 @@ %div{ class: (@build.pipeline.stages_count > 1 ? "block" : "block-last") } %p - Commit + = _("Commit") = link_to @build.pipeline.short_sha, project_commit_path(@project, @build.pipeline.sha), class: 'commit-sha link-commit' - = clipboard_button(text: @build.pipeline.short_sha, title: "Copy commit SHA to clipboard") + = clipboard_button(text: @build.pipeline.short_sha, title: _("Copy commit SHA to clipboard")) - if @build.merge_request in = link_to "#{@build.merge_request.to_reference}", merge_request_path(@build.merge_request), class: 'link-commit' @@ -70,12 +68,12 @@ %div %span{ class: "ci-status-icon-#{@build.pipeline.status}" } = ci_icon_for_status(@build.pipeline.status) - Pipeline + = _("Pipeline") = link_to "##{@build.pipeline.id}", project_pipeline_path(@project, @build.pipeline), class: 'link-commit' - from + = _("from") = link_to "#{@build.pipeline.ref}", project_ref_path(@project, @build.pipeline.ref), class: 'link-commit ref-name' %button.dropdown-menu-toggle{ type: 'button', 'data-toggle' => 'dropdown' } - %span.stage-selection More + %span.stage-selection= _("More") = icon('chevron-down') %ul.dropdown-menu - @build.pipeline.legacy_stages.each do |stage| diff --git a/app/views/projects/jobs/_table.html.haml b/app/views/projects/jobs/_table.html.haml index d124d3ebfc134c..9afb0f79a462c2 100644 --- a/app/views/projects/jobs/_table.html.haml +++ b/app/views/projects/jobs/_table.html.haml @@ -2,22 +2,22 @@ - if builds.blank? %div - .nothing-here-block No jobs to show + .nothing-here-block= _("No jobs to show") - else .table-holder %table.table.ci-table.builds-page %thead %tr - %th Status - %th Job - %th Pipeline + %th= _('Status') + %th= _('Job') + %th= _('Pipeline') - if admin - %th Project - %th Runner - %th Stage - %th Name + %th= _('Project') + %th= _('Runner') + %th= _('Stage') + %th= _('Name') %th - %th Coverage + %th= _('Coverage') %th = render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, pipeline_link: true, stage: true, allow_retry: true, admin: admin } diff --git a/app/views/projects/jobs/index.html.haml b/app/views/projects/jobs/index.html.haml index fe1c338b634eb6..b5ec2cc977b50f 100644 --- a/app/views/projects/jobs/index.html.haml +++ b/app/views/projects/jobs/index.html.haml @@ -1,5 +1,5 @@ - @no_container = true -- page_title "Jobs" +- page_title _("Jobs") %div{ class: container_class } .top-area @@ -9,14 +9,14 @@ .nav-controls - if can?(current_user, :update_build, @project) - if @all_builds.running_or_pending.limit(1).any? - = link_to 'Cancel running', cancel_all_project_jobs_path(@project), - data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post + = link_to _('Cancel running'), cancel_all_project_jobs_path(@project), + data: { confirm: _('Are you sure?') }, class: 'btn btn-danger', method: :post - unless @repository.gitlab_ci_yml - = link_to 'Get started with Pipelines', help_page_path('ci/quick_start/README'), class: 'btn btn-info' + = link_to _('Get started with Pipelines'), help_page_path('ci/quick_start/README'), class: 'btn btn-info' = link_to project_ci_lint_path(@project), class: 'btn btn-default' do - %span CI lint + %span= _("CI lint") .content-list.builds-content-list = render "table", builds: @builds, project: @project diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index 35aaa11017f97b..6d6f18a440d4cc 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -1,7 +1,7 @@ - @no_container = true -- add_to_breadcrumbs "Jobs", project_jobs_path(@project) +- add_to_breadcrumbs _("Jobs"), project_jobs_path(@project) - breadcrumb_title "##{@build.id}" -- page_title "#{@build.name} (##{@build.id})", "Jobs" +- page_title "#{@build.name} (##{@build.id})", _("Jobs") %div{ class: container_class } .build-page.js-build-page @@ -11,19 +11,19 @@ .bs-callout.bs-callout-warning.js-build-stuck %p - if no_runners_for_project?(@build.project) - This job is stuck, because the project doesn't have any runners online assigned to it. + = _("This job is stuck, because the project doesn't have any runners online assigned to it.") - elsif @build.tags.any? - This job is stuck, because you don't have any active runners online with any of these tags assigned to them: + = _("This job is stuck, because you don't have any active runners online with any of these tags assigned to them:") - @build.tags.each do |tag| %span.badge.badge-primary = tag - else - This job is stuck, because you don't have any active runners that can run this job. + = _("This job is stuck, because you don't have any active runners that can run this job.") %br - Go to + = _("Go to") = link_to project_runners_path(@build.project, anchor: 'js-runners-settings') do - Runners page + = _("Runners page") = render "shared_runner_limit_warning", project: @build.project @@ -38,24 +38,26 @@ - environment = environment_for_build(@build.project, @build) - if @build.success? && @build.last_deployment.present? - if @build.last_deployment.last? - This job is the most recent deployment to #{environment_link_for_build(@build.project, @build)}. + #{_("This job is the most recent deployment to")} #{environment_link_for_build(@build.project, @build)}. - else - This job is an out-of-date deployment to #{environment_link_for_build(@build.project, @build)}. - View the most recent deployment #{deployment_link(environment.last_deployment)}. + #{_("This job is an out-of-date deployment to")} #{environment_link_for_build(@build.project, @build)}. + #{_("View the most recent deployment")} #{deployment_link(environment.last_deployment)}. - elsif @build.complete? && !@build.success? - The deployment of this job to #{environment_link_for_build(@build.project, @build)} did not succeed. + - link_to_build = environment_link_for_build(@build.project, @build) + = _("The deployment of this job to %{link_to_build} did not succeed.").html_safe % { link_to_build: link_to_build } - else - This job is creating a deployment to #{environment_link_for_build(@build.project, @build)} + #{_("This job is creating a deployment to")} #{environment_link_for_build(@build.project, @build)} - if environment.try(:last_deployment) - and will overwrite the #{deployment_link(environment.last_deployment, text: 'latest deployment')} + #{_("and will overwrite the")} #{deployment_link(environment.last_deployment, text: _('latest deployment'))} - if @build.erased? .prepend-top-default.js-build-erased .erased.alert.alert-warning - if @build.erased_by_user? - Job has been erased by #{link_to(@build.erased_by_name, user_path(@build.erased_by))} #{time_ago_with_tooltip(@build.erased_at)} + - link_to_name = link_to(@build.erased_by_name, user_path(@build.erased_by)) + = _("Job has been erased by %{link_to_name} %{time_ago}").html_safe % { link_to_name: link_to_name, time_ago: time_ago_with_tooltip(@build.erased_at) } - else - Job has been erased #{time_ago_with_tooltip(@build.erased_at)} + = _("Job has been erased %{time_ago}").html_safe % { time_ago: time_ago_with_tooltip(@build.erased_at) } - if @build.running? || @build.has_trace? .build-trace-container.prepend-top-default @@ -69,7 +71,7 @@ .controllers.float-right - if @build.has_trace? = link_to raw_project_job_path(@project, @build), - title: 'Show complete raw', + title: _('Show complete raw'), data: { placement: 'top', container: 'body' }, class: 'js-raw-link-controller has-tooltip controllers-buttons' do = icon('file-text-o') @@ -77,14 +79,14 @@ - if @build.erasable? && can?(current_user, :erase_build, @build) = link_to erase_project_job_path(@project, @build), method: :post, - data: { confirm: 'Are you sure you want to erase this build?', placement: 'top', container: 'body' }, - title: 'Erase job log', + data: { confirm: _('Are you sure you want to erase this build?'), placement: 'top', container: 'body' }, + title: _('Erase job log'), class: 'has-tooltip js-erase-link controllers-buttons' do = icon('trash') - .has-tooltip.controllers-buttons{ title: 'Scroll to top', data: { placement: 'top', container: 'body'} } + .has-tooltip.controllers-buttons{ title: _('Scroll to top'), data: { placement: 'top', container: 'body'} } %button.js-scroll-up.btn-scroll.btn-transparent.btn-blank{ type: 'button', disabled: true } = custom_icon('scroll_up') - .has-tooltip.controllers-buttons{ title: 'Scroll to bottom', data: { placement: 'top', container: 'body'} } + .has-tooltip.controllers-buttons{ title: _('Scroll to bottom'), data: { placement: 'top', container: 'body'} } %button.js-scroll-down.btn-scroll.btn-transparent.btn-blank{ type: 'button', disabled: true } = custom_icon('scroll_down') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0ea8789d6cbfc5..e0df5cd8e25350 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -303,6 +303,9 @@ msgstr "" msgid "%{pushes} pushes, more than %{commits} commits by %{people} contributors." msgstr "" +msgid "Job %{link_to_job_id} in pipeline %{link_to_pipeline_id} for %{link_to_commit} from %{link_to_build}" +msgstr "" + msgid "Removes source branch" msgstr "" @@ -708,6 +711,9 @@ msgstr "" msgid "Are you sure you want to delete this pipeline schedule?" msgstr "" +msgid "Are you sure you want to erase this build?" +msgstr "" + msgid "Are you sure you want to lose unsaved changes?" msgstr "" @@ -1205,6 +1211,9 @@ msgstr "" msgid "Branches|protected" msgstr "" +msgid "Browse" +msgstr "" + msgid "Browse Directory" msgstr "" @@ -1232,6 +1241,9 @@ msgstr "" msgid "CI / CD Settings" msgstr "" +msgid "CI lint" +msgstr "" + msgid "CI will run using the credentials assigned above." msgstr "" @@ -1298,6 +1310,9 @@ msgstr "" msgid "Cancel" msgstr "" +msgid "Cancel running" +msgstr "" + msgid "Cancel this job" msgstr "" @@ -2223,6 +2238,9 @@ msgstr "" msgid "Copy token to clipboard" msgstr "" +msgid "Coverage" +msgstr "" + msgid "Create" msgstr "" @@ -2879,6 +2897,9 @@ msgstr "" msgid "Epics let you manage your portfolio of projects more efficiently and with less effort" msgstr "" +msgid "Erase job log" +msgstr "" + msgid "Error" msgstr "" @@ -3460,6 +3481,9 @@ msgstr "" msgid "Geo|You need a different license to use Geo replication" msgstr "" +msgid "Get started with Pipelines" +msgstr "" + msgid "Git" msgstr "" @@ -3529,6 +3553,9 @@ msgstr "" msgid "Go back" msgstr "" +msgid "Go to" +msgstr "" + msgid "Go to %{link_to_google_takeout}." msgstr "" @@ -4004,9 +4031,18 @@ msgstr "" msgid "Job" msgstr "" +msgid "Job artifacts" +msgstr "" + msgid "Job has been erased" msgstr "" +msgid "Job has been erased %{time_ago}" +msgstr "" + +msgid "Job has been erased by %{link_to_name} %{time_ago}" +msgstr "" + msgid "Jobs" msgstr "" @@ -4022,6 +4058,9 @@ msgstr "" msgid "June" msgstr "" +msgid "Keep" +msgstr "" + msgid "Koding" msgstr "" @@ -4775,6 +4814,9 @@ msgstr "" msgid "No issues for the selected time period." msgstr "" +msgid "No jobs to show" +msgstr "" + msgid "No labels with such name or description" msgstr "" @@ -5916,6 +5958,9 @@ msgstr "" msgid "Retry" msgstr "" +msgid "Retry job" +msgstr "" + msgid "Retry this job" msgstr "" @@ -5954,6 +5999,9 @@ msgstr "" msgid "Run CI/CD pipelines for external repositories" msgstr "" +msgid "Runner" +msgstr "" + msgid "Runner token" msgstr "" @@ -5966,6 +6014,9 @@ msgstr "" msgid "Runners can be placed on separate users, servers, and even on your local machine." msgstr "" +msgid "Runners page" +msgstr "" + msgid "Running" msgstr "" @@ -6256,6 +6307,9 @@ msgstr "" msgid "Show command" msgstr "" +msgid "Show complete raw" +msgstr "" + msgid "Show complete raw log" msgstr "" @@ -6722,6 +6776,12 @@ msgstr "" msgid "The X509 Certificate to use when mutual TLS is required to communicate with the external authorization service. If left blank, the server certificate is still validated when accessing over HTTPS." msgstr "" +msgid "The artifacts were removed %{expire_time}" +msgstr "" + +msgid "The artifacts will be removed %{expire_time}" +msgstr "" + msgid "The character highlighter helps you keep the subject line to %{titleLength} characters and wrap the body at %{bodyLength} so they are readable in git." msgstr "" @@ -6734,6 +6794,9 @@ msgstr "" msgid "The connection will time out after %{timeout}. For repositories that take longer, use a clone/push combination." msgstr "" +msgid "The deployment of this job to %{link_to_build} did not succeed." +msgstr "" + msgid "The fork relationship has been removed." msgstr "" @@ -6938,9 +7001,27 @@ msgstr "" msgid "This job has not started yet" msgstr "" +msgid "This job is an out-of-date deployment to" +msgstr "" + +msgid "This job is creating a deployment to" +msgstr "" + msgid "This job is in pending state and is waiting to be picked by a runner" msgstr "" +msgid "This job is stuck, because the project doesn't have any runners online assigned to it." +msgstr "" + +msgid "This job is stuck, because you don't have any active runners online with any of these tags assigned to them:" +msgstr "" + +msgid "This job is stuck, because you don't have any active runners that can run this job." +msgstr "" + +msgid "This job is the most recent deployment to" +msgstr "" + msgid "This job requires a manual action" msgstr "" @@ -7251,6 +7332,9 @@ msgstr "" msgid "ToggleButton|Toggle Status: ON" msgstr "" +msgid "Token:" +msgstr "" + msgid "Too many changes to show." msgstr "" @@ -7278,6 +7362,9 @@ msgstr "" msgid "Trending" msgstr "" +msgid "Trigger" +msgstr "" + msgid "Trigger pipelines for mirror updates" msgstr "" @@ -7494,6 +7581,9 @@ msgstr "" msgid "View replaced file @ " msgstr "" +msgid "View the most recent deployment" +msgstr "" + msgid "Visibility and access controls" msgstr "" @@ -7891,6 +7981,9 @@ msgid_plural "and %d fixed vulnerabilities" msgstr[0] "" msgstr[1] "" +msgid "and will overwrite the" +msgstr "" + msgid "assign yourself" msgstr "" @@ -8170,6 +8263,9 @@ msgstr "" msgid "for this project" msgstr "" +msgid "from" +msgstr "" + msgid "here" msgstr "" @@ -8191,6 +8287,9 @@ msgstr "" msgid "is not a valid X509 certificate." msgstr "" +msgid "latest deployment" +msgstr "" + msgid "latest version" msgstr "" -- GitLab