diff options
Diffstat (limited to 'app/helpers/milestones_helper.rb')
| -rw-r--r-- | app/helpers/milestones_helper.rb | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index 50aec83b867..c1a04640688 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -45,7 +45,7 @@ module MilestonesHelper when :closed issues.closed else - raise ArgumentError, "invalid milestone state `#{state}`" + raise ArgumentError, _("invalid milestone state `%{state}`") % { state: state } end issues.size @@ -145,8 +145,13 @@ module MilestonesHelper content = [] - content << n_("1 open issue", "%d open issues", issues["opened"]) % issues["opened"] if issues["opened"] - content << n_("1 closed issue", "%d closed issues", issues["closed"]) % issues["closed"] if issues["closed"] + if issues["opened"] + content << n_("1 open issue", "%{issues} open issues", issues["opened"]) % { issues: issues["opened"] } + end + + if issues["closed"] + content << n_("1 closed issue", "%{issues} closed issues", issues["closed"]) % { issues: issues["closed"] } + end content.join('<br />').html_safe end @@ -158,9 +163,9 @@ module MilestonesHelper content = [] - content << n_("1 open merge request", "%d open merge requests", merge_requests.opened.count) % merge_requests.opened.count if merge_requests.opened.any? - content << n_("1 closed merge request", "%d closed merge requests", merge_requests.closed.count) % merge_requests.closed.count if merge_requests.closed.any? - content << n_("1 merged merge request", "%d merged merge requests", merge_requests.merged.count) % merge_requests.merged.count if merge_requests.merged.any? + content << n_("1 open merge request", "%{merge_requests} open merge requests", merge_requests.opened.count) % { merge_requests: merge_requests.opened.count } if merge_requests.opened.any? + content << n_("1 closed merge request", "%{merge_requests} closed merge requests", merge_requests.closed.count) % { merge_requests: merge_requests.closed.count } if merge_requests.closed.any? + content << n_("1 merged merge request", "%{merge_requests} merged merge requests", merge_requests.merged.count) % { merge_requests: merge_requests.merged.count } if merge_requests.merged.any? content.join('<br />').html_safe end @@ -178,15 +183,15 @@ module MilestonesHelper "#{milestone.start_date.to_s(:medium)}–#{milestone.due_date.to_s(:medium)}" elsif milestone.due_date if milestone.due_date.past? - "expired on #{milestone.due_date.to_s(:medium)}" + _("expired on %{milestone_due_date}") % { milestone_due_date: milestone.due_date.strftime('%b %-d, %Y') } else - "expires on #{milestone.due_date.to_s(:medium)}" + _("expires on %{milestone_due_date}") % { milestone_due_date: milestone.due_date.strftime('%b %-d, %Y') } end elsif milestone.start_date if milestone.start_date.past? - "started on #{milestone.start_date.to_s(:medium)}" + _("started on %{milestone_start_date}") % { milestone_start_date: milestone.start_date.strftime('%b %-d, %Y') } else - "starts on #{milestone.start_date.to_s(:medium)}" + _("starts on %{milestone_start_date}") % { milestone_start_date: milestone.start_date.strftime('%b %-d, %Y') } end end end |