|
@@ -164,21 +164,9 @@ def index():
|
164
|
164
|
minutes = int((timedifference.seconds/60)%60)
|
165
|
165
|
hours = int(timedifference.seconds/60/60)
|
166
|
166
|
if hours == 0:
|
167
|
|
- if minutes == 1:
|
168
|
|
- result['publishedDate'] = gettext(u'1 minute ago')
|
169
|
|
- else:
|
170
|
|
- result['publishedDate'] = gettext(u'{minutes} minutes ago').format(minutes=minutes)
|
|
167
|
+ result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes)
|
171
|
168
|
else:
|
172
|
|
- if hours == 1:
|
173
|
|
- if minutes == 1:
|
174
|
|
- result['publishedDate'] = gettext(u'1 hour, 1 minute ago')
|
175
|
|
- else:
|
176
|
|
- result['publishedDate'] = gettext(u'1 hour, {minutes} minutes ago').format(minutes=minutes)
|
177
|
|
- else:
|
178
|
|
- if minutes == 1:
|
179
|
|
- result['publishedDate'] = gettext(u'{hours} hours, 1 minutes ago').format(hours=hours)
|
180
|
|
- else:
|
181
|
|
- result['publishedDate'] = gettext(u'{hours} hours, {minutes} minutes ago').format(hours=hours, minutes=minutes)
|
|
169
|
+ result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes)
|
182
|
170
|
else:
|
183
|
171
|
result['publishedDate'] = format_date(result['publishedDate'])
|
184
|
172
|
|