Merge branch 'zj-i18n-pipeline-schedules' into 'master'

Allow translation of Pipeline Schedules

See merge request !11974

app/controllers/projects/pipeline_schedules_controller.rb

@@ -43,7 +43,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
     if schedule.update(owner: current_user)
       redirect_to pipeline_schedules_path(@project)
     else
-      redirect_to pipeline_schedules_path(@project), alert: "Failed to change the owner"
+      redirect_to pipeline_schedules_path(@project), alert: _("Failed to change the owner")
     end
   end
 
@@ -53,7 +53,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
     else
       redirect_to pipeline_schedules_path(@project),
                   status: 302,
-                  alert: "Failed to remove the pipeline schedule"
+                  alert: _("Failed to remove the pipeline schedule")
     end
   end
 

app/views/projects/pipeline_schedules/_form.html.haml

@@ -6,28 +6,28 @@
   = form_errors(@schedule)
   .form-group
     .col-md-9
-      = f.label :description, 'Description', class: 'label-light'
-      = f.text_field :description, class: 'form-control', required: true, autofocus: true, placeholder: 'Provide a short description for this pipeline'
+      = f.label :description, _('Description'), class: 'label-light'
+      = f.text_field :description, class: 'form-control', required: true, autofocus: true, placeholder: _('PipelineSchedules|Provide a short description for this pipeline')
   .form-group
     .col-md-9
-      = f.label :cron, 'Interval Pattern', class: 'label-light'
+      = f.label :cron, _('Interval Pattern'), class: 'label-light'
       #interval-pattern-input{ data: { initial_interval: @schedule.cron } }
   .form-group
     .col-md-9
-      = f.label :cron_timezone, 'Cron Timezone', class: 'label-light'
-      = dropdown_tag("Select a timezone", options: { toggle_class: 'btn js-timezone-dropdown', title: "Select a timezone", filter: true, placeholder: "Filter", data: { data: timezone_data } } )
+      = f.label :cron_timezone, _('Cron Timezone'), class: 'label-light'
+      = dropdown_tag(_("Select a timezone"), options: { toggle_class: 'btn js-timezone-dropdown', title: _("Select a timezone"), filter: true, placeholder: _("Filter"), data: { data: timezone_data } } )
       = f.text_field :cron_timezone, value: @schedule.cron_timezone, id: 'schedule_cron_timezone', class: 'hidden', name: 'schedule[cron_timezone]', required: true
   .form-group
     .col-md-9
-      = f.label :ref, 'Target Branch', class: 'label-light'
-      = dropdown_tag("Select target branch", options: { toggle_class: 'btn js-target-branch-dropdown git-revision-dropdown-toggle', dropdown_class: 'git-revision-dropdown', title: "Select target branch", filter: true, placeholder: "Filter", data: { data: @project.repository.branch_names, default_branch: @project.default_branch } } )
+      = f.label :ref, _('Target Branch'), class: 'label-light'
+      = dropdown_tag(_("Select target branch"), options: { toggle_class: 'btn js-target-branch-dropdown git-revision-dropdown-toggle', dropdown_class: 'git-revision-dropdown', title: _("Select target branch"), filter: true, placeholder: _("Filter"), data: { data: @project.repository.branch_names, default_branch: @project.default_branch } } )
       = f.text_field :ref, value: @schedule.ref, id: 'schedule_ref', class: 'hidden', name: 'schedule[ref]', required: true
   .form-group
     .col-md-9
-      = f.label  :active, 'Activated', class: 'label-light'
+      = f.label  :active, _('PipelineSchedules|Activated'), class: 'label-light'
       %div
         = f.check_box :active, required: false, value: @schedule.active?
         Active
   .footer-block.row-content-block
-    = f.submit 'Save pipeline schedule', class: 'btn btn-create', tabindex: 3
-    = link_to 'Cancel', pipeline_schedules_path(@project), class: 'btn btn-cancel'
+    = f.submit _('Save pipeline schedule'), class: 'btn btn-create', tabindex: 3
+    = link_to _('Cancel'), pipeline_schedules_path(@project), class: 'btn btn-cancel'

app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml

@@ -13,12 +13,12 @@
             = ci_icon_for_status(pipeline_schedule.last_pipeline.status)
             %span ##{pipeline_schedule.last_pipeline.id}
       - else
-        None
+        = _("PipelineSchedules|None")
     %td.next-run-cell
       - if pipeline_schedule.active?
         = time_ago_with_tooltip(pipeline_schedule.real_next_run)
       - else
-        Inactive
+        = _("PipelineSchedules|Inactive")
     %td
       - if pipeline_schedule.owner
         = image_tag avatar_icon(pipeline_schedule.owner, 20), class: "avatar s20"
@@ -27,11 +27,11 @@
     %td
       .pull-right.btn-group
         - if can?(current_user, :update_pipeline_schedule, @project) && !pipeline_schedule.owned_by?(current_user)
-          = link_to take_ownership_pipeline_schedule_path(pipeline_schedule), method: :post, title: 'Take Ownership', class: 'btn' do
-            Take ownership
+          = link_to take_ownership_pipeline_schedule_path(pipeline_schedule), method: :post, title: s_('PipelineSchedules|Take ownership'), class: 'btn' do
+            = s_('PipelineSchedules|Take ownership')
         - if can?(current_user, :update_pipeline_schedule, pipeline_schedule)
-          = link_to edit_pipeline_schedule_path(pipeline_schedule), title: 'Edit', class: 'btn' do
+          = link_to edit_pipeline_schedule_path(pipeline_schedule), title: _('Edit'), class: 'btn' do
             = icon('pencil')
         - if can?(current_user, :admin_pipeline_schedule, pipeline_schedule)
-          = link_to pipeline_schedule_path(pipeline_schedule), title: 'Delete', method: :delete, class: 'btn btn-remove', data: { confirm: "Are you sure you want to cancel this pipeline?" } do
+          = link_to pipeline_schedule_path(pipeline_schedule), title: _('Delete'), method: :delete, class: 'btn btn-remove', data: { confirm: _("Are you sure you want to delete this pipeline schedule?") } do
             = icon('trash')

app/views/projects/pipeline_schedules/_table.html.haml

@@ -2,11 +2,11 @@
   %table.table.ci-table
     %thead
       %tr
-        %th Description
-        %th Target
-        %th Last Pipeline
-        %th Next Run
-        %th Owner
+        %th= _("Description")
+        %th= s_("PipelineSchedules|Target")
+        %th= _("Last Pipeline")
+        %th= s_("PipelineSchedules|Next Run")
+        %th= _("Owner")
         %th
 
     = render partial: "pipeline_schedule", collection: @schedules

app/views/projects/pipeline_schedules/_tabs.html.haml

 %ul.nav-links
   %li{ class: active_when(scope.nil?) }>
     = link_to schedule_path_proc.call(nil) do
-      All
+      = s_("PipelineSchedules|All")
       %span.badge.js-totalbuilds-count
         = number_with_delimiter(all_schedules.count(:id))
 
   %li{ class: active_when(scope == 'active') }>
     = link_to schedule_path_proc.call('active') do
-      Active
+      = s_("PipelineSchedules|Active")
       %span.badge
         = number_with_delimiter(all_schedules.active.count(:id))
 
   %li{ class: active_when(scope == 'inactive') }>
     = link_to schedule_path_proc.call('inactive') do
-      Inactive
+      = s_("PipelineSchedules|Inactive")
       %span.badge
         = number_with_delimiter(all_schedules.inactive.count(:id))

app/views/projects/pipeline_schedules/edit.html.haml

-- page_title "Edit", @schedule.description, "Pipeline Schedule"
+- page_title _("Edit"), @schedule.description, _("Pipeline Schedule")
 
 %h3.page-title
-  Edit Pipeline Schedule #{@schedule.id}
+  = _("Edit Pipeline Schedule %{id}") % { id: @schedule.id }
 %hr
 
 = render "form"

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

@@ -3,7 +3,7 @@
   = webpack_bundle_tag 'schedules_index'
 
 - @no_container = true
-- page_title "Pipeline Schedules"
+- page_title _("Pipeline Schedules")
 = render "projects/pipelines/head"
 
 %div{ class: container_class }
@@ -21,4 +21,4 @@
       = render partial: "table"
   - else
     .light-well
-      .nothing-here-block No schedules
+      .nothing-here-block= _("No schedules")

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

-- page_title "New Pipeline Schedule"
+- page_title _("New Pipeline Schedule")
 
 %h3.page-title
-  Schedule a new pipeline
+  = _("Schedule a new pipeline")
 %hr
 
 = render "form"

changelogs/unreleased/zj-i18n-pipeline-schedules.yml

+---
+title: Allow translation of Pipeline Schedules
+merge_request:
+author:

locale/en/gitlab.po

@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-06-07 12:14+0200\n"
+"PO-Revision-Date: 2017-04-12 22:36-0500\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Last-Translator: Bob Van Landuyt <bob@gitlab.com>\n"
-"X-Generator: Poedit 2.0.2\n"
+"\n"
 
 msgid "About auto deploy"
 msgstr ""
@@ -41,6 +41,9 @@ msgstr ""
 msgid "Archived project! Repository is read-only"
 msgstr ""
 
+msgid "Are you sure you want to delete this pipeline schedule?"
+msgstr ""
+
 msgid "Branch"
 msgid_plural "Branches"
 msgstr[0] ""
@@ -58,6 +61,9 @@ msgstr ""
 msgid "CI configuration"
 msgstr ""
 
+msgid "Cancel"
+msgstr ""
+
 msgid "Changelog"
 msgstr ""
 
@@ -162,6 +168,9 @@ msgstr ""
 msgid "CreateNewFork|Fork"
 msgstr ""
 
+msgid "Cron Timezone"
+msgstr ""
+
 msgid "Custom notification events"
 msgstr ""
 
@@ -195,11 +204,17 @@ msgstr ""
 msgid "CycleAnalyticsStage|Test"
 msgstr ""
 
+msgid "Delete"
+msgstr ""
+
 msgid "Deploy"
 msgid_plural "Deploys"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "Description"
+msgstr ""
+
 msgid "Directory name"
 msgstr ""
 
@@ -224,9 +239,24 @@ msgstr ""
 msgid "DownloadSource|Download"
 msgstr ""
 
+msgid "Edit"
+msgstr ""
+
+msgid "Edit Pipeline Schedule %{id}"
+msgstr ""
+
+msgid "Failed to change the owner"
+msgstr ""
+
+msgid "Failed to remove the pipeline schedule"
+msgstr ""
+
 msgid "Files"
 msgstr ""
 
+msgid "Filter"
+msgstr ""
+
 msgid "Find by path"
 msgstr ""
 
@@ -266,6 +296,9 @@ msgstr ""
 msgid "Import repository"
 msgstr ""
 
+msgid "Interval Pattern"
+msgstr ""
+
 msgid "Introducing Cycle Analytics"
 msgstr ""
 
@@ -280,6 +313,9 @@ msgid_plural "Last %d days"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "Last Pipeline"
+msgstr ""
+
 msgid "Last Update"
 msgstr ""
 
@@ -308,6 +344,9 @@ msgid_plural "New Issues"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "New Pipeline Schedule"
+msgstr ""
+
 msgid "New branch"
 msgstr ""
 
@@ -332,6 +371,9 @@ msgstr ""
 msgid "No repository"
 msgstr ""
 
+msgid "No schedules"
+msgstr ""
+
 msgid "Not available"
 msgstr ""
 
@@ -395,9 +437,45 @@ msgstr ""
 msgid "OpenedNDaysAgo|Opened"
 msgstr ""
 
+msgid "Owner"
+msgstr ""
+
 msgid "Pipeline Health"
 msgstr ""
 
+msgid "Pipeline Schedule"
+msgstr ""
+
+msgid "Pipeline Schedules"
+msgstr ""
+
+msgid "PipelineSchedules|Activated"
+msgstr ""
+
+msgid "PipelineSchedules|Active"
+msgstr ""
+
+msgid "PipelineSchedules|All"
+msgstr ""
+
+msgid "PipelineSchedules|Inactive"
+msgstr ""
+
+msgid "PipelineSchedules|Next Run"
+msgstr ""
+
+msgid "PipelineSchedules|None"
+msgstr ""
+
+msgid "PipelineSchedules|Provide a short description for this pipeline"
+msgstr ""
+
+msgid "PipelineSchedules|Take ownership"
+msgstr ""
+
+msgid "PipelineSchedules|Target"
+msgstr ""
+
 msgid "Project '%{project_name}' queued for deletion."
 msgstr ""
 
@@ -488,12 +566,24 @@ msgstr ""
 msgid "Request Access"
 msgstr ""
 
+msgid "Save pipeline schedule"
+msgstr ""
+
+msgid "Schedule a new pipeline"
+msgstr ""
+
 msgid "Search branches and tags"
 msgstr ""
 
 msgid "Select Archive Format"
 msgstr ""
 
+msgid "Select a timezone"
+msgstr ""
+
+msgid "Select target branch"
+msgstr ""
+
 msgid "Set a password on your account to pull or push via %{protocol}"
 msgstr ""
 
@@ -531,6 +621,9 @@ msgstr[1] ""
 msgid "Tags"
 msgstr ""
 
+msgid "Target Branch"
+msgstr ""
+
 msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request."
 msgstr ""
 

locale/gitlab.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 17:36+0200\n"
-"PO-Revision-Date: 2017-06-07 17:36+0200\n"
+"POT-Creation-Date: 2017-06-08 09:42+0200\n"
+"PO-Revision-Date: 2017-06-08 09:42+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -42,6 +42,9 @@ msgstr ""
 msgid "Archived project! Repository is read-only"
 msgstr ""
 
+msgid "Are you sure you want to delete this pipeline schedule?"
+msgstr ""
+
 msgid "Branch"
 msgid_plural "Branches"
 msgstr[0] ""
@@ -59,6 +62,9 @@ msgstr ""
 msgid "CI configuration"
 msgstr ""
 
+msgid "Cancel"
+msgstr ""
+
 msgid "Changelog"
 msgstr ""
 
@@ -163,6 +169,9 @@ msgstr ""
 msgid "CreateNewFork|Fork"
 msgstr ""
 
+msgid "Cron Timezone"
+msgstr ""
+
 msgid "Custom notification events"
 msgstr ""
 
@@ -196,11 +205,17 @@ msgstr ""
 msgid "CycleAnalyticsStage|Test"
 msgstr ""
 
+msgid "Delete"
+msgstr ""
+
 msgid "Deploy"
 msgid_plural "Deploys"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "Description"
+msgstr ""
+
 msgid "Directory name"
 msgstr ""
 
@@ -225,9 +240,24 @@ msgstr ""
 msgid "DownloadSource|Download"
 msgstr ""
 
+msgid "Edit"
+msgstr ""
+
+msgid "Edit Pipeline Schedule %{id}"
+msgstr ""
+
+msgid "Failed to change the owner"
+msgstr ""
+
+msgid "Failed to remove the pipeline schedule"
+msgstr ""
+
 msgid "Files"
 msgstr ""
 
+msgid "Filter"
+msgstr ""
+
 msgid "Find by path"
 msgstr ""
 
@@ -267,6 +297,9 @@ msgstr ""
 msgid "Import repository"
 msgstr ""
 
+msgid "Interval Pattern"
+msgstr ""
+
 msgid "Introducing Cycle Analytics"
 msgstr ""
 
@@ -281,6 +314,9 @@ msgid_plural "Last %d days"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "Last Pipeline"
+msgstr ""
+
 msgid "Last Update"
 msgstr ""
 
@@ -309,6 +345,9 @@ msgid_plural "New Issues"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "New Pipeline Schedule"
+msgstr ""
+
 msgid "New branch"
 msgstr ""
 
@@ -333,6 +372,9 @@ msgstr ""
 msgid "No repository"
 msgstr ""
 
+msgid "No schedules"
+msgstr ""
+
 msgid "Not available"
 msgstr ""
 
@@ -396,9 +438,45 @@ msgstr ""
 msgid "OpenedNDaysAgo|Opened"
 msgstr ""
 
+msgid "Owner"
+msgstr ""
+
 msgid "Pipeline Health"
 msgstr ""
 
+msgid "Pipeline Schedule"
+msgstr ""
+
+msgid "Pipeline Schedules"
+msgstr ""
+
+msgid "PipelineSchedules|Activated"
+msgstr ""
+
+msgid "PipelineSchedules|Active"
+msgstr ""
+
+msgid "PipelineSchedules|All"
+msgstr ""
+
+msgid "PipelineSchedules|Inactive"
+msgstr ""
+
+msgid "PipelineSchedules|Next Run"
+msgstr ""
+
+msgid "PipelineSchedules|None"
+msgstr ""
+
+msgid "PipelineSchedules|Provide a short description for this pipeline"
+msgstr ""
+
+msgid "PipelineSchedules|Take ownership"
+msgstr ""
+
+msgid "PipelineSchedules|Target"
+msgstr ""
+
 msgid "Project '%{project_name}' queued for deletion."
 msgstr ""
 
@@ -489,12 +567,24 @@ msgstr ""
 msgid "Request Access"
 msgstr ""
 
+msgid "Save pipeline schedule"
+msgstr ""
+
+msgid "Schedule a new pipeline"
+msgstr ""
+
 msgid "Search branches and tags"
 msgstr ""
 
 msgid "Select Archive Format"
 msgstr ""
 
+msgid "Select a timezone"
+msgstr ""
+
+msgid "Select target branch"
+msgstr ""
+
 msgid "Set a password on your account to pull or push via %{protocol}"
 msgstr ""
 
@@ -532,6 +622,9 @@ msgstr[1] ""
 msgid "Tags"
 msgstr ""
 
+msgid "Target Branch"
+msgstr ""
+
 msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request."
 msgstr ""