diff --git a/django/contrib/humanize/templatetags/humanize.py b/django/contrib/humanize/templatetags/humanize.py index eaee734f75..2e0539610b 100644 --- a/django/contrib/humanize/templatetags/humanize.py +++ b/django/contrib/humanize/templatetags/humanize.py @@ -1,4 +1,6 @@ +# -*- encoding: utf-8 -*- from __future__ import unicode_literals + import re from datetime import date, datetime from decimal import Decimal @@ -194,20 +196,23 @@ def naturaltime(value): return _('now') elif delta.seconds < 60: return ungettext( - # Translators: \\u00a0 is non-breaking space - 'a second ago', '%(count)s\u00a0seconds ago', delta.seconds + # Translators: please keep a non-breaking space (U+00A0) + # between count and time unit. + 'a second ago', '%(count)s seconds ago', delta.seconds ) % {'count': delta.seconds} elif delta.seconds // 60 < 60: count = delta.seconds // 60 return ungettext( - # Translators: \\u00a0 is non-breaking space - 'a minute ago', '%(count)s\u00a0minutes ago', count + # Translators: please keep a non-breaking space (U+00A0) + # between count and time unit. + 'a minute ago', '%(count)s minutes ago', count ) % {'count': count} else: count = delta.seconds // 60 // 60 return ungettext( - # Translators: \\u00a0 is non-breaking space - 'an hour ago', '%(count)s\u00a0hours ago', count + # Translators: please keep a non-breaking space (U+00A0) + # between count and time unit. + 'an hour ago', '%(count)s hours ago', count ) % {'count': count} else: delta = value - now @@ -219,18 +224,21 @@ def naturaltime(value): return _('now') elif delta.seconds < 60: return ungettext( - # Translators: \\u00a0 is non-breaking space - 'a second from now', '%(count)s\u00a0seconds from now', delta.seconds + # Translators: please keep a non-breaking space (U+00A0) + # between count and time unit. + 'a second from now', '%(count)s seconds from now', delta.seconds ) % {'count': delta.seconds} elif delta.seconds // 60 < 60: count = delta.seconds // 60 return ungettext( - # Translators: \\u00a0 is non-breaking space - 'a minute from now', '%(count)s\u00a0minutes from now', count + # Translators: please keep a non-breaking space (U+00A0) + # between count and time unit. + 'a minute from now', '%(count)s minutes from now', count ) % {'count': count} else: count = delta.seconds // 60 // 60 return ungettext( - # Translators: \\u00a0 is non-breaking space - 'an hour from now', '%(count)s\u00a0hours from now', count + # Translators: please keep a non-breaking space (U+00A0) + # between count and time unit. + 'an hour from now', '%(count)s hours from now', count ) % {'count': count}