lingo/agendas/chrono.py

@@ -17,7 +17,7 @@
 import json
 
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from requests.exceptions import RequestException
 
 from lingo.agendas.models import Agenda

lingo/agendas/models.py

@@ -19,7 +19,7 @@ import copy
 from django.conf import settings
 from django.db import models
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from lingo.utils.misc import AgendaImportError, clean_import_data, generate_slug
 

lingo/api/serializers.py

@@ -16,7 +16,7 @@
 
 import datetime
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 

lingo/invoicing/forms.py

@@ -17,7 +17,7 @@
 
 import django_filters
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from lingo.invoicing.models import Campaign, DraftInvoice, DraftInvoiceLine, Invoice, InvoiceLine
 

lingo/invoicing/utils.py

@@ -18,7 +18,7 @@ import collections
 import datetime
 
 from django.test.client import RequestFactory
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from lingo.agendas.chrono import get_check_status, get_subscriptions
 from lingo.agendas.models import Agenda

lingo/invoicing/views.py

@@ -26,8 +26,8 @@ from django.db.models.functions import Coalesce
 from django.http import Http404, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse, reverse_lazy
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext
 from django.views.generic import (
     CreateView,
     DeleteView,
@@ -190,12 +190,12 @@ class RegiesImportView(FormView):
             return self.form_invalid(form)
 
         import_messages = {
-            'create': lambda x: ungettext(
+            'create': lambda x: ngettext(
                 'A regie was created.',
                 '%(count)d regies were created.',
                 x,
             ),
-            'update': lambda x: ungettext(
+            'update': lambda x: ngettext(
                 'A regie was updated.',
                 '%(count)d regie were updated.',
                 x,
@@ -369,7 +369,9 @@ class PoolDetailView(ListView):
 
         data = self.request.GET or None
         self.filterset = filter_model(
-            data=data, queryset=invoice_model.objects.filter(pool=self.object), pool=self.object
+            data=data,
+            queryset=invoice_model.objects.filter(pool=self.object).order_by('created_at'),
+            pool=self.object,
         )
         return self.filterset.qs
 

lingo/manager/views.py

@@ -18,8 +18,8 @@ import json
 
 from django.http import HttpResponse
 from django.urls import reverse
-from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import force_str
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 
 
@@ -35,7 +35,7 @@ def menu_json(request):
     json_str = json.dumps(
         [
             {
-                'label': force_text(label),
+                'label': force_str(label),
                 'slug': 'lingo',
                 'url': request.build_absolute_uri(reverse('lingo-manager-homepage')),
             }

lingo/pricing/forms.py

@@ -20,8 +20,8 @@ from django import forms
 from django.forms import ValidationError
 from django.template import Template, TemplateSyntaxError
 from django.utils.timezone import make_aware, now
+from django.utils.translation import gettext_lazy as _
 from django.utils.translation import pgettext_lazy
-from django.utils.translation import ugettext_lazy as _
 
 from lingo.agendas.chrono import ChronoError, get_event
 from lingo.agendas.models import Agenda, CheckType

lingo/pricing/models.py

@@ -24,7 +24,7 @@ from django.contrib.postgres.fields import JSONField
 from django.db import models
 from django.template import Context, RequestContext, Template, TemplateSyntaxError, VariableDoesNotExist
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from lingo.agendas.models import Agenda, CheckType
 from lingo.utils.misc import AgendaImportError, clean_import_data, generate_slug

lingo/pricing/views.py

@@ -25,9 +25,9 @@ from django.db.models import Prefetch
 from django.http import Http404, HttpResponse, HttpResponseBadRequest, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
 from django.urls import reverse, reverse_lazy
-from django.utils.encoding import force_text
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ungettext
+from django.utils.encoding import force_str
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext
 from django.views.generic import (
     CreateView,
     DeleteView,
@@ -104,7 +104,7 @@ class ConfigImportView(FormView):
 
     def form_valid(self, form):
         try:
-            config_json = json.loads(force_text(self.request.FILES['config_json'].read()))
+            config_json = json.loads(force_str(self.request.FILES['config_json'].read()))
         except ValueError:
             form.add_error('config_json', _('File is not in the expected JSON format.'))
             return self.form_invalid(form)
@@ -121,7 +121,7 @@ class ConfigImportView(FormView):
         import_messages = {
             'agendas': {
                 'update_noop': _('No agenda updated.'),
-                'update': lambda x: ungettext(
+                'update': lambda x: ngettext(
                     'An agenda has been updated.',
                     '%(count)d agendas have been updated.',
                     x,
@@ -129,13 +129,13 @@ class ConfigImportView(FormView):
             },
             'check_type_groups': {
                 'create_noop': _('No check type group created.'),
-                'create': lambda x: ungettext(
+                'create': lambda x: ngettext(
                     'A check type group has been created.',
                     '%(count)d check type groups have been created.',
                     x,
                 ),
                 'update_noop': _('No check type group updated.'),
-                'update': lambda x: ungettext(
+                'update': lambda x: ngettext(
                     'A check type group has been updated.',
                     '%(count)d check type groups have been updated.',
                     x,
@@ -143,13 +143,13 @@ class ConfigImportView(FormView):
             },
             'pricing_categories': {
                 'create_noop': _('No pricing criteria category created.'),
-                'create': lambda x: ungettext(
+                'create': lambda x: ngettext(
                     'A pricing criteria category has been created.',
                     '%(count)d pricing criteria categories have been created.',
                     x,
                 ),
                 'update_noop': _('No pricing criteria category updated.'),
-                'update': lambda x: ungettext(
+                'update': lambda x: ngettext(
                     'A pricing criteria category has been updated.',
                     '%(count)d pricing criteria categories have been updated.',
                     x,
@@ -157,13 +157,13 @@ class ConfigImportView(FormView):
             },
             'pricing_models': {
                 'create_noop': _('No pricing model created.'),
-                'create': lambda x: ungettext(
+                'create': lambda x: ngettext(
                     'A pricing model has been created.',
                     '%(count)d pricing models have been created.',
                     x,
                 ),
                 'update_noop': _('No pricing model updated.'),
-                'update': lambda x: ungettext(
+                'update': lambda x: ngettext(
                     'A pricing model has been updated.',
                     '%(count)d pricing models have been updated.',
                     x,
@@ -171,13 +171,13 @@ class ConfigImportView(FormView):
             },
             'pricings': {
                 'create_noop': _('No pricing created.'),
-                'create': lambda x: ungettext(
+                'create': lambda x: ngettext(
                     'A pricing has been created.',
                     '%(count)d pricings have been created.',
                     x,
                 ),
                 'update_noop': _('No pricing updated.'),
-                'update': lambda x: ungettext(
+                'update': lambda x: ngettext(
                     'A pricing has been updated.',
                     '%(count)d pricings have been updated.',
                     x,

lingo/utils/misc.py

@@ -19,7 +19,7 @@ import urllib.parse
 
 from django.conf import settings
 from django.core.exceptions import FieldDoesNotExist, ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class AgendaImportError(Exception):