merging tracks master

This commit is contained in:
sfischme 2011-09-27 06:35:48 -04:00
commit 5b95092c08
2 changed files with 22 additions and 2 deletions

View file

@ -1,4 +1,7 @@
<%
require 'htmlentities'
htmlentities = HTMLEntities.new
todo = text_todo
if (todo.starred?)
@ -8,11 +11,11 @@ else
end
if (todo.completed?) && todo.completed_at
result_string << "["+ t('todos.completed') +": " + format_date(todo.completed_at) + "] "
result_string << "["+ htmlentities.decode(t('todos.completed')) +": " + format_date(todo.completed_at) + "] "
end
if todo.due
result_string << "[" + t('todos.due') + ": " + format_date(todo.due) + "] "
result_string << "[" + htmlentities.decode(t('todos.due')) + ": " + format_date(todo.due) + "] "
result_string << todo.description + " "
else
result_string << todo.description + " "