# HG changeset patch # User bsw # Date 1331464949 -3600 # Node ID 37a623b43e0a38ebac34a08611d811adc19e16c3 # Parent 852962dd9bb0184482c46f9af95d7b6b7247b7dc Show how many days ago a day is in event timeline diff -r 852962dd9bb0 -r 37a623b43e0a app/main/event/_list.lua --- a/app/main/event/_list.lua Sun Mar 11 12:21:54 2012 +0100 +++ b/app/main/event/_list.lua Sun Mar 11 12:22:29 2012 +0100 @@ -7,7 +7,8 @@ :add_order_by("event.id DESC") :limit(25) :join("issue", nil, "issue.id = event.issue_id") - + :add_field("now()::date - event.occurrence::date", "time_ago") + if event_max_id then event_selector:add_where{ "event.id < ?", event_max_id } end @@ -42,7 +43,20 @@ last_event_id = event.id if event.occurrence.date ~= last_event_date then - ui.container{ attr = { class = "date" }, content = format.date(event.occurrence.date) } + local days_ago_text + if event.time_ago == 0 then + days_ago_text = _"Today" + elseif event.time_ago == 1 then + days_ago_text = _"Yesterday" + else + days_ago_text = _("#{count} days ago", { count = event.time_ago }) + end + ui.container{ attr = { class = "date" }, content = function() + ui.tag{ content = format.date(event.occurrence.date) } + slot.put(" · ") + ui.tag{ content = days_ago_text } + end } + last_event_date = event.occurrence.date end local class = "issue"