Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-22 00:36:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

move tests from recurring_todo_test to respective repeat_pattern_tests

Browse source
This commit is contained in:
Reinier Balt 2014-03-05 09:37:34 +01:00
parent 0c153ef28c
commit 3cb18cd875
7 changed files with 163 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/models/recurring_todos/monthly_repeat_pattern.rb
View file

@ -44,20 +44,9 @@ module RecurringTodos
def recurrence_pattern
if recurrence_selector == 0
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", :n => every_xth_day) + " " + I18n.t('common.months') + on_day
else
I18n.t("todos.recurrence.pattern.every_month") + on_day
end
recurrence_pattern_for_specific_day
else
n_months = if get(:every_other2) > 1
"#{get(:every_other2)} #{I18n.t('common.months')}"
else
I18n.t('common.month')
end
I18n.t('todos.recurrence.pattern.every_xth_day_of_every_n_months',
:x => xth(every_xth_day), :day => day_of_week_as_text(day_of_week), :n_months => n_months)
recurrence_pattern_for_relative_day_in_month
end
end
@ -123,6 +112,29 @@ module RecurringTodos
end
end
private
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
else
I18n.t("todos.recurrence.pattern.every_month") + on_day
end
end
def recurrence_pattern_for_relative_day_in_month
n_months = if every_x_month2 > 1
"#{every_x_month2} #{I18n.t('common.months')}"
else
I18n.t('common.month')
end
I18n.t('todos.recurrence.pattern.every_xth_day_of_every_n_months',
x: xth(every_xth_day),
day: day_of_week_as_text(day_of_week),
n_months: n_months)
end
end
end