# HG changeset patch # User Nicolas Chauvat # Date 1307382877 -7200 # Node ID 9f116f9b3be8a95e5f1bfd28803901493a5503bb # Parent a7daba4046dbfc731c043238227a101c26116f61 [datetime] by default display 'UTC' string when displaying TZDatetime diff -r a7daba4046db -r 9f116f9b3be8 uilib.py --- a/uilib.py Mon Jun 06 17:44:43 2011 +0200 +++ b/uilib.py Mon Jun 06 19:54:37 2011 +0200 @@ -62,12 +62,18 @@ return value if attrtype == 'Date': return ustrftime(value, req.property_value('ui.date-format')) - if attrtype in ('Time', 'TZTime'): + if attrtype == 'Time': return ustrftime(value, req.property_value('ui.time-format')) - if attrtype in ('Datetime', 'TZDatetime'): + if attrtype == 'TZTime': + return ustrftime(value, req.property_value('ui.time-format')) + u' UTC' + if attrtype == 'Datetime': if displaytime: return ustrftime(value, req.property_value('ui.datetime-format')) return ustrftime(value, req.property_value('ui.date-format')) + if attrtype == 'TZDatetime': + if displaytime: + return ustrftime(value, req.property_value('ui.datetime-format')) + u' UTC' + return ustrftime(value, req.property_value('ui.date-format')) if attrtype == 'Boolean': if value: return req._('yes')