diff --git a/aircox/admin/episode.py b/aircox/admin/episode.py index a6291a7..9cf7eb8 100644 --- a/aircox/admin/episode.py +++ b/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 diff --git a/aircox/admin/page.py b/aircox/admin/page.py index a139f5c..f9bebaf 100644 --- a/aircox/admin/page.py +++ b/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 diff --git a/aircox/admin/program.py b/aircox/admin/program.py index 12e9390..e7f1710 100644 --- a/aircox/admin/program.py +++ b/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 diff --git a/aircox/admin/sound.py b/aircox/admin/sound.py index b2e4d3a..9a03f53 100644 --- a/aircox/admin/sound.py +++ b/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 diff --git a/aircox/admin_site.py b/aircox/admin_site.py index edddc9e..2db7e65 100644 --- a/aircox/admin_site.py +++ b/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 diff --git a/aircox/models/article.py b/aircox/models/article.py index 259bf2e..3c884be 100644 --- a/aircox/models/article.py +++ b/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 diff --git a/aircox/models/episode.py b/aircox/models/episode.py index dd3c6a4..2c54a2a 100644 --- a/aircox/models/episode.py +++ b/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 diff --git a/aircox/models/log.py b/aircox/models/log.py index ac7765a..5bb059a 100644 --- a/aircox/models/log.py +++ b/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 diff --git a/aircox/models/page.py b/aircox/models/page.py index 8ad82d4..c0f48a8 100644 --- a/aircox/models/page.py +++ b/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 diff --git a/aircox/models/program.py b/aircox/models/program.py index 13fee7b..381f704 100644 --- a/aircox/models/program.py +++ b/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 diff --git a/aircox/models/sound.py b/aircox/models/sound.py index 4b363e3..7892441 100644 --- a/aircox/models/sound.py +++ b/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 diff --git a/aircox/models/station.py b/aircox/models/station.py index 7ec7be9..80eccd5 100644 --- a/aircox/models/station.py +++ b/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 diff --git a/aircox/urls.py b/aircox/urls.py index 00be106..d19d5ad 100755 --- a/aircox/urls.py +++ b/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 diff --git a/aircox/views/admin.py b/aircox/views/admin.py index b037e0f..c54183b 100644 --- a/aircox/views/admin.py +++ b/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 diff --git a/aircox/views/article.py b/aircox/views/article.py index 02dabbc..c8b8632 100644 --- a/aircox/views/article.py +++ b/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 diff --git a/aircox/views/episode.py b/aircox/views/episode.py index 36eb0fa..d20d5e0 100644 --- a/aircox/views/episode.py +++ b/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 diff --git a/aircox/views/home.py b/aircox/views/home.py index 71c8a4a..b78f81f 100644 --- a/aircox/views/home.py +++ b/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 diff --git a/aircox/views/page.py b/aircox/views/page.py index 7c17d3a..d8e0e44 100644 --- a/aircox/views/page.py +++ b/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 diff --git a/requirements.txt b/requirements.txt index b18af41..d4e15d9 100755 --- a/requirements.txt +++ b/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