← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/date.py

  • Committer: William Grant
  • Date: 2009-03-31 05:07:32 UTC
  • mto: (1165.3.1 submissions)
  • mto: This revision was merged to the branch mainline in revision 1174.
  • Revision ID: grantw@unimelb.edu.au-20090331050732-f6whz1z87dpekp2b
Add display_name properties to users and groups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/date.py
112
112
    if dt < now:
113
113
        if dt.date() == now.date():
114
114
            # Today.
115
 
            return dt.strftime('today at %I:%M %p')
 
115
            return dt.strftime('today at %H:%M')
116
116
        elif dt.date() == now.date() - datetime.timedelta(days=1):
117
117
            # Yesterday.
118
 
            return dt.strftime('yesterday at %I:%M %p')
 
118
            return dt.strftime('yesterday at %H:%M')
119
119
    elif dt > now:
120
120
        if dt.date() == now.date():
121
121
            # Today.
122
 
            return dt.strftime('today at %I:%M %p')
 
122
            return dt.strftime('today at %H:%M')
123
123
        elif dt.date() == now.date() + datetime.timedelta(days=1):
124
124
            # Tomorrow
125
 
            return dt.strftime('tomorrow at %I:%M %p')
 
125
            return dt.strftime('tomorrow at %H:%M')
126
126
 
127
 
    return dt.strftime('on %Y-%m-%d at %I:%M %p')
 
127
    return dt.strftime('on %Y-%m-%d at %H:%M')