From 95f5e0b920031e9953a7c260deba1da13024bcd4 Mon Sep 17 00:00:00 2001 From: Xeniac Date: Thu, 14 Mar 2019 18:41:11 +0100 Subject: [PATCH] small fixes for django 2.0 --- requirements/base.txt | 1 + requirements/development.txt | 2 +- src/content/locale/de/LC_MESSAGES/django.po | 139 +++-- .../migrations/0008_auto_20190106_1954.py | 58 ++ src/events/locale/de/LC_MESSAGES/django.po | 196 +++---- .../migrations/0010_auto_20190106_1954.py | 48 ++ .../templates/events/event_archive.html | 2 +- src/events/templates/events/event_list.html | 2 +- src/kasu/locale/de/LC_MESSAGES/django.po | 40 +- src/kasu/templates/base.html | 6 +- src/kasu/templates/comments/list.html | 2 +- src/kasu/templates/index.html | 4 +- .../locale/de/LC_MESSAGES/django.po | 302 +++++------ .../mahjong_ranking/ladder_redbox.html | 4 +- .../mahjong_ranking/seasonranking_list.html | 2 +- .../locale/de/LC_MESSAGES/django.po | 131 +++-- .../locale/de/LC_MESSAGES/django.po | 320 +++++------ .../migrations/0008_auto_20190106_1954.py | 18 + src/membership/views.py | 2 +- src/utils/locale/de/LC_MESSAGES/django.po | 500 +++++++++--------- src/utils/middleware.py | 21 +- 21 files changed, 959 insertions(+), 841 deletions(-) create mode 100644 src/content/migrations/0008_auto_20190106_1954.py create mode 100644 src/events/migrations/0010_auto_20190106_1954.py create mode 100644 src/membership/migrations/0008_auto_20190106_1954.py diff --git a/requirements/base.txt b/requirements/base.txt index 63d5e35..0295012 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -10,6 +10,7 @@ django-markdown django-recaptcha git+https://github.com/SmileyChris/easy-thumbnails.git icalendar +openpyxl markdown pillow psycopg2-binary diff --git a/requirements/development.txt b/requirements/development.txt index 109904b..7413c59 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -4,5 +4,5 @@ django-rosetta sqlparse # Code Linting -coala-bears +pylint>=2.0 pylint-django diff --git a/src/content/locale/de/LC_MESSAGES/django.po b/src/content/locale/de/LC_MESSAGES/django.po index 093f781..d5170cb 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: 2018-05-08 00:17+0200\n" +"POT-Creation-Date: 2019-01-12 16:27+0100\n" "PO-Revision-Date: 2018-01-12 15:25+0105\n" "Last-Translator: b'Christian Berg '\n" "Language-Team: Deutsch <>\n" @@ -20,252 +20,245 @@ msgstr "" "X-Generator: Poedit 1.8.9\n" "X-Translated-Using: django-rosetta 0.7.14\n" -#: .\content\feeds.py:18 +#: feeds.py:18 msgid "Current news from Kasu" msgstr "Aktuelle Nachrichten von Kasu" -#: .\content\feeds.py:51 +#: feeds.py:51 msgid "Latest comments on kasu.at" msgstr "Neueste Kommentare auf Kasu.at " -#: .\content\feeds.py:52 +#: feeds.py:52 msgid "Kasu - latest comments" msgstr "Kasu - neue Kommentare" -#: .\content\forms.py:57 .\content\models.py:318 +#: forms.py:57 models.py:318 msgid "Please upload a PDF-File to this PDF-Page." msgstr "Bitte eine PDF Datei für diese PDF Seite hochladen." -#: .\content\models.py:76 +#: models.py:76 msgid "Headline" msgstr "Schlagzeile" -#: .\content\models.py:78 +#: models.py:78 msgid "Content" msgstr "Inhalt" -#: .\content\models.py:82 .\content\models.py:150 -#: .\content\templates\content\article_detail.html:25 +#: models.py:82 models.py:150 templates/content/article_detail.html:28 msgid "Category" msgstr "Kategorie" -#: .\content\models.py:83 .\content\models.py:143 +#: models.py:83 models.py:143 msgid "Image" msgstr "Bild" -#: .\content\models.py:85 .\content\models.py:145 +#: models.py:85 models.py:145 msgid "Slug" msgstr "Slug" -#: .\content\models.py:88 .\content\templates\content\article_detail.html:23 +#: models.py:88 templates/content/article_detail.html:21 msgid "Author" msgstr "Autor" -#: .\content\models.py:89 +#: models.py:89 msgid "Status" msgstr "Status" -#: .\content\models.py:91 +#: models.py:91 msgid "Created" msgstr "Erstellt" -#: .\content\models.py:92 +#: models.py:92 msgid "Modified" msgstr "Bearbeitet" -#: .\content\models.py:97 +#: models.py:97 msgid "Article" msgstr "Artikel" -#: .\content\models.py:98 +#: models.py:98 msgid "Articles" msgstr "Artikel" -#: .\content\models.py:139 .\content\models.py:140 +#: models.py:139 models.py:140 msgid "Name" msgstr "Name" -#: .\content\models.py:141 .\content\models.py:142 +#: models.py:141 models.py:142 msgid "Description" msgstr "Beschreibung" -#: .\content\models.py:151 +#: models.py:151 msgid "Categories" msgstr "Kategorien" -#: .\content\models.py:182 .\content\models.py:188 +#: models.py:182 models.py:188 msgid "The short name for the menu-entry of this page" msgstr "Ein kurzer Name für den Menüeintrag" -#: .\content\models.py:193 .\content\models.py:198 +#: models.py:193 models.py:198 msgid "The page title as you'd like it to be seen by the public" msgstr "Der Seitentitel der öffentlich angezeigt werden soll" -#: .\content\models.py:200 +#: models.py:200 msgid "slug" msgstr "Slug" -#: .\content\models.py:203 +#: models.py:203 msgid "" "The name of the page as it will appear in URLs e.g http://domain.com/blog/" "[my-slug]/" msgstr "Wie die Seite in der URL aufscheint also http://domain.com/blog/[slug]" -#: .\content\models.py:212 +#: models.py:212 msgid "Path" msgstr "Pfad" -#: .\content\models.py:224 +#: models.py:224 msgid "Position" msgstr "Position" -#: .\content\models.py:229 +#: models.py:229 msgid "status" msgstr "Status" -#: .\content\models.py:232 .\content\models.py:234 +#: models.py:232 models.py:234 msgid "search description" msgstr "Beschreibung für Suchfunktion" -#: .\content\models.py:237 +#: models.py:237 msgid "content type" msgstr "Inhaltstyp" -#: .\content\models.py:242 +#: models.py:242 msgid "enable comments" msgstr "Kommentare möglich" -#: .\content\models.py:247 +#: models.py:247 msgid "Template" msgstr "Vorlage" -#: .\content\models.py:255 +#: models.py:255 msgid "first created at" msgstr "erstellt am" -#: .\content\models.py:260 +#: models.py:260 msgid "latest updated at" msgstr "letzte Aktualisierung am" -#: .\content\models.py:331 +#: models.py:331 msgid "Page" msgstr "Seite" -#: .\content\models.py:332 +#: models.py:332 msgid "Pages" msgstr "Seiten" -#: .\content\templates\content\article_archive.html:5 -#: .\content\templates\content\article_archive.html:20 +#: templates/content/article_archive.html:5 +#: templates/content/article_archive.html:20 msgid "Article Archive" msgstr "Nachrichtenarchiv" -#: .\content\templates\content\article_archive.html:35 -#: .\content\templates\content\article_archive_month.html:5 -#: .\content\templates\content\article_archive_year.html:7 +#: templates/content/article_archive.html:35 +#: templates/content/article_archive_month.html:5 +#: templates/content/article_archive_year.html:7 msgid "Archive" msgstr "Archiv" -#: .\content\templates\content\article_archive.html:56 +#: templates/content/article_archive.html:56 msgid "All Categories" msgstr "Alle Kategorien" -#: .\content\templates\content\article_archive.html:71 +#: templates/content/article_archive.html:71 msgid "created on" msgstr "erstellt am" -#: .\content\templates\content\article_archive.html:73 +#: templates/content/article_archive.html:73 msgid "by" msgstr "von" -#: .\content\templates\content\article_archive.html:74 -#: .\content\templates\content\article_archive.html:75 +#: templates/content/article_archive.html:74 +#: templates/content/article_archive.html:75 msgid "comments" msgstr "Kommentare" -#: .\content\templates\content\article_archive.html:81 +#: templates/content/article_archive.html:81 msgid "Read More" msgstr "Mehr lesen" -#: .\content\templates\content\article_archive.html:86 +#: templates/content/article_archive.html:86 msgid "We're sorry. Your search yielded no results." msgstr "Es tut uns leid. Deine Suche ergab keine Treffer." -#: .\content\templates\content\article_archive.html:104 +#: templates/content/article_archive.html:104 msgid "Add Article" msgstr "neuer Artikel " -#: .\content\templates\content\article_archive_month.html:7 +#: templates/content/article_archive_month.html:7 msgid "back" msgstr "Zurück" -#: .\content\templates\content\article_detail.html:24 +#: templates/content/article_detail.html:25 msgid "Created on" msgstr "Erstellt am" -#: .\content\templates\content\article_detail.html:36 +#: templates/content/article_detail.html:39 msgid "share on" msgstr "Teile auf" -#: .\content\templates\content\article_detail.html:51 .\content\views.py:156 +#: templates/content/article_detail.html:48 views.py:156 msgid "Edit Article" msgstr "Artikel bearbeiten" -#: .\content\templates\content\article_form.html:32 -#: .\content\templates\content\page_form.html:42 -#: .\content\templates\content\page_form.html:49 +#: templates/content/article_form.html:32 templates/content/page_form.html:42 +#: templates/content/page_form.html:49 msgid "German" msgstr "Deutsch" -#: .\content\templates\content\article_form.html:33 -#: .\content\templates\content\page_form.html:43 -#: .\content\templates\content\page_form.html:57 +#: templates/content/article_form.html:33 templates/content/page_form.html:43 +#: templates/content/page_form.html:57 msgid "English" msgstr "Englisch" -#: .\content\templates\content\article_form.html:59 -#: .\content\templates\content\page_form.html:66 +#: templates/content/article_form.html:59 templates/content/page_form.html:66 msgid "reset" msgstr "Zurücksetzen" -#: .\content\templates\content\article_form.html:60 -#: .\content\templates\content\page_form.html:67 +#: templates/content/article_form.html:60 templates/content/page_form.html:67 msgid "save" msgstr "Speichern" -#: .\content\templates\content\page_form.html:5 -#: .\content\templates\content\page_form.html:35 +#: templates/content/page_form.html:5 templates/content/page_form.html:35 msgid "Edit Page" msgstr "Seite bearbeiten" -#: .\content\templates\content\page_form.html:5 -#: .\content\templates\content\page_form.html:19 -#: .\content\templates\content\page_form.html:35 +#: templates/content/page_form.html:5 templates/content/page_form.html:19 +#: templates/content/page_form.html:35 msgid "Add Page" msgstr "Seite hinzufügen" -#: .\content\templates\content\page_form.html:18 +#: templates/content/page_form.html:18 msgid "Edit" msgstr "Bearbeiten" -#: .\content\templates\content\page_form.html:37 +#: templates/content/page_form.html:37 msgid "HTML Specific" msgstr "HTML spezifisch" -#: .\content\views.py:53 +#: views.py:53 msgid "This Category does not exist." msgstr "Diese Kategorie existiert nicht." -#: .\content\views.py:157 +#: views.py:157 msgid "Create Article" msgstr "Artikel erstellen" -#: .\content\views.py:233 +#: views.py:237 #, python-format msgid "No Page found matching the Path %s" msgstr "Keine Seite unter dem Pfad %s gefunden" -#: .\content\views.py:262 +#: views.py:266 #, 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/migrations/0008_auto_20190106_1954.py b/src/content/migrations/0008_auto_20190106_1954.py new file mode 100644 index 0000000..b045fa0 --- /dev/null +++ b/src/content/migrations/0008_auto_20190106_1954.py @@ -0,0 +1,58 @@ +# Generated by Django 2.1.5 on 2019-01-06 18:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('content', '0007_auto_20171214_1215'), + ] + + operations = [ + migrations.AlterField( + model_name='article', + name='status', + field=models.SmallIntegerField(choices=[(-1, 'Rejected'), (0, 'Waiting...'), (1, 'Published')], default=1, verbose_name='Status'), + ), + migrations.AlterField( + model_name='page', + name='date_created', + field=models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='erstellt am'), + ), + migrations.AlterField( + model_name='page', + name='date_modified', + field=models.DateTimeField(auto_now=True, verbose_name='letzte Aktualisierung am'), + ), + migrations.AlterField( + model_name='page', + name='description_de', + field=models.TextField(blank=True, verbose_name='Beschreibung für Suchfunktion'), + ), + migrations.AlterField( + model_name='page', + name='description_en', + field=models.TextField(blank=True, verbose_name='Beschreibung für Suchfunktion'), + ), + migrations.AlterField( + model_name='page', + name='slug', + field=models.SlugField(help_text='Wie die Seite in der URL aufscheint also http://domain.com/blog/[slug]', max_length=100, verbose_name='Slug'), + ), + migrations.AlterField( + model_name='page', + name='status', + field=models.SmallIntegerField(choices=[(-1, 'Rejected'), (0, 'Waiting...'), (1, 'Published')], default=0, verbose_name='Status'), + ), + migrations.AlterField( + model_name='page', + name='title_de', + field=models.CharField(help_text='Der Seitentitel der öffentlich angezeigt werden soll', max_length=255, verbose_name='Titel'), + ), + migrations.AlterField( + model_name='page', + name='title_en', + field=models.CharField(blank=True, help_text='Der Seitentitel der öffentlich angezeigt werden soll', max_length=255, verbose_name='Title'), + ), + ] diff --git a/src/events/locale/de/LC_MESSAGES/django.po b/src/events/locale/de/LC_MESSAGES/django.po index e8a75a1..373a5de 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: 2018-05-08 00:17+0200\n" +"POT-Creation-Date: 2019-01-12 16:27+0100\n" "PO-Revision-Date: 2018-01-12 15:25+0105\n" "Last-Translator: b'Christian Berg '\n" "Language-Team: Kasu \n" @@ -19,58 +19,59 @@ msgstr "" "X-Generator: Poedit 1.8.9\n" "X-Translated-Using: django-rosetta 0.7.14\n" -#: .\events\admin.py:14 .\events\models.py:82 +#: admin.py:14 models.py:82 msgid "Event Series" msgstr "Veranstaltungsreihen" -#: .\events\forms.py:17 +#: forms.py:17 msgid "Images" msgstr "Bilder" -#: .\events\forms.py:46 +#: forms.py:46 msgid "start" msgstr "Beginn" -#: .\events\forms.py:49 +#: forms.py:49 msgid "end" msgstr "Ende" -#: .\events\models.py:52 .\events\models.py:176 .\events\models.py:217 +#: mixins.py:76 +msgid "Event does not exist" +msgstr "Veranstaltung gibt es nicht" + +#: models.py:52 models.py:176 models.py:217 msgid "Name" msgstr "Name" -#: .\events\models.py:53 .\events\models.py:177 .\events\models.py:225 +#: models.py:53 models.py:177 models.py:225 msgid "Description" msgstr "Beschreibung" -#: .\events\models.py:55 .\events\templates\events\event_detail.html:29 -#: .\events\templates\events\event_detail.html:87 -#: .\events\templates\events\event_list.html:28 -#: .\events\templates\events\photo_upload.html:13 +#: models.py:55 templates/events/event_detail.html:29 +#: templates/events/event_detail.html:87 templates/events/event_list.html:28 +#: templates/events/photo_upload.html:13 msgid "Start" msgstr "Beginn" -#: .\events\models.py:56 .\events\templates\events\event_detail.html:30 -#: .\events\templates\events\event_detail.html:89 +#: models.py:56 templates/events/event_detail.html:30 +#: templates/events/event_detail.html:89 msgid "End" msgstr "Ende" -#: .\events\models.py:57 .\events\models.py:185 -#: .\events\templates\events\event_detail.html:34 -#: .\events\templates\events\event_detail.html:80 -#: .\events\templates\events\event_detail.html:92 +#: models.py:57 models.py:185 templates/events/event_detail.html:34 +#: templates/events/event_detail.html:80 templates/events/event_detail.html:92 msgid "Homepage" msgstr "Homepage" -#: .\events\models.py:59 .\events\models.py:179 .\events\models.py:219 +#: models.py:59 models.py:179 models.py:219 msgid "Image" msgstr "Bild" -#: .\events\models.py:66 +#: models.py:66 msgid "Mahjong Tournament" msgstr "Mahjong Turnier" -#: .\events\models.py:68 +#: models.py:68 msgid "" "This event is a tournament, different rules apply for the kyu " "ranking." @@ -78,11 +79,11 @@ msgstr "" "Diese Veranstaltung ist ein Turnier, es gelten andere Regeln für das Kyu " "Ranking." -#: .\events\models.py:72 +#: models.py:72 msgid "Mahjong Season" msgstr "Mahjong Saison" -#: .\events\models.py:83 +#: models.py:83 msgid "" "Wenn dieser Event zu einer Veranstaltungsreihe gehört werden Ort, " "Beschreibung, Bild und Homepage von dem hier angegebenen Event " @@ -91,248 +92,227 @@ msgstr "" "Wenn dieser Termin zu einer Veranstaltungsreihe gehört werden Ort, " "Beschreibung, Bild und Homepage von dem hier angegebenen Event übernommen." -#: .\events\models.py:92 .\events\models.py:195 .\events\models.py:248 +#: models.py:92 models.py:195 models.py:248 msgid "first created at" msgstr "erstellt am" -#: .\events\models.py:97 .\events\models.py:200 .\events\models.py:253 +#: models.py:97 models.py:200 models.py:253 msgid "latest updated at" msgstr "letzte Aktualisierung am" -#: .\events\models.py:103 +#: models.py:103 msgid "Event" msgstr "Termin" -#: .\events\models.py:104 +#: models.py:104 msgid "Events" msgstr "Termine" -#: .\events\models.py:117 +#: models.py:117 msgid "A event can't end before it had started" msgstr "Eine Veranstaltung kann nicht enden bevor sie begonnen hat" -#: .\events\models.py:186 +#: models.py:186 msgid "Postal Code" msgstr "Postleitzahl" -#: .\events\models.py:187 +#: models.py:187 msgid "Street Address" msgstr "Straße" -#: .\events\models.py:188 +#: models.py:188 msgid "Locality" msgstr "Ort" -#: .\events\models.py:189 +#: models.py:189 msgid "Country" msgstr "Land" -#: .\events\models.py:204 +#: models.py:204 msgid "Venue" msgstr "Veranstaltungsort" -#: .\events\models.py:205 +#: models.py:205 msgid "Venues" msgstr "Veranstaltungsorte" -#: .\events\models.py:232 +#: models.py:232 msgid "Startpage" msgstr "Startseite" -#: .\events\models.py:235 +#: models.py:235 msgid "Display this Photo on the Startpage Teaser" msgstr "Foto als Teaser auf der Startseite verwenden." -#: .\events\models.py:237 +#: models.py:237 msgid "Published on" msgstr "Veröffentlicht am" -#: .\events\models.py:239 +#: models.py:239 msgid "Number of views" msgstr "Wie oft gesehen" -#: .\events\models.py:263 .\events\templates\events\event_archive.html:38 -#: .\events\templates\events\event_list.html:18 +#: models.py:263 templates/events/event_archive.html:38 +#: templates/events/event_list.html:18 msgid "Event Image" msgstr "Veranstaltungsbild" -#: .\events\models.py:264 +#: models.py:264 msgid "Event Images" msgstr "Veranstaltungsbilder" -#: .\events\templates\events\event_archive.html:5 -#: .\events\templates\events\event_archive.html:9 +#: templates/events/event_archive.html:5 templates/events/event_archive.html:9 msgid "Event Archive" msgstr "Veranstaltungsarchiv" -#: .\events\templates\events\event_archive.html:42 -#: .\events\templates\events\event_detail.html:85 -#: .\events\templates\events\event_list.html:22 -#: .\events\templates\events\photo_detail.html:53 +#: templates/events/event_archive.html:42 templates/events/event_detail.html:85 +#: templates/events/event_list.html:22 templates/events/photo_detail.html:53 msgid "Date" msgstr "Datum" -#: .\events\templates\events\event_archive.html:47 +#: templates/events/event_archive.html:47 msgid "Time" msgstr "Zeit" -#: .\events\templates\events\event_archive.html:49 -#: .\events\templates\events\photo_upload.html:16 +#: templates/events/event_archive.html:49 templates/events/photo_upload.html:16 msgid "from" msgstr "von" -#: .\events\templates\events\event_archive.html:49 -#: .\events\templates\events\photo_upload.html:16 +#: templates/events/event_archive.html:49 templates/events/photo_upload.html:16 msgid "to" msgstr "bis" -#: .\events\templates\events\event_archive.html:57 -#: .\events\templates\events\event_detail.html:31 -#: .\events\templates\events\event_detail.html:72 -#: .\events\templates\events\event_list.html:32 -#: .\events\templates\events\photo_upload.html:23 +#: templates/events/event_archive.html:57 templates/events/event_detail.html:31 +#: templates/events/event_detail.html:72 templates/events/event_list.html:32 +#: templates/events/photo_upload.html:23 msgid "Location" msgstr "Ort" -#: .\events\templates\events\event_archive.html:58 -#: .\events\templates\events\event_list.html:35 -#: .\events\templates\events\photo_upload.html:25 -#: .\events\templates\events\photo_upload.html:26 +#: templates/events/event_archive.html:58 templates/events/event_list.html:35 +#: templates/events/photo_upload.html:25 templates/events/photo_upload.html:26 msgid "Comments" msgstr "Kommentare" -#: .\events\templates\events\event_archive.html:59 -#: .\events\templates\events\event_detail.html:36 -#: .\events\templates\events\event_detail.html:48 -#: .\events\templates\events\photo_list.html:4 -#: .\events\templates\events\photo_upload.html:28 -#: .\events\templates\events\photo_upload.html:29 +#: templates/events/event_archive.html:59 templates/events/event_detail.html:36 +#: templates/events/event_detail.html:48 templates/events/photo_list.html:4 +#: templates/events/photo_upload.html:28 templates/events/photo_upload.html:29 msgid "Photos" msgstr "Fotos" -#: .\events\templates\events\event_archive.html:60 -#: .\events\templates\events\event_archive.html:61 -#: .\events\templates\events\event_detail.html:35 -#: .\events\templates\events\event_detail.html:51 +#: templates/events/event_archive.html:60 +#: templates/events/event_archive.html:61 templates/events/event_detail.html:35 +#: templates/events/event_detail.html:51 msgid "Hanchans" msgstr "Hanchans" -#: .\events\templates\events\event_detail.html:37 +#: templates/events/event_detail.html:37 msgid "tourney" msgstr "Turnier" -#: .\events\templates\events\event_detail.html:37 +#: templates/events/event_detail.html:37 msgid "other rules apply here" msgstr "hier gelten andere Regeln" -#: .\events\templates\events\event_detail.html:45 +#: templates/events/event_detail.html:45 msgid "Info" msgstr "Info" -#: .\events\templates\events\event_detail.html:54 +#: templates/events/event_detail.html:54 msgid "Mai-Star Games" msgstr "Mai-Star Spiele" -#: .\events\templates\events\event_detail.html:57 +#: templates/events/event_detail.html:57 msgid "Event Ranking" msgstr "Veranstaltungs Wertung" -#: .\events\templates\events\event_detail.html:100 +#: templates/events/event_detail.html:100 msgid "Share on Facebook" msgstr "Auf Facebook teilen" -#: .\events\templates\events\event_detail.html:104 +#: templates/events/event_detail.html:104 msgid "Share on Google+" msgstr "Auf Google+ teilen" -#: .\events\templates\events\event_detail.html:109 +#: templates/events/event_detail.html:109 msgid "Share on Twitter" msgstr "Auf Twitter teilen" -#: .\events\templates\events\event_detail.html:113 +#: templates/events/event_detail.html:113 msgid "Show on Google Maps" msgstr "Auf Google Maps zeigen" -#: .\events\templates\events\event_detail.html:127 -#: .\events\templates\events\event_form.html:9 .\events\views.py:62 +#: templates/events/event_detail.html:127 templates/events/event_form.html:9 +#: views.py:62 msgid "Edit Event" msgstr "Termin bearbeiten" -#: .\events\templates\events\event_detail.html:131 +#: templates/events/event_detail.html:131 msgid "Add Dates" msgstr "Termine hinzufügen" -#: .\events\templates\events\event_form.html:9 -#: .\events\templates\events\page.html:9 .\events\views.py:64 +#: templates/events/event_form.html:9 templates/events/page.html:9 views.py:64 msgid "Add Event" msgstr "Neuer Termin" -#: .\events\templates\events\event_form.html:18 -#: .\events\templates\events\photo_list.html:35 +#: templates/events/event_form.html:18 templates/events/photo_list.html:35 msgid "reset" msgstr "Zurücksetzen" -#: .\events\templates\events\event_form.html:19 -#: .\events\templates\events\eventseries_form.html:25 +#: templates/events/event_form.html:19 +#: templates/events/eventseries_form.html:25 msgid "save" msgstr "Speichern" -#: .\events\templates\events\event_list.html:4 -#: .\events\templates\events\event_list.html:5 +#: templates/events/event_list.html:4 templates/events/event_list.html:5 msgid "Upcoming Events" msgstr "Bevorstehende Veranstaltungen" -#: .\events\templates\events\eventseries_form.html:24 +#: templates/events/eventseries_form.html:24 msgid "back" msgstr "Zurück" -#: .\events\templates\events\photo_confirm_delete.html:17 +#: templates/events/photo_confirm_delete.html:17 msgid "Cancel" msgstr "Abbrechen" -#: .\events\templates\events\photo_confirm_delete.html:21 -#: .\events\templates\events\photo_list.html:21 +#: templates/events/photo_confirm_delete.html:21 +#: templates/events/photo_list.html:21 msgid "Delete" msgstr "Löschen" -#: .\events\templates\events\photo_detail.html:44 +#: templates/events/photo_detail.html:44 msgid "previous" msgstr "Zurück" -#: .\events\templates\events\photo_detail.html:52 +#: templates/events/photo_detail.html:52 msgid "Photographer" msgstr "Fotograf" -#: .\events\templates\events\photo_detail.html:58 +#: templates/events/photo_detail.html:58 msgid "share on" msgstr "Teile auf" -#: .\events\templates\events\photo_detail.html:81 +#: templates/events/photo_detail.html:81 msgid "download" msgstr "Herunterladen" -#: .\events\templates\events\photo_detail.html:82 +#: templates/events/photo_detail.html:82 msgid "Rotate counter clockwise" msgstr "mit dem Uhrzeiger drehen" -#: .\events\templates\events\photo_detail.html:83 +#: templates/events/photo_detail.html:83 msgid "Rotate clockwise" msgstr "gegen den Uhrzeiger drehen" -#: .\events\templates\events\photo_detail.html:84 +#: templates/events/photo_detail.html:84 msgid "Save" msgstr "Speichern" -#: .\events\templates\events\photo_list.html:36 -#: .\events\templates\events\photo_upload.html:35 -#: .\events\templates\events\photo_upload.html:49 +#: templates/events/photo_list.html:36 templates/events/photo_upload.html:35 +#: templates/events/photo_upload.html:49 msgid "Upload" msgstr "Hochladen" -#: .\events\views.py:150 -msgid "Event does not exist" -msgstr "Veranstaltung gibt es nicht" - #~ msgid " Edit" #~ msgstr "Bearbeiten" diff --git a/src/events/migrations/0010_auto_20190106_1954.py b/src/events/migrations/0010_auto_20190106_1954.py new file mode 100644 index 0000000..dce230d --- /dev/null +++ b/src/events/migrations/0010_auto_20190106_1954.py @@ -0,0 +1,48 @@ +# Generated by Django 2.1.5 on 2019-01-06 18:54 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0009_auto_20171214_1215'), + ] + + operations = [ + migrations.AlterField( + model_name='event', + name='date_created', + field=models.DateTimeField(auto_now_add=True, db_index=True, null=True, verbose_name='erstellt am'), + ), + migrations.AlterField( + model_name='event', + name='date_modified', + field=models.DateTimeField(auto_now=True, verbose_name='letzte Aktualisierung am'), + ), + migrations.AlterField( + model_name='location', + name='country', + field=models.CharField(choices=[('GB', 'United Kingdom'), ('AF', 'Afghanistan'), ('AX', 'Aland Islands'), ('AL', 'Albania'), ('DZ', 'Algeria'), ('AS', 'American Samoa'), ('AD', 'Andorra'), ('AO', 'Angola'), ('AI', 'Anguilla'), ('AQ', 'Antarctica'), ('AG', 'Antigua and Barbuda'), ('AR', 'Argentina'), ('AM', 'Armenia'), ('AW', 'Aruba'), ('AU', 'Australia'), ('AT', 'Austria'), ('AZ', 'Azerbaijan'), ('BS', 'Bahamas'), ('BH', 'Bahrain'), ('BD', 'Bangladesh'), ('BB', 'Barbados'), ('BY', 'Belarus'), ('BE', 'Belgium'), ('BZ', 'Belize'), ('BJ', 'Benin'), ('BM', 'Bermuda'), ('BT', 'Bhutan'), ('BO', 'Bolivia'), ('BA', 'Bosnia and Herzegovina'), ('BW', 'Botswana'), ('BV', 'Bouvet Island'), ('BR', 'Brazil'), ('IO', 'British Indian Ocean Territory'), ('BN', 'Brunei Darussalam'), ('BG', 'Bulgaria'), ('BF', 'Burkina Faso'), ('BI', 'Burundi'), ('KH', 'Cambodia'), ('CM', 'Cameroon'), ('CA', 'Canada'), ('CV', 'Cape Verde'), ('KY', 'Cayman Islands'), ('CF', 'Central African Republic'), ('TD', 'Chad'), ('CL', 'Chile'), ('CN', 'China'), ('CX', 'Christmas Island'), ('CC', 'Cocos (Keeling) Islands'), ('CO', 'Colombia'), ('KM', 'Comoros'), ('CG', 'Congo'), ('CD', 'Congo, The Democratic Republic of the'), ('CK', 'Cook Islands'), ('CR', 'Costa Rica'), ('CI', "Cote d'Ivoire"), ('HR', 'Croatia'), ('CU', 'Cuba'), ('CY', 'Cyprus'), ('CZ', 'Czech Republic'), ('DK', 'Denmark'), ('DJ', 'Djibouti'), ('DM', 'Dominica'), ('DO', 'Dominican Republic'), ('EC', 'Ecuador'), ('EG', 'Egypt'), ('SV', 'El Salvador'), ('GQ', 'Equatorial Guinea'), ('ER', 'Eritrea'), ('EE', 'Estonia'), ('ET', 'Ethiopia'), ('FK', 'Falkland Islands (Malvinas)'), ('FO', 'Faroe Islands'), ('FJ', 'Fiji'), ('FI', 'Finland'), ('FR', 'France'), ('GF', 'French Guiana'), ('PF', 'French Polynesia'), ('TF', 'French Southern Territories'), ('GA', 'Gabon'), ('GM', 'Gambia'), ('GE', 'Georgia'), ('DE', 'Germany'), ('GH', 'Ghana'), ('GI', 'Gibraltar'), ('GR', 'Greece'), ('GL', 'Greenland'), ('GD', 'Grenada'), ('GP', 'Guadeloupe'), ('GU', 'Guam'), ('GT', 'Guatemala'), ('GG', 'Guernsey'), ('GN', 'Guinea'), ('GW', 'Guinea-Bissau'), ('GY', 'Guyana'), ('HT', 'Haiti'), ('HM', 'Heard Island and McDonald Islands'), ('VA', 'Holy See (Vatican City State)'), ('HN', 'Honduras'), ('HK', 'Hong Kong'), ('HU', 'Hungary'), ('IS', 'Iceland'), ('IN', 'India'), ('ID', 'Indonesia'), ('IR', 'Iran, Islamic Republic of'), ('IQ', 'Iraq'), ('IE', 'Ireland'), ('IM', 'Isle of Man'), ('IL', 'Israel'), ('IT', 'Italy'), ('JM', 'Jamaica'), ('JP', 'Japan'), ('JE', 'Jersey'), ('JO', 'Jordan'), ('KZ', 'Kazakhstan'), ('KE', 'Kenya'), ('KI', 'Kiribati'), ('KP', "Korea, Democratic People's Republic of"), ('KR', 'Korea, Republic of'), ('KW', 'Kuwait'), ('KG', 'Kyrgyzstan'), ('LA', "Lao People's Democratic Republic"), ('LV', 'Latvia'), ('LB', 'Lebanon'), ('LS', 'Lesotho'), ('LR', 'Liberia'), ('LY', 'Libyan Arab Jamahiriya'), ('LI', 'Liechtenstein'), ('LT', 'Lithuania'), ('LU', 'Luxembourg'), ('MO', 'Macao'), ('MK', 'Macedonia, The Former Yugoslav Republic of'), ('MG', 'Madagascar'), ('MW', 'Malawi'), ('MY', 'Malaysia'), ('MV', 'Maldives'), ('ML', 'Mali'), ('MT', 'Malta'), ('MH', 'Marshall Islands'), ('MQ', 'Martinique'), ('MR', 'Mauritania'), ('MU', 'Mauritius'), ('YT', 'Mayotte'), ('MX', 'Mexico'), ('FM', 'Micronesia, Federated States of'), ('MD', 'Moldova'), ('MC', 'Monaco'), ('MN', 'Mongolia'), ('ME', 'Montenegro'), ('MS', 'Montserrat'), ('MA', 'Morocco'), ('MZ', 'Mozambique'), ('MM', 'Myanmar'), ('NA', 'Namibia'), ('NR', 'Nauru'), ('NP', 'Nepal'), ('NL', 'Netherlands'), ('AN', 'Netherlands Antilles'), ('NC', 'New Caledonia'), ('NZ', 'New Zealand'), ('NI', 'Nicaragua'), ('NE', 'Niger'), ('NG', 'Nigeria'), ('NU', 'Niue'), ('NF', 'Norfolk Island'), ('MP', 'Northern Mariana Islands'), ('NO', 'Norway'), ('OM', 'Oman'), ('PK', 'Pakistan'), ('PW', 'Palau'), ('PS', 'Palestinian Territory, Occupied'), ('PA', 'Panama'), ('PG', 'Papua New Guinea'), ('PY', 'Paraguay'), ('PE', 'Peru'), ('PH', 'Philippines'), ('PN', 'Pitcairn'), ('PL', 'Poland'), ('PT', 'Portugal'), ('PR', 'Puerto Rico'), ('QA', 'Qatar'), ('RE', 'Reunion'), ('RO', 'Romania'), ('RU', 'Russian Federation'), ('RW', 'Rwanda'), ('BL', 'Saint Barthelemy'), ('SH', 'Saint Helena'), ('KN', 'Saint Kitts and Nevis'), ('LC', 'Saint Lucia'), ('MF', 'Saint Martin'), ('PM', 'Saint Pierre and Miquelon'), ('VC', 'Saint Vincent and the Grenadines'), ('WS', 'Samoa'), ('SM', 'San Marino'), ('ST', 'Sao Tome and Principe'), ('SA', 'Saudi Arabia'), ('SN', 'Senegal'), ('RS', 'Serbia'), ('SC', 'Seychelles'), ('SL', 'Sierra Leone'), ('SG', 'Singapore'), ('SK', 'Slovakia'), ('SI', 'Slovenia'), ('SB', 'Solomon Islands'), ('SO', 'Somalia'), ('ZA', 'South Africa'), ('GS', 'South Georgia and the South Sandwich Islands'), ('ES', 'Spain'), ('LK', 'Sri Lanka'), ('SD', 'Sudan'), ('SR', 'Suriname'), ('SJ', 'Svalbard and Jan Mayen'), ('SZ', 'Swaziland'), ('SE', 'Sweden'), ('CH', 'Switzerland'), ('SY', 'Syrian Arab Republic'), ('TW', 'Taiwan, Province of China'), ('TJ', 'Tajikistan'), ('TZ', 'Tanzania, United Republic of'), ('TH', 'Thailand'), ('TL', 'Timor-Leste'), ('TG', 'Togo'), ('TK', 'Tokelau'), ('TO', 'Tonga'), ('TT', 'Trinidad and Tobago'), ('TN', 'Tunisia'), ('TR', 'Turkey'), ('TM', 'Turkmenistan'), ('TC', 'Turks and Caicos Islands'), ('TV', 'Tuvalu'), ('UG', 'Uganda'), ('UA', 'Ukraine'), ('AE', 'United Arab Emirates'), ('US', 'United States'), ('UM', 'United States Minor Outlying Islands'), ('UY', 'Uruguay'), ('UZ', 'Uzbekistan'), ('VU', 'Vanuatu'), ('VE', 'Venezuela'), ('VN', 'Viet Nam'), ('VG', 'Virgin Islands, British'), ('VI', 'Virgin Islands, U.S.'), ('WF', 'Wallis and Futuna'), ('EH', 'Western Sahara'), ('YE', 'Yemen'), ('ZM', 'Zambia'), ('ZW', 'Zimbabwe')], max_length=2, verbose_name='Land'), + ), + migrations.AlterField( + model_name='location', + name='date_created', + field=models.DateTimeField(auto_now_add=True, db_index=True, null=True, verbose_name='erstellt am'), + ), + migrations.AlterField( + model_name='location', + name='date_modified', + field=models.DateTimeField(auto_now=True, verbose_name='letzte Aktualisierung am'), + ), + migrations.AlterField( + model_name='photo', + name='date_created', + field=models.DateTimeField(auto_now_add=True, db_index=True, null=True, verbose_name='erstellt am'), + ), + migrations.AlterField( + model_name='photo', + name='date_modified', + field=models.DateTimeField(auto_now=True, verbose_name='letzte Aktualisierung am'), + ), + ] diff --git a/src/events/templates/events/event_archive.html b/src/events/templates/events/event_archive.html index 2ee3b75..b3897ec 100755 --- a/src/events/templates/events/event_archive.html +++ b/src/events/templates/events/event_archive.html @@ -40,7 +40,7 @@

{{ event.name }}

-

{{ event.name }}

  • -