diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /app/helpers/timeboxes_helper.rb | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'app/helpers/timeboxes_helper.rb')
-rw-r--r-- | app/helpers/timeboxes_helper.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/helpers/timeboxes_helper.rb b/app/helpers/timeboxes_helper.rb index 39993bbfb44..11d09a79dcf 100644 --- a/app/helpers/timeboxes_helper.rb +++ b/app/helpers/timeboxes_helper.rb @@ -172,18 +172,19 @@ module TimeboxesHelper def timebox_date_range(timebox) if timebox.start_date && timebox.due_date - "#{timebox.start_date.to_s(:medium)}–#{timebox.due_date.to_s(:medium)}" + s_("DateRange|%{start_date}–%{end_date}") % { start_date: l(timebox.start_date, format: Date::DATE_FORMATS[:medium]), + end_date: l(timebox.due_date, format: Date::DATE_FORMATS[:medium]) } elsif timebox.due_date if timebox.due_date.past? - _("expired on %{timebox_due_date}") % { timebox_due_date: timebox.due_date.to_s(:medium) } + _("expired on %{timebox_due_date}") % { timebox_due_date: l(timebox.due_date, format: Date::DATE_FORMATS[:medium]) } else - _("expires on %{timebox_due_date}") % { timebox_due_date: timebox.due_date.to_s(:medium) } + _("expires on %{timebox_due_date}") % { timebox_due_date: l(timebox.due_date, format: Date::DATE_FORMATS[:medium]) } end elsif timebox.start_date if timebox.start_date.past? - _("started on %{timebox_start_date}") % { timebox_start_date: timebox.start_date.to_s(:medium) } + _("started on %{timebox_start_date}") % { timebox_start_date: l(timebox.start_date, format: Date::DATE_FORMATS[:medium]) } else - _("starts on %{timebox_start_date}") % { timebox_start_date: timebox.start_date.to_s(:medium) } + _("starts on %{timebox_start_date}") % { timebox_start_date: l(timebox.start_date, format: Date::DATE_FORMATS[:medium]) } end end end |