From e66f1a156ab0d093610aa3e4b9bd960669eb05de Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Sat, 9 May 2015 19:06:08 +0200 Subject: [PATCH 1/3] refactor --- app/helpers/application_helper.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ecc31679..43c3634e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -107,13 +107,15 @@ module ApplicationHelper end def recurrence_pattern_as_text(recurring_todo) - rt = recurring_todo.recurring_target_as_text - rp = recurring_todo.recurrence_pattern - rp = " " + rp unless rp.nil? - rts = recurrence_time_span(recurring_todo) - # only add space if recurrence_time_span has content - rts = " " + rts unless rts == "" - return rt+rp+rts + recurring_target = recurring_todo.recurring_target_as_text + + recurrence_pattern = recurring_todo.recurrence_pattern + recurrence_pattern = ' ' + recurrence_pattern unless recurrence_pattern.nil? + + recurrence_time_span = recurrence_time_span(recurring_todo) + recurrence_time_span = ' ' + recurrence_time_span unless recurrence_time_span.empty? + + recurring_target + recurrence_pattern + recurrence_time_span end def date_format_for_date_picker() From 72f75136505dcb2b183890ba23ff0aa9f7a6bde4 Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Sat, 9 May 2015 19:21:01 +0200 Subject: [PATCH 2/3] fix #1847 --- app/models/recurring_todos/monthly_recurrence_pattern.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/recurring_todos/monthly_recurrence_pattern.rb b/app/models/recurring_todos/monthly_recurrence_pattern.rb index 7bb73612..7eea8852 100644 --- a/app/models/recurring_todos/monthly_recurrence_pattern.rb +++ b/app/models/recurring_todos/monthly_recurrence_pattern.rb @@ -118,8 +118,8 @@ module RecurringTodos def recurrence_pattern_for_specific_day on_day = " #{I18n.t('todos.recurrence.pattern.on_day_n', :n => every_x_day)}" - if every_xth_day(0) > 1 - I18n.t("todos.recurrence.pattern.every_n_months", :n => every_xth_day) + on_day + if every_x_month > 1 + I18n.t("todos.recurrence.pattern.every_n_months", :n => every_x_month) + on_day else I18n.t("todos.recurrence.pattern.every_month") + on_day end From 47d0364dbd61c895e3cebe3cda3205d77e56475a Mon Sep 17 00:00:00 2001 From: Carsten Otto Date: Sun, 10 May 2015 14:11:08 +0200 Subject: [PATCH 3/3] fix test every_other3 encodes 1:first to 4:fourth and 5:last weekday of month every_other2 encodes every nth month --- .../recurring_todos/monthly_recurrence_pattern_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/models/recurring_todos/monthly_recurrence_pattern_test.rb b/test/models/recurring_todos/monthly_recurrence_pattern_test.rb index a84eb810..40296b01 100644 --- a/test/models/recurring_todos/monthly_recurrence_pattern_test.rb +++ b/test/models/recurring_todos/monthly_recurrence_pattern_test.rb @@ -104,10 +104,10 @@ module RecurringTodos assert_equal "every last friday of every month", rt.recurrence_pattern rt.recurrence_selector = 0 - assert_equal "every 5 months on day 1", rt.recurrence_pattern - - rt.every_other3 = 1 assert_equal "every month on day 1", rt.recurrence_pattern + + rt.every_other2 = 4 + assert_equal "every 4 months on day 1", rt.recurrence_pattern end def test_monthly_pattern