Commit fda30abd authored by Kushal Pandya's avatar Kushal Pandya

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

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

See merge request gitlab-org/gitlab-ce!24726
parents 021048bd 9cf89890
...@@ -5,23 +5,23 @@ ...@@ -5,23 +5,23 @@
.row .row
.col-md-6 .col-md-6
.form-group.row .form-group.row
= f.label :title, "Title", class: "col-form-label col-sm-2" = f.label :title, _('Title'), class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
= f.text_field :title, maxlength: 255, class: "qa-milestone-title form-control", required: true, autofocus: true = f.text_field :title, maxlength: 255, class: 'qa-milestone-title form-control', required: true, autofocus: true
.form-group.row.milestone-description .form-group.row.milestone-description
= f.label :description, "Description", class: "col-form-label col-sm-2" = f.label :description, _('Description'), class: 'col-form-label col-sm-2'
.col-sm-10 .col-sm-10
= render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project) } do = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(@project) } do
= render 'projects/zen', f: f, attr: :description, classes: 'qa-milestone-description note-textarea', placeholder: 'Write milestone description...' = render 'projects/zen', f: f, attr: :description, classes: 'qa-milestone-description note-textarea', placeholder: _('Write milestone description...')
= render 'shared/notes/hints' = render 'shared/notes/hints'
.clearfix .clearfix
.error-alert .error-alert
= render "shared/milestones/form_dates", f: f = render 'shared/milestones/form_dates', f: f
.form-actions .form-actions
- if @milestone.new_record? - if @milestone.new_record?
= f.submit 'Create milestone', class: "btn-success btn qa-milestone-create-button" = f.submit _('Create milestone'), class: 'btn-create btn qa-milestone-create-button'
= link_to "Cancel", project_milestones_path(@project), class: "btn btn-cancel" = link_to _('Cancel'), project_milestones_path(@project), class: 'btn btn-cancel'
- else - else
= f.submit 'Save changes', class: "btn-success btn" = f.submit _('Save changes'), class: 'btn-success btn'
= link_to "Cancel", project_milestone_path(@project, @milestone), class: "btn btn-cancel" = link_to _('Cancel'), project_milestone_path(@project, @milestone), class: 'btn btn-cancel'
- @no_container = true - @no_container = true
- breadcrumb_title "Edit" - breadcrumb_title _('Edit')
- add_to_breadcrumbs "Milestones", project_milestones_path(@project) - add_to_breadcrumbs _('Milestones'), project_milestones_path(@project)
- page_title "Edit", @milestone.title, "Milestones" - page_title _('Edit'), @milestone.title, _('Milestones')
%div{ class: container_class } %div{ class: container_class }
%h3.page-title %h3.page-title
Edit Milestone = _('Edit Milestone')
%hr %hr
= render "form" = render 'form'
- @no_container = true - @no_container = true
- page_title 'Milestones' - page_title _('Milestones')
%div{ class: container_class } %div{ class: container_class }
.top-area .top-area
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
= render 'shared/milestones/search_form' = render 'shared/milestones/search_form'
= render 'shared/milestones_sort_dropdown' = render 'shared/milestones_sort_dropdown'
- if can?(current_user, :admin_milestone, @project) - if can?(current_user, :admin_milestone, @project)
= link_to new_project_milestone_path(@project), class: "btn btn-success qa-new-project-milestone", title: 'New milestone' do = link_to new_project_milestone_path(@project), class: 'btn btn-success qa-new-project-milestone', title: _('New milestone') do
New milestone = _('New milestone')
.milestones .milestones
#delete-milestone-modal #delete-milestone-modal
...@@ -21,6 +21,6 @@ ...@@ -21,6 +21,6 @@
- if @milestones.blank? - if @milestones.blank?
%li %li
.nothing-here-block No milestones to show .nothing-here-block= _('No milestones to show')
= paginate @milestones, theme: 'gitlab' = paginate @milestones, theme: 'gitlab'
- @no_container = true - @no_container = true
- add_to_breadcrumbs "Milestones", project_milestones_path(@project) - add_to_breadcrumbs _('Milestones'), project_milestones_path(@project)
- breadcrumb_title "New" - breadcrumb_title _('New')
- page_title "New Milestone" - page_title _('New Milestone')
%div{ class: container_class } %div{ class: container_class }
%h3.page-title %h3.page-title
New Milestone = _('New Milestone')
%hr %hr
= render "form" = render 'form'
- @no_container = true - @no_container = true
- add_to_breadcrumbs "Milestones", project_milestones_path(@project) - add_to_breadcrumbs _('Milestones'), project_milestones_path(@project)
- breadcrumb_title @milestone.title - breadcrumb_title @milestone.title
- page_title @milestone.title, "Milestones" - page_title @milestone.title, _('Milestones')
- page_description @milestone.description - page_description @milestone.description
%div{ class: container_class } %div{ class: container_class }
.detail-page-header.milestone-page-header .detail-page-header.milestone-page-header
.status-box{ class: status_box_class(@milestone) } .status-box{ class: status_box_class(@milestone) }
- if @milestone.closed? - if @milestone.closed?
Closed = _('Closed')
- elsif @milestone.expired? - elsif @milestone.expired?
Past due = _('Past due')
- elsif @milestone.upcoming? - elsif @milestone.upcoming?
Upcoming = _('Upcoming')
- else - else
Open = _('Open')
.header-text-content .header-text-content
%span.identifier %span.identifier
%strong %strong
Milestone = _('Milestone')
- if @milestone.due_date || @milestone.start_date - if @milestone.due_date || @milestone.start_date
= milestone_date_range(@milestone) = milestone_date_range(@milestone)
.milestone-buttons .milestone-buttons
- if can?(current_user, :admin_milestone, @project) - if can?(current_user, :admin_milestone, @project)
= link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped btn-nr" do = link_to edit_project_milestone_path(@project, @milestone), class: 'btn btn-grouped btn-nr' do
Edit = _('Edit')
- if @project.group - if @project.group
%button.js-promote-project-milestone-button.btn.btn-grouped{ data: { toggle: 'modal', %button.js-promote-project-milestone-button.btn.btn-grouped{ data: { toggle: 'modal',
...@@ -39,13 +39,13 @@ ...@@ -39,13 +39,13 @@
#promote-milestone-modal #promote-milestone-modal
- if @milestone.active? - if @milestone.active?
= link_to 'Close milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-close btn-nr btn-grouped" = link_to _('Close milestone'), project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: 'btn btn-close btn-nr btn-grouped'
- else - else
= link_to 'Reopen milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-reopen btn-nr btn-grouped" = link_to _('Reopen milestone'), project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: 'btn btn-reopen btn-nr btn-grouped'
= render 'shared/milestones/delete_button' = render 'shared/milestones/delete_button'
%a.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: "#" } %a.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: '#' }
= icon('angle-double-left') = icon('angle-double-left')
.detail-page-description.milestone-detail .detail-page-description.milestone-detail
...@@ -62,10 +62,10 @@ ...@@ -62,10 +62,10 @@
- if can?(current_user, :read_issue, @project) && @milestone.total_items_count(current_user).zero? - if can?(current_user, :read_issue, @project) && @milestone.total_items_count(current_user).zero?
.alert.alert-success.prepend-top-default .alert.alert-success.prepend-top-default
%span Assign some issues to this milestone. %span= _('Assign some issues to this milestone.')
- elsif @milestone.complete?(current_user) && @milestone.active? - elsif @milestone.complete?(current_user) && @milestone.active?
.alert.alert-success.prepend-top-default .alert.alert-success.prepend-top-default
%span All issues for this milestone are closed. You may close this milestone now. %span= _('All issues for this milestone are closed. You may close this milestone now.')
= render 'deprecation_message' = render 'deprecation_message'
= render 'shared/milestones/tabs', milestone: @milestone = render 'shared/milestones/tabs', milestone: @milestone
......
---
title: Externalize strings from `/app/views/projects/milestones`
merge_request: 24726
author: George Tsiolis
type: other
...@@ -504,6 +504,9 @@ msgstr "" ...@@ -504,6 +504,9 @@ msgstr ""
msgid "All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings." msgid "All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings."
msgstr "" msgstr ""
msgid "All issues for this milestone are closed. You may close this milestone now."
msgstr ""
msgid "All users" msgid "All users"
msgstr "" msgstr ""
...@@ -765,6 +768,9 @@ msgstr "" ...@@ -765,6 +768,9 @@ msgstr ""
msgid "Assign milestone" msgid "Assign milestone"
msgstr "" msgstr ""
msgid "Assign some issues to this milestone."
msgstr ""
msgid "Assign to" msgid "Assign to"
msgstr "" msgstr ""
...@@ -1494,6 +1500,9 @@ msgstr "" ...@@ -1494,6 +1500,9 @@ msgstr ""
msgid "Close" msgid "Close"
msgstr "" msgstr ""
msgid "Close milestone"
msgstr ""
msgid "Closed" msgid "Closed"
msgstr "" msgstr ""
...@@ -2297,6 +2306,9 @@ msgstr "" ...@@ -2297,6 +2306,9 @@ msgstr ""
msgid "Create merge request and branch" msgid "Create merge request and branch"
msgstr "" msgstr ""
msgid "Create milestone"
msgstr ""
msgid "Create new branch" msgid "Create new branch"
msgstr "" msgstr ""
...@@ -2758,6 +2770,9 @@ msgstr "" ...@@ -2758,6 +2770,9 @@ msgstr ""
msgid "Edit Label" msgid "Edit Label"
msgstr "" msgstr ""
msgid "Edit Milestone"
msgstr ""
msgid "Edit Pipeline Schedule %{id}" msgid "Edit Pipeline Schedule %{id}"
msgstr "" msgstr ""
...@@ -4587,6 +4602,9 @@ msgstr[1] "" ...@@ -4587,6 +4602,9 @@ msgstr[1] ""
msgid "New Label" msgid "New Label"
msgstr "" msgstr ""
msgid "New Milestone"
msgstr ""
msgid "New Pages Domain" msgid "New Pages Domain"
msgstr "" msgstr ""
...@@ -4629,6 +4647,9 @@ msgstr "" ...@@ -4629,6 +4647,9 @@ msgstr ""
msgid "New merge request" msgid "New merge request"
msgstr "" msgstr ""
msgid "New milestone"
msgstr ""
msgid "New pipelines will cancel older, pending pipelines on the same branch" msgid "New pipelines will cancel older, pending pipelines on the same branch"
msgstr "" msgstr ""
...@@ -4710,6 +4731,9 @@ msgstr "" ...@@ -4710,6 +4731,9 @@ msgstr ""
msgid "No messages were logged" msgid "No messages were logged"
msgstr "" msgstr ""
msgid "No milestones to show"
msgstr ""
msgid "No other labels with such name or description" msgid "No other labels with such name or description"
msgstr "" msgstr ""
...@@ -4994,6 +5018,9 @@ msgstr "" ...@@ -4994,6 +5018,9 @@ msgstr ""
msgid "Password" msgid "Password"
msgstr "" msgstr ""
msgid "Past due"
msgstr ""
msgid "Paste your public SSH key, which is usually contained in the file '~/.ssh/id_rsa.pub' and begins with 'ssh-rsa'. Don't use your private SSH key." msgid "Paste your public SSH key, which is usually contained in the file '~/.ssh/id_rsa.pub' and begins with 'ssh-rsa'. Don't use your private SSH key."
msgstr "" msgstr ""
...@@ -5902,6 +5929,9 @@ msgstr "" ...@@ -5902,6 +5929,9 @@ msgstr ""
msgid "Rename folder" msgid "Rename folder"
msgstr "" msgstr ""
msgid "Reopen milestone"
msgstr ""
msgid "Reply to this email directly or %{view_it_on_gitlab}." msgid "Reply to this email directly or %{view_it_on_gitlab}."
msgstr "" msgstr ""
...@@ -8085,6 +8115,9 @@ msgstr "" ...@@ -8085,6 +8115,9 @@ msgstr ""
msgid "Write a comment or drag your files here…" msgid "Write a comment or drag your files here…"
msgstr "" msgstr ""
msgid "Write milestone description..."
msgstr ""
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment