fix issue #9

aircox/admin/episode.py

@@ -1,7 +1,7 @@
 import copy
 
 from django.contrib import admin
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import gettext as _, gettext_lazy
 
 from ..models import Episode, Diffusion, Sound, Track
 

aircox/admin/page.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from adminsortable2.admin import SortableInlineAdminMixin
 

aircox/admin/program.py

@@ -1,7 +1,7 @@
 from copy import deepcopy
 
 from django.contrib import admin
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from ..models import Program, Schedule, Stream
 from .page import PageAdmin

aircox/admin/sound.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import gettext as _, gettext_lazy
 
 from adminsortable2.admin import SortableInlineAdminMixin
 

aircox/admin_site.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.urls import path, include, reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework.routers import DefaultRouter
 

aircox/models/article.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .page import Page, PageQuerySet
 from .program import Program, ProgramChildQuerySet

aircox/models/episode.py

@@ -3,7 +3,7 @@ import datetime
 from django.db import models
 from django.db.models import Q
 from django.utils import timezone as tz
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils.functional import cached_property
 
 

aircox/models/log.py

@@ -4,7 +4,7 @@ import os
 
 from django.db import models
 from django.utils import timezone as tz
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 from aircox import settings

aircox/models/page.py

@@ -6,7 +6,7 @@ from django.urls import reverse
 from django.utils import timezone as tz
 from django.utils.text import slugify
 from django.utils.html import format_html
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils.functional import cached_property
 
 import bleach

aircox/models/program.py

@@ -12,7 +12,7 @@ from django.db import models
 from django.db.models import F, Q
 from django.db.models.functions import Concat, Substr
 from django.utils import timezone as tz
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils.functional import cached_property
 
 from aircox import settings, utils

aircox/models/sound.py

@@ -6,7 +6,7 @@ from django.conf import settings as main_settings
 from django.db import models
 from django.db.models import Q
 from django.utils import timezone as tz
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from taggit.managers import TaggableManager
 

aircox/models/station.py

@@ -1,7 +1,7 @@
 import os
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from filer.fields.image import FilerImageField
 

aircox/urls.py

@@ -1,5 +1,5 @@
 from django.urls import include, path, register_converter
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework.routers import DefaultRouter
 

aircox/views/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import ListView
 
 from .log import LogListView

aircox/views/article.py

@@ -13,14 +13,9 @@ class ArticleDetailView(PageDetailView):
     def get_sidebar_queryset(self):
         qs = Article.objects.select_related('cover') \
                     .filter(is_static=False) \
-                    .order_by('-date')
+                    .order_by('-pub_date')
         return qs
 
-    def get_context_data(self, **kwargs):
-        if self.object.program is not None:
-            kwargs.setdefault('parent', self.object.program)
-        return super().get_context_data(**kwargs)
-
 
 class ArticleListView(ParentMixin, PageListView):
     model = Article

aircox/views/episode.py

@@ -2,7 +2,7 @@ from collections import OrderedDict
 import datetime
 
 from django.views.generic import ListView
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from ..models import Diffusion, Episode, Program, Sound
 from .base import BaseView

aircox/views/home.py

@@ -1,6 +1,6 @@
 import datetime
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.utils import timezone as tz
 
 from ..models import Diffusion, Log, Page

aircox/views/page.py

@@ -1,6 +1,6 @@
 
 from django.http import Http404, HttpResponse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, ListView
 
 from honeypot.decorators import check_honeypot

requirements.txt

@@ -1,4 +1,4 @@
-Django>=2.2.0,<3.0.0
+Django>=3.0
 djangorestframework>=3.9.4
 django-model-utils>=3.2.0
 django-filter>=2.2.0