From ef00fc25f7ebef0d3e3fb63f4a8c2b1d1c6b5414 Mon Sep 17 00:00:00 2001 From: xeniac Date: Thu, 20 Jul 2023 22:56:13 +0200 Subject: [PATCH] Fixed: ugettext has been deprecated Fixed: Deprecatios for Django 4.0 Changed: path instead of url_path Added: fiaxateranking command --- requirements/base.txt | 2 +- src/content/context_processors.py | 6 +- src/content/locale/de/LC_MESSAGES/django.po | 10 +-- src/content/models.py | 2 +- src/content/news_urls.py | 27 +++----- .../templates/content/article_archive.html | 2 +- src/events/gallery_urls.py | 19 ++--- src/events/locale/de/LC_MESSAGES/django.po | 14 ++-- .../migrations/0007_auto_20161012_2224.py | 8 +-- src/events/urls.py | 26 +++---- src/kasu/locale/de/LC_MESSAGES/django.po | 10 +-- src/kasu/settings.py | 4 ++ src/kasu/templates/base.html | 12 ++-- src/kasu/templates/paginator.html | 2 +- src/kasu/urls.py | 69 +++++++++---------- src/kasu/xlsx.py | 3 + .../locale/de/LC_MESSAGES/django.po | 54 +++++++-------- .../management/commands/fixateranking.py | 56 +++++++++++++++ .../management/commands/resetdanranking.py | 2 +- src/mahjong_ranking/managers.py | 5 +- src/mahjong_ranking/models.py | 24 +++++-- .../mahjong_ranking/ladder_redbox.html | 2 +- .../mahjong_ranking/player_ladder_score.html | 2 +- src/mahjong_ranking/urls.py | 50 +++++--------- .../locale/de/LC_MESSAGES/django.po | 4 +- .../templates/maistar_ranking/page.html | 2 +- .../maistar_ranking/ranking_list.html | 2 +- src/maistar_ranking/urls.py | 28 +++----- .../locale/de/LC_MESSAGES/django.po | 18 ++--- .../membership/membership_detail.html | 4 +- src/membership/urls.py | 47 +++++-------- src/utils/locale/de/LC_MESSAGES/django.po | 2 +- 32 files changed, 266 insertions(+), 252 deletions(-) create mode 100644 src/mahjong_ranking/management/commands/fixateranking.py diff --git a/requirements/base.txt b/requirements/base.txt index 9c632a2..190368f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -8,7 +8,7 @@ django-compressor django-extra-views django-markdown django-recaptcha -git+https://github.com/SmileyChris/easy-thumbnails.git +easy_thumbnails[svg] icalendar openpyxl markdown diff --git a/src/content/context_processors.py b/src/content/context_processors.py index 85f1d9a..ba03150 100644 --- a/src/content/context_processors.py +++ b/src/content/context_processors.py @@ -19,9 +19,9 @@ def content_menus(request): :param request: a Django request object :return: a dict with the template variables mentioned above """ - current_page = models.Page() - current_top_page = models.Page() - current_path = request.path_info[1:request.path_info.rfind('.')] + current_page: models.Page = models.Page.objects.get(slug='index') + current_top_page: models.Page = models.Page.objects.get(slug='index') + current_path: str = request.path_info[1:request.path_info.rfind('.')] # erzeuge das Top-Level Menü top_level_pages = cache.get('top_level_pages') diff --git a/src/content/locale/de/LC_MESSAGES/django.po b/src/content/locale/de/LC_MESSAGES/django.po index 12a2e5b..1d9b63d 100644 --- a/src/content/locale/de/LC_MESSAGES/django.po +++ b/src/content/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kasu.content\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-13 23:38+0100\n" +"POT-Creation-Date: 2023-06-09 22:00+0200\n" "PO-Revision-Date: 2018-01-12 15:25+0105\n" "Last-Translator: b'Christian Berg '\n" "Language-Team: Deutsch <>\n" @@ -206,7 +206,7 @@ msgstr "Erstellt am" msgid "share on" msgstr "Teile auf" -#: templates/content/article_detail.html:48 views.py:156 +#: templates/content/article_detail.html:48 views.py:159 msgid "Edit Article" msgstr "Artikel bearbeiten" @@ -249,16 +249,16 @@ msgstr "HTML spezifisch" msgid "This Category does not exist." msgstr "Diese Kategorie existiert nicht." -#: views.py:157 +#: views.py:160 msgid "Create Article" msgstr "Artikel erstellen" -#: views.py:237 +#: views.py:240 #, python-format msgid "No Page found matching the Path %s" msgstr "Keine Seite unter dem Pfad %s gefunden" -#: views.py:266 +#: views.py:269 #, python-format msgid "No PDF Document found matching the Path %s" msgstr "Kein PDF Dokument unter dem Pfad %s gefunden." diff --git a/src/content/models.py b/src/content/models.py index f6b9eb1..9dc09e0 100644 --- a/src/content/models.py +++ b/src/content/models.py @@ -216,7 +216,7 @@ class Page(models.Model): blank=True, null=True, related_name='subpages', - on_delete=models.SET_NULL + on_delete=models.CASCADE ) position = models.PositiveSmallIntegerField( blank=True, diff --git a/src/content/news_urls.py b/src/content/news_urls.py index 41235e5..7abbc07 100644 --- a/src/content/news_urls.py +++ b/src/content/news_urls.py @@ -4,26 +4,19 @@ Created on 03.10.2011 @author: christian """ -from django.conf.urls import url +from django.urls import path from .views import ArticleArchiveIndex, ArticleForm, ArticleYearArchive, \ ArticleMonthArchive, ArticleDetail - urlpatterns = [ - url(r'^$', ArticleArchiveIndex.as_view(), name='article-archive'), - url(r'^add/$', ArticleForm.as_view(), name='add-article'), - url(r'^edit/(?P[\d]+)/$', ArticleForm.as_view(), name='edit-article'), - url(r'^(?P[\d]{4})/$', ArticleYearArchive.as_view(), - name='article-archive'), - url(r'^(?P[\d]{4})/(?P[\d]+)/$', ArticleMonthArchive.as_view(), - name='article-archive'), - url(r'^(?P[\d]{4})/(?P[\d]+)/(?P[\-\d\w]+)/$', - ArticleDetail.as_view(), name='show-article'), - url(r'^(?P[\-\d\w]+)/$', ArticleArchiveIndex.as_view(), - name='article-archive'), - url(r'^(?P[\-\d\w]+)/(?P[\d]{4})/$', - ArticleYearArchive.as_view(), name='article-archive'), - url(r'^(?P[\-\d\w]+)/(?P[\d]{4})/(?P[\d]+)/$', - ArticleMonthArchive.as_view(), name='article-archive'), + path("", ArticleArchiveIndex.as_view(), name='article-archive'), + path('add/', ArticleForm.as_view(), name='add-article'), + path('edit//', ArticleForm.as_view(), name='edit-article'), + path('/', ArticleYearArchive.as_view(), name='article-archive'), + path('//', ArticleMonthArchive.as_view(), name='article-archive'), + path('///', ArticleDetail.as_view(), name='show-article'), + path('/', ArticleArchiveIndex.as_view(), name='article-archive'), + path('//', ArticleYearArchive.as_view(), name='article-archive'), + path('///', ArticleMonthArchive.as_view(), name='article-archive'), ] diff --git a/src/content/templates/content/article_archive.html b/src/content/templates/content/article_archive.html index 1c3353b..e13aa0e 100755 --- a/src/content/templates/content/article_archive.html +++ b/src/content/templates/content/article_archive.html @@ -56,7 +56,7 @@ {% if not active_category %} class="active" {% endif %}>{% trans 'All Categories' %} {% for category in categories %}
  • {{ category.name }}
    • + {% if category.slug == active_category.slug %} class="active"{% endif %}>{{ category.name }} {% endfor %} {% endblock %} diff --git a/src/events/gallery_urls.py b/src/events/gallery_urls.py index 672a39b..bd29e91 100644 --- a/src/events/gallery_urls.py +++ b/src/events/gallery_urls.py @@ -1,18 +1,13 @@ """ urls for the event gallery part of the events app. """ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^$', views.EventGallery.as_view(), name='event-gallery'), - url(r'^(?P[\d]+)/$', views.EventPhotoList.as_view(), - name='event-photo-list'), - url(r'^(?P[\d]+)/upload/$', views.EventPhotoUpload.as_view(), - name='event-photo-upload'), - url(r'^(?P[\d]+)/(?P[\d]+)/$', views.EventPhoto.as_view(), - name='event-photo'), - url(r'^delete/(?P[\d]+)/$', views.DeleteEventPhoto.as_view(), - name='delete-event-photo'), - url(r'^upload/$', views.EventPhotoUpload.as_view(), - name='event-photo-upload'), + path("", views.EventGallery.as_view(), name='event-gallery'), + path('/', views.EventPhotoList.as_view(), name='event-photo-list'), + path('/upload/', views.EventPhotoUpload.as_view(), name='event-photo-upload'), + path('//', views.EventPhoto.as_view(), name='event-photo'), + path('delete//', views.DeleteEventPhoto.as_view(), name='delete-event-photo'), + path('upload/', views.EventPhotoUpload.as_view(), name='event-photo-upload'), ] diff --git a/src/events/locale/de/LC_MESSAGES/django.po b/src/events/locale/de/LC_MESSAGES/django.po index ffac328..8418cd4 100644 --- a/src/events/locale/de/LC_MESSAGES/django.po +++ b/src/events/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kasu.events\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-13 23:38+0100\n" +"POT-Creation-Date: 2023-06-11 10:15+0200\n" "PO-Revision-Date: 2018-01-12 15:25+0105\n" "Last-Translator: b'Christian Berg '\n" "Language-Team: Kasu \n" @@ -23,19 +23,19 @@ msgstr "" msgid "Event Series" msgstr "Veranstaltungsreihen" -#: forms.py:17 +#: forms.py:38 msgid "Images" msgstr "Bilder" -#: forms.py:46 +#: forms.py:61 msgid "start" msgstr "Beginn" -#: forms.py:49 +#: forms.py:64 msgid "end" msgstr "Ende" -#: mixins.py:76 +#: mixins.py:86 msgid "Event does not exist" msgstr "Veranstaltung gibt es nicht" @@ -242,7 +242,7 @@ msgid "Show on Google Maps" msgstr "Auf Google Maps zeigen" #: templates/events/event_detail.html:127 templates/events/event_form.html:9 -#: views.py:62 +#: views.py:63 msgid "Edit Event" msgstr "Termin bearbeiten" @@ -250,7 +250,7 @@ msgstr "Termin bearbeiten" msgid "Add Dates" msgstr "Termine hinzufügen" -#: templates/events/event_form.html:9 templates/events/page.html:9 views.py:64 +#: templates/events/event_form.html:9 templates/events/page.html:9 views.py:65 msgid "Add Event" msgstr "Neuer Termin" diff --git a/src/events/migrations/0007_auto_20161012_2224.py b/src/events/migrations/0007_auto_20161012_2224.py index ed5a5dd..bc724f4 100644 --- a/src/events/migrations/0007_auto_20161012_2224.py +++ b/src/events/migrations/0007_auto_20161012_2224.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations, models import datetime -from django.utils.timezone import utc +from datetime import timezone class Migration(migrations.Migration): @@ -23,7 +23,7 @@ class Migration(migrations.Migration): model_name='event', name='date_modified', field=models.DateTimeField(default=datetime.datetime( - 2016, 10, 12, 20, 24, 39, 910492, tzinfo=utc), verbose_name='latest updated at', auto_now=True), + 2016, 10, 12, 20, 24, 39, 910492, tzinfo=timezone.utc), verbose_name='latest updated at', auto_now=True), preserve_default=False, ), migrations.AddField( @@ -36,7 +36,7 @@ class Migration(migrations.Migration): model_name='location', name='date_modified', field=models.DateTimeField(default=datetime.datetime( - 2016, 10, 12, 20, 24, 44, 566305, tzinfo=utc), verbose_name='latest updated at', auto_now=True), + 2016, 10, 12, 20, 24, 44, 566305, tzinfo=timezone.utc), verbose_name='latest updated at', auto_now=True), preserve_default=False, ), migrations.AddField( @@ -49,7 +49,7 @@ class Migration(migrations.Migration): model_name='photo', name='date_modified', field=models.DateTimeField(default=datetime.datetime( - 2016, 10, 12, 20, 24, 50, 509970, tzinfo=utc), verbose_name='latest updated at', auto_now=True), + 2016, 10, 12, 20, 24, 50, 509970, tzinfo=timezone.utc), verbose_name='latest updated at', auto_now=True), preserve_default=False, ), ] diff --git a/src/events/urls.py b/src/events/urls.py index 101f84b..88e9468 100644 --- a/src/events/urls.py +++ b/src/events/urls.py @@ -1,22 +1,16 @@ """URLS to access upcoming events and the event archive.""" -from django.conf.urls import url +from django.urls import path from django.views.generic import RedirectView from . import views urlpatterns = [ - url(r'^$', RedirectView.as_view(url='/events/upcoming/', permanent=True)), - url(r'^(?P[\d]{4})/$', views.EventArchiveYear.as_view(), - name='event-archive'), - url(r'^(?P[\d]{4})/(?P[\d]+)/$', - views.EventArchiveMonth.as_view(), - name='event-archive'), - url(r'^(?P[\d]{4})/(?P[\d]+)/(?P[\d]+)/$', - views.EventDetail.as_view(), name='event-detail'), - url(r'^(?P[\d]{4})/(?P[\d]+)/(?P[\d]+)/add_dates/$', - views.EventSeriesForm.as_view(), name='eventseries-form'), - url(r'^(?P[\d]{4})/(?P[\d]+)/(?P[\d]+)/edit/$', - views.EventForm.as_view(), name='event-form'), - url(r'^add/$', views.EventForm.as_view(), name='event-form'), - url(r'^archive/$', views.EventArchiveIndex.as_view(), name='event-archive'), - url(r'^upcoming/$', views.UpcomingEvents.as_view(), name='upcoming-events'), + path("", RedirectView.as_view(url='/events/upcoming/', permanent=True)), + path('/', views.EventArchiveYear.as_view(), name='event-archive'), + path('//', views.EventArchiveMonth.as_view(), name='event-archive'), + path('///', views.EventDetail.as_view(), name='event-detail'), + path('///add_dates/', views.EventSeriesForm.as_view(), name='eventseries-form'), + path('///edit/', views.EventForm.as_view(), name='event-form'), + path('add/', views.EventForm.as_view(), name='event-form'), + path('archive/', views.EventArchiveIndex.as_view(), name='event-archive'), + path('upcoming/', views.UpcomingEvents.as_view(), name='upcoming-events'), ] diff --git a/src/kasu/locale/de/LC_MESSAGES/django.po b/src/kasu/locale/de/LC_MESSAGES/django.po index db6208a..29eb629 100644 --- a/src/kasu/locale/de/LC_MESSAGES/django.po +++ b/src/kasu/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kasu.utils\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-12-13 23:38+0100\n" +"POT-Creation-Date: 2023-07-20 21:25+0200\n" "PO-Revision-Date: 2018-12-30 11:14+0105\n" "Last-Translator: b' '\n" "Language-Team: Kasu \n" @@ -19,11 +19,11 @@ msgstr "" "X-Generator: Poedit 1.8.9\n" "X-Translated-Using: django-rosetta 0.9.0\n" -#: settings.py:140 +#: settings.py:144 msgid "German" msgstr "Deutsch" -#: settings.py:140 +#: settings.py:144 msgid "English" msgstr "Englisch" @@ -192,8 +192,8 @@ msgid "" " From %(author)s in\n" " “%(object)s”\n" " since\n" -" \n" +" \n" " " msgstr "" "\n" diff --git a/src/kasu/settings.py b/src/kasu/settings.py index 364672c..a68b177 100644 --- a/src/kasu/settings.py +++ b/src/kasu/settings.py @@ -133,6 +133,10 @@ LOGIN_URL = '/membership/login/' LOGIN_ERROR_URL = '/membership/login/error/' LOGIN_REDIRECT_URL = '/users/' + +# Set the primarykey handing to old django style +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + # Localization USE_I18N = True USE_L10N = True diff --git a/src/kasu/templates/base.html b/src/kasu/templates/base.html index 5e5c2d7..bd8dc00 100644 --- a/src/kasu/templates/base.html +++ b/src/kasu/templates/base.html @@ -46,12 +46,12 @@