0005-replaced-ungettext-with-ngettext-equivalent-68183.patch
combo/apps/dataviz/models.py | ||
---|---|---|
35 | 35 |
from django.utils.functional import cached_property |
36 | 36 |
from django.utils.translation import gettext |
37 | 37 |
from django.utils.translation import gettext_lazy as _ |
38 |
from django.utils.translation import ungettext
|
|
38 |
from django.utils.translation import ngettext |
|
39 | 39 |
from requests.exceptions import RequestException |
40 | 40 | |
41 | 41 |
from combo.data.library import register_cell_class |
... | ... | |
632 | 632 |
days = value // 86400 |
633 | 633 |
hours = (value % 86400) // 3600 |
634 | 634 |
if days: |
635 |
days_string = ungettext('%d day', '%d days', days) % days
|
|
635 |
days_string = ngettext('%d day', '%d days', days) % days |
|
636 | 636 |
if hours: |
637 |
hours_string = ungettext('%d hour', '%d hours', hours) % hours
|
|
637 |
hours_string = ngettext('%d hour', '%d hours', hours) % hours |
|
638 | 638 |
if days and hours: |
639 | 639 |
value = _('%(days_string)s and %(hours_string)s') % { |
640 | 640 |
'days_string': days_string, |
641 |
- |