← 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-05-19 06:08:41 UTC
  • Revision ID: grantw@unimelb.edu.au-20090519060841-0m3nm6w30rze8pul
Drop leading 0s from pretty hours, and lowercase AM/PM.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/date.py
34
34
    "ddd mmm dd, yyyy h:m a"
35
35
    """
36
36
    dt = get_datetime(datetime_or_seconds)
37
 
    return dt.strftime("%a %b %d %Y, %I:%M %p")
 
37
    return dt.strftime("%a %b %d %Y, %l:%M%P")
38
38
 
39
39
def make_date_nice_short(datetime_or_seconds):
40
40
    """Generate a very compact human-readable representation of a date.
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 %l:%M%P')
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 %l:%M%P')
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 %l:%M%P')
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 %l:%M%P')
126
126
 
127
 
    return dt.strftime('on %Y-%m-%d at %I:%M %p')
 
127
    return dt.strftime('on %Y-%m-%d at %l:%M%P')