test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #21415 -- Replaced escape sequence by literal non-breaking space 

Unfortunately, escape sequences (\x.. or \u....) do not fit well
with the gettext toolchain. Falling back to using literal char,
even if visibility is not ideal.
This commit is contained in:
glts 2013-11-13 20:16:39 +01:00 committed by Claude Paroz
parent 115fd140ab
commit 7e0ebd74c1
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
django/contrib/humanize/templatetags/humanize.py
View File

@ -1,4 +1,6 @@
# -*- encoding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
import re import re
from datetime import date, datetime from datetime import date, datetime
from decimal import Decimal from decimal import Decimal
@ -202,20 +204,23 @@ def naturaltime(value):
return _('now') return _('now')
elif delta.seconds < 60: elif delta.seconds < 60:
return ungettext( return ungettext(
# Translators: \\u00a0 is non-breaking space # Translators: please keep a non-breaking space (U+00A0)
'a second ago', '%(count)s\u00a0seconds ago', delta.seconds # between count and time unit.
'a second ago', '%(count)s seconds ago', delta.seconds
) % {'count': delta.seconds} ) % {'count': delta.seconds}
elif delta.seconds // 60 < 60: elif delta.seconds // 60 < 60:
count = delta.seconds // 60 count = delta.seconds // 60
return ungettext( return ungettext(
# Translators: \\u00a0 is non-breaking space # Translators: please keep a non-breaking space (U+00A0)
'a minute ago', '%(count)s\u00a0minutes ago', count # between count and time unit.
'a minute ago', '%(count)s minutes ago', count
) % {'count': count} ) % {'count': count}
else: else:
count = delta.seconds // 60 // 60 count = delta.seconds // 60 // 60
return ungettext( return ungettext(
# Translators: \\u00a0 is non-breaking space # Translators: please keep a non-breaking space (U+00A0)
'an hour ago', '%(count)s\u00a0hours ago', count # between count and time unit.
'an hour ago', '%(count)s hours ago', count
) % {'count': count} ) % {'count': count}
else: else:
delta = value - now delta = value - now
@ -227,18 +232,21 @@ def naturaltime(value):
return _('now') return _('now')
elif delta.seconds < 60: elif delta.seconds < 60:
return ungettext( return ungettext(
# Translators: \\u00a0 is non-breaking space # Translators: please keep a non-breaking space (U+00A0)
'a second from now', '%(count)s\u00a0seconds from now', delta.seconds # between count and time unit.
'a second from now', '%(count)s seconds from now', delta.seconds
) % {'count': delta.seconds} ) % {'count': delta.seconds}
elif delta.seconds // 60 < 60: elif delta.seconds // 60 < 60:
count = delta.seconds // 60 count = delta.seconds // 60
return ungettext( return ungettext(
# Translators: \\u00a0 is non-breaking space # Translators: please keep a non-breaking space (U+00A0)
'a minute from now', '%(count)s\u00a0minutes from now', count # between count and time unit.
'a minute from now', '%(count)s minutes from now', count
) % {'count': count} ) % {'count': count}
else: else:
count = delta.seconds // 60 // 60 count = delta.seconds // 60 // 60
return ungettext( return ungettext(
# Translators: \\u00a0 is non-breaking space # Translators: please keep a non-breaking space (U+00A0)
'an hour from now', '%(count)s\u00a0hours from now', count # between count and time unit.
'an hour from now', '%(count)s hours from now', count
) % {'count': count} ) % {'count': count}