Merge branch 'master' into new-gui

This commit is contained in:
Reinier Balt 2013-07-19 18:29:50 +02:00
commit ff1fa62d4d
17 changed files with 299 additions and 254 deletions

View file

@ -118,7 +118,7 @@ module TodosHelper
:collapsible => false,
:show_empty_containers => true,
:container_name => "#{period}",
:title =>t("todos.calendar.#{period}", :month => l(Time.zone.now, :format => "%B"))
:title =>t("todos.calendar.#{period}", :month => l(Time.zone.now, :format => "%B"), :next_month => l(1.month.from_now, :format => "%B"))
}
}
end