From 16a3a5429e8cd6293ff89a6eb44c19a7cfb41ec2 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Wed, 17 Nov 2010 20:18:43 +0100 Subject: [PATCH] Still display versions which are due today --- app/helpers/application_helper.rb | 7 ++++++- app/models/version.rb | 2 +- config/locales/de.yml | 1 + config/locales/en.yml | 1 + test/unit/helpers/application_helper_test.rb | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bf4e2d5..203ad6d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -167,7 +167,12 @@ module ApplicationHelper def due_date_distance_in_words(date) if date - l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date)) + if date == Date.today + l(:label_roadmap_due_today) + else + label = (date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in) + l(label, distance_of_date_in_words(Date.today, date)) + end end end diff --git a/app/models/version.rb b/app/models/version.rb index 95e6ad5..4139b60 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -71,7 +71,7 @@ class Version < ActiveRecord::Base # Returns true if the version is completed: due date reached and no open issues def completed? - effective_date && (effective_date <= Date.today) && (open_issues_count == 0) + effective_date && (effective_date < Date.today) && (open_issues_count == 0) end def behind_schedule? diff --git a/config/locales/de.yml b/config/locales/de.yml index 3c2a890..5ab65f0 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -649,6 +649,7 @@ de: label_sort_lowest: Ans Ende label_roadmap: Roadmap label_roadmap_due_in: "Fällig in {{value}}" + label_roadmap_due_doday: "Fällig heute" label_roadmap_overdue: "{{value}} verspätet" label_roadmap_no_issues: Keine Tickets für diese Version label_search: Suche diff --git a/config/locales/en.yml b/config/locales/en.yml index 3b4b802..4722d81 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -636,6 +636,7 @@ en: label_sort_lower: Move down label_sort_lowest: Move to bottom label_roadmap: Roadmap + label_roadmap_due_today: "Due today" label_roadmap_due_in: "Due in {{value}}" label_roadmap_overdue: "{{value}} late" label_roadmap_no_issues: No issues for this version diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 282a4cc..c7435c4 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -571,7 +571,7 @@ EXPECTED end def test_due_date_distance_in_words - to_test = { Date.today => 'Due in 0 days', + to_test = { Date.today => 'Due today', Date.today + 1 => 'Due in 1 day', Date.today + 100 => 'Due in about 3 months', Date.today + 20000 => 'Due in over 54 years', -- 1.7.2.1