Commit c66aa1f8 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch...

Merge branch '22691-externalize-i18n-strings-from-./app/views/shared/milestones/_milestone.html.haml' into 'master'

Externalize i18n strings from ./app/views/shared/milestones/_milestone.html.haml

See merge request gitlab-org/gitlab!32154
parents 7c50c465 14e376a7
- dashboard = local_assigns[:dashboard] - dashboard = local_assigns[:dashboard]
- custom_dom_id = dom_id(milestone.try(:milestone) ? milestone.milestone : milestone) - custom_dom_id = dom_id(milestone.try(:milestone) ? milestone.milestone : milestone)
- milestone_type = milestone.group_milestone? ? 'Group Milestone' : 'Project Milestone' - milestone_type = milestone.group_milestone? ? s_('Milestones|Group Milestone') : s_('Milestones|Project Milestone')
%li{ class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: custom_dom_id } %li{ class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: custom_dom_id }
.row .row
...@@ -42,17 +42,17 @@ ...@@ -42,17 +42,17 @@
.col-sm-4.milestone-progress .col-sm-4.milestone-progress
= milestone_progress_bar(milestone) = milestone_progress_bar(milestone)
= link_to pluralize(milestone.total_issues_count, 'Issue'), issues_path = link_to pluralize(milestone.total_issues_count, _('Issue')), issues_path
- if milestone.merge_requests_enabled? - if milestone.merge_requests_enabled?
· ·
= link_to pluralize(milestone.merge_requests_visible_to_user(current_user).size, 'Merge Request'), merge_requests_path = link_to pluralize(milestone.merge_requests_visible_to_user(current_user).size, _('Merge Request')), merge_requests_path
.float-lg-right.light #{milestone.percent_complete}% complete .float-lg-right.light #{milestone.percent_complete}% complete
.col-sm-2 .col-sm-2
.milestone-actions.d-flex.justify-content-sm-start.justify-content-md-end .milestone-actions.d-flex.justify-content-sm-start.justify-content-md-end
- if @project - if @project
- if can_admin_project_milestones? and milestone.active? - if can_admin_project_milestones? and milestone.active?
- if can_admin_group_milestones? - if can_admin_group_milestones?
%button.js-promote-project-milestone-button.btn.btn-blank.btn-sm.btn-grouped.has-tooltip{ title: _('Promote to Group Milestone'), %button.js-promote-project-milestone-button.btn.btn-blank.btn-sm.btn-grouped.has-tooltip{ title: s_('Milestones|Promote to Group Milestone'),
disabled: true, disabled: true,
type: 'button', type: 'button',
data: { url: promote_project_milestone_path(milestone.project, milestone), data: { url: promote_project_milestone_path(milestone.project, milestone),
...@@ -63,15 +63,15 @@ ...@@ -63,15 +63,15 @@
toggle: 'modal' } } toggle: 'modal' } }
= sprite_icon('level-up', size: 14) = sprite_icon('level-up', size: 14)
= link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close btn-grouped" = link_to s_('Milestones|Close Milestone'), project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-sm btn-close btn-grouped"
- unless milestone.active? - unless milestone.active?
= link_to 'Reopen Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen" = link_to s_('Milestones|Reopen Milestone'), project_milestone_path(@project, milestone, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen"
- if @group - if @group
- if can?(current_user, :admin_milestone, @group) - if can?(current_user, :admin_milestone, @group)
- if milestone.closed? - if milestone.closed?
= link_to 'Reopen Milestone', group_milestone_route(milestone, {state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen" = link_to s_('Milestones|Reopen Milestone'), group_milestone_route(milestone, {state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen"
- else - else
= link_to 'Close Milestone', group_milestone_route(milestone, {state_event: :close }), method: :put, class: "btn btn-sm btn-grouped btn-close" = link_to s_('Milestones|Close Milestone'), group_milestone_route(milestone, {state_event: :close }), method: :put, class: "btn btn-sm btn-grouped btn-close"
- if dashboard - if dashboard
.label-badge.label-badge-gray .label-badge.label-badge-gray
= milestone_type = milestone_type
---
title: Externalize i18n strings from ./app/views/shared/milestones/_milestone.html.haml
merge_request: 32154
author: Gilang Gumilar
type: changed
...@@ -13734,6 +13734,9 @@ msgstr "" ...@@ -13734,6 +13734,9 @@ msgstr ""
msgid "Milestones| You’re about to permanently delete the milestone %{milestoneTitle}. This milestone is not currently used in any issues or merge requests." msgid "Milestones| You’re about to permanently delete the milestone %{milestoneTitle}. This milestone is not currently used in any issues or merge requests."
msgstr "" msgstr ""
msgid "Milestones|Close Milestone"
msgstr ""
msgid "Milestones|Completed Issues (closed)" msgid "Milestones|Completed Issues (closed)"
msgstr "" msgstr ""
...@@ -13746,21 +13749,33 @@ msgstr "" ...@@ -13746,21 +13749,33 @@ msgstr ""
msgid "Milestones|Failed to delete milestone %{milestoneTitle}" msgid "Milestones|Failed to delete milestone %{milestoneTitle}"
msgstr "" msgstr ""
msgid "Milestones|Group Milestone"
msgstr ""
msgid "Milestones|Milestone %{milestoneTitle} was not found" msgid "Milestones|Milestone %{milestoneTitle} was not found"
msgstr "" msgstr ""
msgid "Milestones|Ongoing Issues (open and assigned)" msgid "Milestones|Ongoing Issues (open and assigned)"
msgstr "" msgstr ""
msgid "Milestones|Project Milestone"
msgstr ""
msgid "Milestones|Promote %{milestoneTitle} to group milestone?" msgid "Milestones|Promote %{milestoneTitle} to group milestone?"
msgstr "" msgstr ""
msgid "Milestones|Promote Milestone" msgid "Milestones|Promote Milestone"
msgstr "" msgstr ""
msgid "Milestones|Promote to Group Milestone"
msgstr ""
msgid "Milestones|Promoting %{milestoneTitle} will make it available for all projects inside %{groupName}. Existing project milestones with the same title will be merged." msgid "Milestones|Promoting %{milestoneTitle} will make it available for all projects inside %{groupName}. Existing project milestones with the same title will be merged."
msgstr "" msgstr ""
msgid "Milestones|Reopen Milestone"
msgstr ""
msgid "Milestones|This action cannot be reversed." msgid "Milestones|This action cannot be reversed."
msgstr "" msgstr ""
...@@ -17098,9 +17113,6 @@ msgstr "" ...@@ -17098,9 +17113,6 @@ msgstr ""
msgid "Promote these project milestones into a group milestone." msgid "Promote these project milestones into a group milestone."
msgstr "" msgstr ""
msgid "Promote to Group Milestone"
msgstr ""
msgid "Promote to group label" msgid "Promote to group label"
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