From 48659b124356fa764123b19ad1b1e34dad0a072d Mon Sep 17 00:00:00 2001 From: Christoph Meissner Date: Wed, 30 Mar 2022 08:25:11 +0200 Subject: [PATCH 1/5] Disable dark mode for Dajngo admin When dark mode is enabled in the Django admin, it does not work with the used text field widget (CKEditor), because does not support dark mode properly. As a quick fix, dark mode is disabled. --- templates/admin/base_site.html | 40 ++++++++++++++++++++++++++++++ volunteer_planner/settings/base.py | 3 --- volunteer_planner/urls.py | 1 - 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 templates/admin/base_site.html diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html new file mode 100644 index 00000000..4f7bd589 --- /dev/null +++ b/templates/admin/base_site.html @@ -0,0 +1,40 @@ +{% extends "admin/base_site.html" %} + +{% block extrastyle %} + +{% endblock %} diff --git a/volunteer_planner/settings/base.py b/volunteer_planner/settings/base.py index 6a1fa7b2..9cb6417f 100644 --- a/volunteer_planner/settings/base.py +++ b/volunteer_planner/settings/base.py @@ -41,7 +41,6 @@ THIRD_PARTY_APPS = ( "ckeditor", - # A prettier theme "accounts.apps.RegistrationConfig", "django_ajax", "django_extensions", @@ -162,8 +161,6 @@ WSGI_APPLICATION = "%s.wsgi.application" % SITE_NAME FIXTURE_DIRS = (os.path.join(PROJECT_ROOT, "fixtures"),) -CKEDITOR_JQUERY_URL = "//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js" -CKEDITOR_UPLOAD_PATH = "uploads/" DATE_FORMAT = "l, d.m.Y" diff --git a/volunteer_planner/urls.py b/volunteer_planner/urls.py index 40154bf1..c781287c 100644 --- a/volunteer_planner/urls.py +++ b/volunteer_planner/urls.py @@ -15,7 +15,6 @@ re_path(r"^orgs/", include("organizations.urls")), re_path(r"^places/", include("scheduler.place_urls")), re_path(r"^admin/", admin.site.urls), - re_path(r"^ckeditor/", include("ckeditor_uploader.urls")), re_path(r"^i18n/", include("django.conf.urls.i18n")), re_path( r"^favicon.ico", From dd5d56f9e74a28fd03305757115022e4f9a6b20d Mon Sep 17 00:00:00 2001 From: Christoph Meissner Date: Wed, 30 Mar 2022 08:45:33 +0200 Subject: [PATCH 2/5] Update translations --- accounts/forms.py | 2 +- ...0005_alter_flatpagetranslation_language.py | 35 ++++ locale/ar/LC_MESSAGES/django.po | 12 +- locale/bg/LC_MESSAGES/django.po | 12 +- locale/cs/LC_MESSAGES/django.po | 73 ++++---- locale/da/LC_MESSAGES/django.po | 12 +- locale/de/LC_MESSAGES/django.po | 43 ++--- locale/el/LC_MESSAGES/django.po | 12 +- locale/en/LC_MESSAGES/django.po | 12 +- locale/es/LC_MESSAGES/django.po | 12 +- locale/es_MX/LC_MESSAGES/django.po | 12 +- locale/fa/LC_MESSAGES/django.po | 12 +- locale/fr/LC_MESSAGES/django.po | 12 +- locale/hr/LC_MESSAGES/django.po | 12 +- locale/hu/LC_MESSAGES/django.po | 12 +- locale/hy/LC_MESSAGES/django.po | 12 +- locale/it/LC_MESSAGES/django.po | 12 +- locale/nl/LC_MESSAGES/django.po | 12 +- locale/no/LC_MESSAGES/django.po | 12 +- locale/pl/LC_MESSAGES/django.po | 12 +- locale/pt/LC_MESSAGES/django.po | 12 +- locale/pt_BR/LC_MESSAGES/django.po | 12 +- locale/ro/LC_MESSAGES/django.po | 12 +- locale/ru/LC_MESSAGES/django.po | 12 +- locale/sk/LC_MESSAGES/django.po | 12 +- locale/sl/LC_MESSAGES/django.po | 12 +- locale/sq/LC_MESSAGES/django.po | 12 +- locale/sr_RS/LC_MESSAGES/django.po | 12 +- locale/sv/LC_MESSAGES/django.po | 12 +- locale/tr/LC_MESSAGES/django.po | 12 +- locale/tr_TR/LC_MESSAGES/django.po | 12 +- locale/uk/LC_MESSAGES/django.po | 169 +++++++++--------- locale/zh_CN/LC_MESSAGES/django.po | 12 +- scheduler/managers.py | 6 +- scheduler/settings.py | 7 + tests/registration/test_registration.py | 17 +- tests/scheduler/test_models.py | 3 +- volunteer_planner/settings/base.py | 9 +- volunteer_planner/settings/local.py | 3 - volunteer_planner/settings/production.py | 5 - volunteer_planner/settings/tests.py | 5 +- 41 files changed, 470 insertions(+), 243 deletions(-) create mode 100644 content/migrations/0005_alter_flatpagetranslation_language.py create mode 100644 scheduler/settings.py diff --git a/accounts/forms.py b/accounts/forms.py index 0f0758a5..ea4ab386 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -17,7 +17,7 @@ ) no_consequtive = RegexValidator( r"[_.]{2,}", - _("Username must not contain consecutive . or _ characters."), + _('Username must not contain consecutive "." or "_" characters.'), inverse_match=True, ) diff --git a/content/migrations/0005_alter_flatpagetranslation_language.py b/content/migrations/0005_alter_flatpagetranslation_language.py new file mode 100644 index 00000000..2eaaed38 --- /dev/null +++ b/content/migrations/0005_alter_flatpagetranslation_language.py @@ -0,0 +1,35 @@ +# Generated by Django 4.0.3 on 2022-03-30 08:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("content", "0004_alter_flatpagetranslation_language"), + ] + + operations = [ + migrations.AlterField( + model_name="flatpagetranslation", + name="language", + field=models.CharField( + choices=[ + ("uk", "Ukrainian"), + ("en", "English"), + ("de", "German"), + ("cs", "Czech"), + ("el", "Greek"), + ("fr", "French"), + ("hu", "Hungarian"), + ("pl", "Polish"), + ("pt", "Portuguese"), + ("ru", "Russian"), + ("sv", "Swedish"), + ("tr", "Turkish"), + ], + max_length=20, + verbose_name="language", + ), + ), + ] diff --git a/locale/ar/LC_MESSAGES/django.po b/locale/ar/LC_MESSAGES/django.po index 11553962..2f46278a 100644 --- a/locale/ar/LC_MESSAGES/django.po +++ b/locale/ar/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2022-03-15 17:56+0000\n" "Last-Translator: Christoph Meißner\n" "Language-Team: Arabic (http://www.transifex.com/coders4help/volunteer-planner/language/ar/)\n" @@ -45,7 +45,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1243,18 +1243,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/bg/LC_MESSAGES/django.po b/locale/bg/LC_MESSAGES/django.po index bf3a29a3..b9e099dd 100644 --- a/locale/bg/LC_MESSAGES/django.po +++ b/locale/bg/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2022-03-15 17:56+0000\n" "Last-Translator: Christoph Meißner\n" "Language-Team: Bulgarian (http://www.transifex.com/coders4help/volunteer-planner/language/bg/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1227,18 +1227,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/cs/LC_MESSAGES/django.po b/locale/cs/LC_MESSAGES/django.po index be3b07e2..e6eb308e 100644 --- a/locale/cs/LC_MESSAGES/django.po +++ b/locale/cs/LC_MESSAGES/django.po @@ -1,14 +1,15 @@ # # Translators: +# trendspotter , 2022 # trendspotter , 2019 -# trendspotter , 2019 +# trendspotter , 2019,2022 msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" -"PO-Revision-Date: 2022-03-15 17:56+0000\n" -"Last-Translator: Christoph Meißner\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"PO-Revision-Date: 2015-09-24 12:23+0000\n" +"Last-Translator: trendspotter , 2019,2022\n" "Language-Team: Czech (http://www.transifex.com/coders4help/volunteer-planner/language/cs/)\n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -35,16 +36,16 @@ msgid "Accounts" msgstr "Účty" msgid "Invalid username. Allowed characters are letters, numbers, \".\" and \"_\"." -msgstr "" +msgstr "Neplatné uživatelské jméno. Povolené znaky jsou písmena, číslice, \".\" a \"_\"." msgid "Username must start with a letter." -msgstr "" +msgstr "Uživatelské jméno musí začínat písmenem." msgid "Username must end with a letter, a number or \"_\"." -msgstr "" +msgstr "Uživatelské jméno musí končit písmenem, číslicí nebo znakem \"_\"." -msgid "Username must not contain consecutive . or _ characters." -msgstr "" +msgid "Username must not contain consecutive \".\" or \"_\" characters." +msgstr "Uživatelské jméno nesmí obsahovat po sobě jdoucí znaky \".\" nebo \"_\"." msgid "Accept privacy policy" msgstr "Přijmout zásady ochrany osobních údajů" @@ -482,6 +483,10 @@ msgid "" " href=\"mailto:onboarding@volunteer-planner.org\">onboarding@volunteer-planner.org\n" " " msgstr "" +"\n" +" ...třeba s přiloženým návrhem směn, které chcete vidět v plánovači dobrovolníků. Napište prosím na onboarding@volunteer-planner.org\n" +" " msgid "edit" msgstr "upravit" @@ -603,10 +608,10 @@ msgid "{username} at {facility_name} ({user_role})" msgstr "{username} v {facility_name} ({user_role})" msgid "priority" -msgstr "" +msgstr "priorita" msgid "Higher value = higher priority" -msgstr "" +msgstr "Vyšší hodnota = vyšší priorita" msgid "workplace" msgstr "pracoviště" @@ -622,7 +627,7 @@ msgstr "úlohy" #, python-brace-format msgid "User '{user}' manager status of a facility/organization was changed. " -msgstr "" +msgstr "Byl změněn status správce zařízení/organizace uživatele '{user}'. " #, python-format msgid "Hello %(username)s," @@ -709,23 +714,23 @@ msgid "places" msgstr "místa" msgid "Facilities do not match." -msgstr "" +msgstr "Zařízení neodpovídají." #, python-brace-format msgid "\"{object.name}\" belongs to facility \"{object.facility.name}\", but shift takes place at \"{facility.name}\"." -msgstr "" +msgstr "\"{object.name}\" patří do zařízení \"{object.facility.name}\", ale směna probíhá v zařízení \"{facility.name}\"." msgid "No start time given." -msgstr "" +msgstr "Čas zahájení není uveden." msgid "No end time given." -msgstr "" +msgstr "Čas ukončení není uveden." msgid "Start time in the past." -msgstr "" +msgstr "Čas zahájení v minulosti." msgid "Shift ends before it starts." -msgstr "" +msgstr "Směna končí dřív, než začne." msgid "number of volunteers" msgstr "počet dobrovolníků" @@ -789,7 +794,7 @@ msgid "see more" msgstr "zobrazit víc" msgid "news" -msgstr "" +msgstr "novinky" msgid "open shifts" msgstr "otevřené směny" @@ -942,7 +947,7 @@ msgid "You were successfully added to this shift." msgstr "Byli jste úspěšně přidáni k této směně." msgid "The shift you joined overlaps with other shifts you already joined. Please check for conflicts:" -msgstr "" +msgstr "Směna, do které jste nastoupili, se překrývá s jinými směnami, do kterých jste již nastoupili. Zkontrolujte, zda nedochází ke konfliktům:" #, python-brace-format msgid "You already signed up for this shift at {date_time}." @@ -1163,21 +1168,21 @@ msgid "Your volunteer-planner.org registration" msgstr "Registrace dobrovolníka" msgid "admin approval" -msgstr "" +msgstr "schválení administrátorem" #, python-format msgid "Your account is now approved. You can login now." -msgstr "" +msgstr "Váš účet je nyní schválen. Nyní se můžete přihlásit." msgid "Your account is now approved. You can log in using the following link" -msgstr "" +msgstr "Váš účet je nyní schválen. Přihlásit se můžete pomocí následujícího odkazu" msgid "Email address" msgstr "Emailová adresa" #, python-format msgid "%(email_trans)s / %(username_trans)s" -msgstr "" +msgstr "%(email_trans)s / %(username_trans)s" msgid "Password" msgstr "Heslo" @@ -1288,40 +1293,46 @@ msgid "Repeat password" msgstr "Zopakovat heslo" msgid "I have read and agree to the Privacy Policy." -msgstr "" +msgstr "Přečetl/a jsem si Zásady ochrany osobních údajů a souhlasím s nimi." msgid "This must be checked." -msgstr "" +msgstr "To je nutné zaškrtnout." msgid "Sign-up" msgstr "Přihlásit se" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "Angličtina" msgid "German" msgstr "Němčina" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "Řečtina" +msgid "French" +msgstr "Francouzština" + msgid "Hungarian" msgstr "Maďarština" msgid "Polish" -msgstr "" +msgstr "Polština" msgid "Portuguese" -msgstr "" +msgstr "Portugalština" msgid "Russian" -msgstr "" +msgstr "Ruština" msgid "Swedish" msgstr "Švédština" msgid "Turkish" -msgstr "" +msgstr "Turečtina" diff --git a/locale/da/LC_MESSAGES/django.po b/locale/da/LC_MESSAGES/django.po index 3f887f48..d09110b7 100644 --- a/locale/da/LC_MESSAGES/django.po +++ b/locale/da/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2017-09-22 15:35+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Danish (http://www.transifex.com/coders4help/volunteer-planner/language/da/)\n" @@ -42,7 +42,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1228,18 +1228,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 82b792eb..e1881f60 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" -"PO-Revision-Date: 2016-11-21 18:24+0000\n" -"Last-Translator: Sönke Klinger \n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"PO-Revision-Date: 2015-09-24 12:23+0000\n" +"Last-Translator: Christoph Meißner, 2015,2022\n" "Language-Team: German (http://www.transifex.com/coders4help/volunteer-planner/language/de/)\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -48,16 +48,16 @@ msgid "Accounts" msgstr "Benutzerkonten" msgid "Invalid username. Allowed characters are letters, numbers, \".\" and \"_\"." -msgstr "" +msgstr "Ungültiger Benutzername. Erlaubte Zeichen sind Buchstaben, Ziffern, \".\" and \"_\"." msgid "Username must start with a letter." -msgstr "" +msgstr "Benutzername muss mit einem Buchstaben anfangen." msgid "Username must end with a letter, a number or \"_\"." -msgstr "" +msgstr "Benutzername muss mit einem Buchstaben, einer Ziffer oder \"_\" enden." -msgid "Username must not contain consecutive . or _ characters." -msgstr "" +msgid "Username must not contain consecutive \".\" or \"_\" characters." +msgstr "Benutzername darf keine aufeinanderfolgenden \".\" and \"_\" enthalten." msgid "Accept privacy policy" msgstr "Einwilligung (nach Art 6 Abs 1 Satz 1 a DSGVO)" @@ -932,23 +932,20 @@ msgstr "" "\n" "Hallo,\n" "\n" -"es tut uns leid, aber wir mussten die Zeiten der folgenden Schicht auf Wunsch der Schichtleitung ändern.:\n" +"es tut uns leid, aber wir mussten die Zeiten der folgenden Schicht auf Wunsch der Schichtleitung ändern:\n" "\n" "%(shift_title)s, %(location)s\n" -"%(old_from_date)s von %(old_from_time)s auf %(old_to_time)s o'clock\n" -"\n" +"%(old_from_date)s von %(old_from_time)s auf %(old_to_time)s Uhr\n" "\n" "Die neue Schicht ist wie folgt geplant:\n" "\n" -"%(from_date)s von %(from_time)s bis %(to_time)s o'clock\n" +"%(from_date)s von %(from_time)s bis %(to_time)s Uhr\n" "\n" "Wenn Du zu dieser Zeit nicht zur Verfügung stehen kannst, dann sage bitte im Volunteer-Planner deine Schichtteilnahme ab.\n" "\n" -"Dies ist eine automatisch erstellte E-Mail. Bei Rückfragen wende Dich bitte an die Kontaktadresse, die bei der Unterkunft angegeben ist..\n" -" \n" -"Dein\n" +"Dies ist eine automatisch erstellte E-Mail. Bei Rückfragen wende Dich bitte an die Kontaktadresse, die bei der Unterkunft angegeben ist.\n" "\n" -"Volunteer-planner.org Team\n" +"Dein Volunteer-planner.org Team\n" msgid "The submitted data was invalid." msgstr "Die eingegebenen Daten sind ungültig." @@ -1040,7 +1037,7 @@ msgid "Select shift templates" msgstr "Schichtvorlagen auswählen" msgid "Please review and confirm shifts to create" -msgstr "Bitte kontrolliere und bestätige die Schichten zum erstellen" +msgstr "Bitte kontrolliere und bestätige die Schichten zum Erstellen" msgid "Apply" msgstr "anwenden" @@ -1210,7 +1207,7 @@ msgstr "E-Mailadresse" #, python-format msgid "%(email_trans)s / %(username_trans)s" -msgstr "" +msgstr "%(email_trans)s / %(username_trans)s" msgid "Password" msgstr "Passwort" @@ -1331,18 +1328,24 @@ msgstr "Du musst diesen Haken setzen." msgid "Sign-up" msgstr "Eintragen" +msgid "Ukrainian" +msgstr "Ukrainisch" + msgid "English" msgstr "Englisch" msgid "German" msgstr "Deutsch" -msgid "French" -msgstr "Französisch" +msgid "Czech" +msgstr "Tschechisch" msgid "Greek" msgstr "Griechisch" +msgid "French" +msgstr "Französisch" + msgid "Hungarian" msgstr "Ungarisch" diff --git a/locale/el/LC_MESSAGES/django.po b/locale/el/LC_MESSAGES/django.po index e5b356e3..91d1bf93 100644 --- a/locale/el/LC_MESSAGES/django.po +++ b/locale/el/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Greek (http://www.transifex.com/coders4help/volunteer-planner/language/el/)\n" @@ -46,7 +46,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1298,18 +1298,24 @@ msgstr "" msgid "Sign-up" msgstr "Εγγραφή" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "Αγγλικά" msgid "German" msgstr "Γερμανικά" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "Ελληνικά" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "Ουγγρικά" diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index b9fe7f75..bd195b4c 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2015-10-04 21:53+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: English (http://www.transifex.com/coders4help/volunteer-planner/language/en/)\n" @@ -38,7 +38,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1224,18 +1224,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 83d2a584..838d3e75 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-04-13 17:27+0000\n" "Last-Translator: Antonio Mireles \n" "Language-Team: Spanish (http://www.transifex.com/coders4help/volunteer-planner/language/es/)\n" @@ -45,7 +45,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1290,18 +1290,24 @@ msgstr "" msgid "Sign-up" msgstr "Inscribirse" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "Inglés" msgid "German" msgstr "Alemán" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "Griego" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "Húngaro" diff --git a/locale/es_MX/LC_MESSAGES/django.po b/locale/es_MX/LC_MESSAGES/django.po index c8a0aa57..553c701c 100644 --- a/locale/es_MX/LC_MESSAGES/django.po +++ b/locale/es_MX/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/coders4help/volunteer-planner/language/es_MX/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1227,18 +1227,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/fa/LC_MESSAGES/django.po b/locale/fa/LC_MESSAGES/django.po index cca80b54..de359261 100644 --- a/locale/fa/LC_MESSAGES/django.po +++ b/locale/fa/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Persian (http://www.transifex.com/coders4help/volunteer-planner/language/fa/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1227,18 +1227,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index f6f8351a..65c6136f 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-12-08 20:50+0000\n" "Last-Translator: Dolfeus \n" "Language-Team: French (http://www.transifex.com/coders4help/volunteer-planner/language/fr/)\n" @@ -47,7 +47,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1317,18 +1317,24 @@ msgstr "" msgid "Sign-up" msgstr "Inscrire" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "Anglais" msgid "German" msgstr "Allemand" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "Grec" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "Hongrois" diff --git a/locale/hr/LC_MESSAGES/django.po b/locale/hr/LC_MESSAGES/django.po index ac0557f7..52ad7ddb 100644 --- a/locale/hr/LC_MESSAGES/django.po +++ b/locale/hr/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Croatian (http://www.transifex.com/coders4help/volunteer-planner/language/hr/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1230,18 +1230,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/hu/LC_MESSAGES/django.po b/locale/hu/LC_MESSAGES/django.po index 28d68b0e..7ada1a0f 100644 --- a/locale/hu/LC_MESSAGES/django.po +++ b/locale/hu/LC_MESSAGES/django.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Hungarian (http://www.transifex.com/coders4help/volunteer-planner/language/hu/)\n" @@ -51,7 +51,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1255,18 +1255,24 @@ msgstr "" msgid "Sign-up" msgstr "Regisztráció" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "Angol" msgid "German" msgstr "Német" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "Magyar" diff --git a/locale/hy/LC_MESSAGES/django.po b/locale/hy/LC_MESSAGES/django.po index a1d83eee..d1f466dd 100644 --- a/locale/hy/LC_MESSAGES/django.po +++ b/locale/hy/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Armenian (http://www.transifex.com/coders4help/volunteer-planner/language/hy/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1227,18 +1227,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/it/LC_MESSAGES/django.po b/locale/it/LC_MESSAGES/django.po index 9effe1a8..24d03409 100644 --- a/locale/it/LC_MESSAGES/django.po +++ b/locale/it/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Italian (http://www.transifex.com/coders4help/volunteer-planner/language/it/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1227,18 +1227,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/nl/LC_MESSAGES/django.po b/locale/nl/LC_MESSAGES/django.po index be775c17..be276440 100644 --- a/locale/nl/LC_MESSAGES/django.po +++ b/locale/nl/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Dutch (http://www.transifex.com/coders4help/volunteer-planner/language/nl/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1227,18 +1227,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/no/LC_MESSAGES/django.po b/locale/no/LC_MESSAGES/django.po index 450ae32b..e1d8c317 100644 --- a/locale/no/LC_MESSAGES/django.po +++ b/locale/no/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Norwegian (http://www.transifex.com/coders4help/volunteer-planner/language/no/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1227,18 +1227,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/pl/LC_MESSAGES/django.po b/locale/pl/LC_MESSAGES/django.po index e606b356..590cbbb7 100644 --- a/locale/pl/LC_MESSAGES/django.po +++ b/locale/pl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2017-09-22 15:29+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Polish (http://www.transifex.com/coders4help/volunteer-planner/language/pl/)\n" @@ -45,7 +45,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1249,18 +1249,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "język angielski" msgid "German" msgstr "język niemiecki" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "język węgierski" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 7621d384..aa464b58 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Portuguese (http://www.transifex.com/coders4help/volunteer-planner/language/pt/)\n" @@ -46,7 +46,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1232,18 +1232,24 @@ msgstr "" msgid "Sign-up" msgstr "Registar" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "Inglês" msgid "German" msgstr "Alemão" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "Húngaro" diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index a3ed7610..913c69f7 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/coders4help/volunteer-planner/language/pt_BR/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1227,18 +1227,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/ro/LC_MESSAGES/django.po b/locale/ro/LC_MESSAGES/django.po index d1308936..ab111877 100644 --- a/locale/ro/LC_MESSAGES/django.po +++ b/locale/ro/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Romanian (http://www.transifex.com/coders4help/volunteer-planner/language/ro/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1230,18 +1230,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po index 4c4a740f..489f4943 100644 --- a/locale/ru/LC_MESSAGES/django.po +++ b/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2022-03-10 13:42+0000\n" "Last-Translator: Anna Dunn\n" "Language-Team: Russian (http://www.transifex.com/coders4help/volunteer-planner/language/ru/)\n" @@ -45,7 +45,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1314,18 +1314,24 @@ msgstr "" msgid "Sign-up" msgstr "Регистрация" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "Английский" msgid "German" msgstr "Немецкий" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "Греческий" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "Венгерский" diff --git a/locale/sk/LC_MESSAGES/django.po b/locale/sk/LC_MESSAGES/django.po index bd398b43..a0535226 100644 --- a/locale/sk/LC_MESSAGES/django.po +++ b/locale/sk/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Slovak (http://www.transifex.com/coders4help/volunteer-planner/language/sk/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1233,18 +1233,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/sl/LC_MESSAGES/django.po b/locale/sl/LC_MESSAGES/django.po index 605c0e31..9132d83c 100644 --- a/locale/sl/LC_MESSAGES/django.po +++ b/locale/sl/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Slovenian (http://www.transifex.com/coders4help/volunteer-planner/language/sl/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1233,18 +1233,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/sq/LC_MESSAGES/django.po b/locale/sq/LC_MESSAGES/django.po index c6b63578..33982ad7 100644 --- a/locale/sq/LC_MESSAGES/django.po +++ b/locale/sq/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Albanian (http://www.transifex.com/coders4help/volunteer-planner/language/sq/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1227,18 +1227,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/sr_RS/LC_MESSAGES/django.po b/locale/sr_RS/LC_MESSAGES/django.po index bfc2241b..e59f40c5 100644 --- a/locale/sr_RS/LC_MESSAGES/django.po +++ b/locale/sr_RS/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Serbian (Serbia) (http://www.transifex.com/coders4help/volunteer-planner/language/sr_RS/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1230,18 +1230,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po index fd42b23e..a453aca9 100644 --- a/locale/sv/LC_MESSAGES/django.po +++ b/locale/sv/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Swedish (http://www.transifex.com/coders4help/volunteer-planner/language/sv/)\n" @@ -48,7 +48,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1294,18 +1294,24 @@ msgstr "" msgid "Sign-up" msgstr "Skapa konto" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "Engelska" msgid "German" msgstr "Tyska" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "Grekiska" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "Ungerska" diff --git a/locale/tr/LC_MESSAGES/django.po b/locale/tr/LC_MESSAGES/django.po index ea8a1de3..49979d4c 100644 --- a/locale/tr/LC_MESSAGES/django.po +++ b/locale/tr/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Turkish (http://www.transifex.com/coders4help/volunteer-planner/language/tr/)\n" @@ -42,7 +42,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1228,18 +1228,24 @@ msgstr "" msgid "Sign-up" msgstr "Kaydol" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "İngilizce" msgid "German" msgstr "Almanca" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "Macarca" diff --git a/locale/tr_TR/LC_MESSAGES/django.po b/locale/tr_TR/LC_MESSAGES/django.po index 78ec6959..68f5a73e 100644 --- a/locale/tr_TR/LC_MESSAGES/django.po +++ b/locale/tr_TR/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/coders4help/volunteer-planner/language/tr_TR/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1227,18 +1227,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/uk/LC_MESSAGES/django.po b/locale/uk/LC_MESSAGES/django.po index 07760b63..299240ca 100644 --- a/locale/uk/LC_MESSAGES/django.po +++ b/locale/uk/LC_MESSAGES/django.po @@ -1,12 +1,13 @@ # # Translators: +# Anna Dunn, 2022 msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-29 11:54+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" -"Last-Translator: Dorian Cantzen \n" +"Last-Translator: Anna Dunn, 2022\n" "Language-Team: Ukrainian (http://www.transifex.com/coders4help/volunteer-planner/language/uk/)\n" "Language: uk\n" "MIME-Version: 1.0\n" @@ -15,22 +16,22 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" msgid "first name" -msgstr "" +msgstr "Ім'я" msgid "last name" msgstr "" msgid "email" -msgstr "" +msgstr "Електронна пошта" msgid "date joined" -msgstr "" +msgstr "Дата приєднання" msgid "last login" -msgstr "" +msgstr "Останній вхід" msgid "Accounts" -msgstr "" +msgstr "Облікові записи" msgid "Invalid username. Allowed characters are letters, numbers, \".\" and \"_\"." msgstr "" @@ -41,101 +42,101 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" -msgstr "" +msgstr "Прийміть політику конфіденційності" msgid "user account" -msgstr "" +msgstr "Обліковий запис користувача" msgid "user accounts" -msgstr "" +msgstr "Облікові записи користувачів" msgid "My shifts today:" -msgstr "" +msgstr "Мої сьогоднішні зміни:" msgid "No shifts today." -msgstr "" +msgstr "Сьогодні без змін." msgid "Show this work shift" -msgstr "" +msgstr "Показати робочу зміну" msgid "My shifts tomorrow:" -msgstr "" +msgstr "Мої зміни завтра:" msgid "No shifts tomorrow." -msgstr "" +msgstr "Завтра без змін." msgid "My shifts the day after tomorrow:" -msgstr "" +msgstr "Мої зміни післязавтра:" msgid "No shifts the day after tomorrow." -msgstr "" +msgstr "Післязавтра немає змін." msgid "Further shifts:" -msgstr "" +msgstr "Подальші зміни:" msgid "No further shifts." -msgstr "" +msgstr "Більше ніяких змін." msgid "Show my work shifts in the past" -msgstr "" +msgstr "Показати мої робочі зміни у минулому" msgid "My work shifts in the past:" -msgstr "" +msgstr "Мої робочі зміни в минулому:" msgid "No work shifts in the past days yet." -msgstr "" +msgstr "Протягом останніх днів робочих змін не було." msgid "Show my work shifts in the future" -msgstr "" +msgstr "Показати мої робочі зміни на майбутнє" msgid "Username" -msgstr "" +msgstr "Ім'я користувача" msgid "First name" -msgstr "" +msgstr "Ім'я" msgid "Last name" -msgstr "" +msgstr "Прізвище" msgid "Email" -msgstr "" +msgstr "Електронна пошта" msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." -msgstr "" +msgstr "Якщо ви видалите свій обліковий запис, ця інформація буде анонімізована, і ви більше не зможете ввійти в Volunteer-Planner." msgid "Its not possible to recover this information. If you want to work as volunteer again, you will have to create a new account." -msgstr "" +msgstr "Відновити цю інформацію неможливо. Якщо ви хочете знову працювати волонтером, вам доведеться створити новий обліковий запис." msgid "Delete Account (no additional warning)" -msgstr "" +msgstr "Видалити обліковий запис (без додаткового попередження)" msgid "Save" -msgstr "" +msgstr "Зберегти" msgid "Edit Account" -msgstr "" +msgstr "Редагувати обліковий запис" msgid "Delete Account" -msgstr "" +msgstr "Видалити обліковий запис" msgid "Your user account has been deleted." -msgstr "" +msgstr "Ваш обліковий запис користувача було видалено." msgid "additional CSS" msgstr "" msgid "translation" -msgstr "" +msgstr "переклад" msgid "translations" msgstr "" msgid "No translation available" -msgstr "" +msgstr "Немає перекладу" msgid "additional style" msgstr "" @@ -150,13 +151,13 @@ msgid "flat page" msgstr "" msgid "language" -msgstr "" +msgstr "мова" msgid "title" -msgstr "" +msgstr "титул" msgid "content" -msgstr "" +msgstr "зміст" msgid "flat page translation" msgstr "" @@ -165,117 +166,117 @@ msgid "flat page translations" msgstr "" msgid "View on site" -msgstr "" +msgstr "Подивитися на сайті" msgid "Remove" -msgstr "" +msgstr "Видалити" #, python-format msgid "Add another %(verbose_name)s" -msgstr "" +msgstr "Додати %(verbose_name)s" msgid "Edit this page" -msgstr "" +msgstr "Редагувати цю сторінку" msgid "subtitle" -msgstr "" +msgstr "Підзаголовок" msgid "articletext" -msgstr "" +msgstr "стаття" msgid "creation date" -msgstr "" +msgstr "дата створення" msgid "news entry" -msgstr "" +msgstr "запис новин" msgid "news entries" -msgstr "" +msgstr "записи новин" msgid "Page not found" -msgstr "" +msgstr "Сторінку не знайдено" msgid "We're sorry, but the requested page could not be found." -msgstr "" +msgstr "На жаль, не вдалося знайти потрібну сторінку." msgid "server error" -msgstr "" +msgstr "помилка сервера" msgid "Server Error (500)" -msgstr "" +msgstr "Помилка сервера 1(500)1" msgid "There's been an error. It should be fixed shortly. Thanks for your patience." -msgstr "" +msgstr "Сталася помилка. Це має бути виправлено найближчим часом. Дякуємо за ваше терпіння." msgid "Login" -msgstr "" +msgstr "Увійти" msgid "Start helping" -msgstr "" +msgstr "Почни допомагати" msgid "Main page" -msgstr "" +msgstr "Головна сторінка" msgid "Imprint" -msgstr "" +msgstr "Головна інформація" msgid "About" -msgstr "" +msgstr "Про нас" msgid "Supporter" -msgstr "" +msgstr "Підтримка" msgid "Press" -msgstr "" +msgstr "Контакти для преси" msgid "Contact" -msgstr "" +msgstr "Наші контакти" msgid "FAQ" -msgstr "" +msgstr "Поширені запитання" msgid "I want to help!" -msgstr "" +msgstr "Я хочу допомогти!" msgid "Register and see where you can help" -msgstr "" +msgstr "Зареєструйтесь і подивіться, де ви можете допомогти" msgid "Organize volunteers!" -msgstr "" +msgstr "Організуйте волонтерів!" msgid "Register a shelter and organize volunteers" -msgstr "" +msgstr "Зареєструйте притулок і організуйте волонтерів" msgid "Places to help" -msgstr "" +msgstr "Місця, де можна допомогти" msgid "Registered Volunteers" -msgstr "" +msgstr "Зареєстровані волонтери" msgid "Worked Hours" -msgstr "" +msgstr "Відпрацьовані години" msgid "What is it all about?" -msgstr "" +msgstr "Про що йдеться?" msgid "You are a volunteer and want to help refugees? Volunteer-Planner.org shows you where, when and how to help directly in the field." -msgstr "" +msgstr "Ви волонтер і хочете допомогти біженцям? Volunteer-Planner.org показує вам, де, коли і як допомогти безпосередньо на місцях." msgid "

This platform is non-commercial and ads-free. An international team of field workers, programmers, project managers and designers are volunteering for this project and bring in their professional experience to make a difference.

" -msgstr "" +msgstr "

Ця платформа є некомерційною та без реклами. Міжнародна команда проектних робітників, програмістів, менеджерів проектів і дизайнерів є волонтерами для цього проекту та надає свій професійний досвід, щоб змінити ситуацію.

" msgid "You can help at these locations:" -msgstr "" +msgstr "Ви можете допомогти у цих місцях:" msgid "There are currently no places in need of help." -msgstr "" +msgstr "Наразі немає місць, які потребують допомоги." msgid "Privacy Policy" -msgstr "" +msgstr "Політика конфіденційності" msgctxt "Privacy Policy Sec1" msgid "Scope" -msgstr "" +msgstr "Сфера дії" msgctxt "Privacy Policy Sec1 P1" msgid "This privacy policy informs the user of the collection and use of personal data on this website (herein after \"the service\") by the service provider, the Benefit e.V. (Wollankstr. 2, 13187 Berlin)." @@ -404,13 +405,13 @@ msgid "Based on the privacy policy sample of the lawyer Thomas Schwenke - I LAW msgstr "" msgid "advantages" -msgstr "" +msgstr "Переваги" msgid "save time" -msgstr "" +msgstr "заощадити час" msgid "improve selforganization of the volunteers" -msgstr "" +msgstr "покращити самоорганізацію волонтерів" msgid "" "\n" @@ -1233,18 +1234,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 4e46736a..e984db59 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-27 12:33+0200\n" +"POT-Creation-Date: 2022-03-30 10:51+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Chinese (China) (http://www.transifex.com/coders4help/volunteer-planner/language/zh_CN/)\n" @@ -41,7 +41,7 @@ msgstr "" msgid "Username must end with a letter, a number or \"_\"." msgstr "" -msgid "Username must not contain consecutive . or _ characters." +msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" msgid "Accept privacy policy" @@ -1224,18 +1224,24 @@ msgstr "" msgid "Sign-up" msgstr "" +msgid "Ukrainian" +msgstr "" + msgid "English" msgstr "" msgid "German" msgstr "" -msgid "French" +msgid "Czech" msgstr "" msgid "Greek" msgstr "" +msgid "French" +msgstr "" + msgid "Hungarian" msgstr "" diff --git a/scheduler/managers.py b/scheduler/managers.py index c8bdc11c..a63f02f9 100644 --- a/scheduler/managers.py +++ b/scheduler/managers.py @@ -2,11 +2,11 @@ from datetime import datetime, time, timedelta -from django.conf import settings from django.db import models from django.utils import timezone from places import models as place_models +from .settings import DEFAULT_SHIFT_CONFLICT_GRACE class ShiftQuerySet(models.QuerySet): @@ -84,9 +84,7 @@ class ShiftHelperManager(models.Manager): QuerySet on conflicting shifts. """ - def conflicting( - self, shift, user_account=None, grace=settings.DEFAULT_SHIFT_CONFLICT_GRACE - ): + def conflicting(self, shift, user_account=None, grace=DEFAULT_SHIFT_CONFLICT_GRACE): """Filters QuerySet of ShiftHelper objects by selecting those that intersect with respect to time. diff --git a/scheduler/settings.py b/scheduler/settings.py new file mode 100644 index 00000000..56e067e8 --- /dev/null +++ b/scheduler/settings.py @@ -0,0 +1,7 @@ +from datetime import timedelta + +from django.conf import settings + +DEFAULT_SHIFT_CONFLICT_GRACE = getattr( + settings, "DEFAULT_SHIFT_CONFLICT_GRACE", timedelta(0) +) diff --git a/tests/registration/test_registration.py b/tests/registration/test_registration.py index 147c1075..7d5bb00f 100644 --- a/tests/registration/test_registration.py +++ b/tests/registration/test_registration.py @@ -141,28 +141,33 @@ def test_username_too_long(self): def test_username_with_consequtive_underscores(self): self.try_invalid_username( - "invalid__name", "Username must not contain consecutive . or _ characters." + "invalid__name", + 'Username must not contain consecutive "." or "_" characters.', ) self.try_invalid_username( - "invalid___name", "Username must not contain consecutive . or _ characters." + "invalid___name", + 'Username must not contain consecutive "." or "_" characters.', ) def test_username_with_consequtive_dots(self): self.try_invalid_username( - "invalid..name", "Username must not contain consecutive . or _ characters." + "invalid..name", + 'Username must not contain consecutive "." or "_" characters.', ) self.try_invalid_username( - "invalid...name", "Username must not contain consecutive . or _ characters." + "invalid...name", + 'Username must not contain consecutive "." or "_" characters.', ) def test_username_with_consequtive_funnystuff(self): self.try_invalid_username( "invalid._._name", - "Username must not contain consecutive . or _ characters.", + 'Username must not contain consecutive "." or "_" characters.', ) self.try_invalid_username( - "invalid_._name", "Username must not contain consecutive . or _ characters." + "invalid_._name", + 'Username must not contain consecutive "." or "_" characters.', ) def test_username_with_whitespaces(self): diff --git a/tests/scheduler/test_models.py b/tests/scheduler/test_models.py index fae7d707..92fd05b6 100644 --- a/tests/scheduler/test_models.py +++ b/tests/scheduler/test_models.py @@ -1,6 +1,5 @@ from datetime import datetime, timedelta -from django.conf import settings from django.test import TestCase from django.utils import timezone from django.utils.timezone import get_current_timezone @@ -34,7 +33,7 @@ def assert_shift_conflict_count( shift, hard_conflict_count, soft_conflict_count, - grace=settings.DEFAULT_SHIFT_CONFLICT_GRACE, + grace=timedelta(hours=1), ): hard_conflicting_shifts, soft_conflicting_shifts = ShiftHelper.objects.conflicting( shift=shift, grace=grace diff --git a/volunteer_planner/settings/base.py b/volunteer_planner/settings/base.py index 9cb6417f..12c36b3f 100644 --- a/volunteer_planner/settings/base.py +++ b/volunteer_planner/settings/base.py @@ -10,6 +10,7 @@ https://docs.djangoproject.com/en/dev/ref/settings/ """ import os +from datetime import timedelta from django.utils.translation import gettext_lazy as _ @@ -141,13 +142,15 @@ USE_TZ = True TIME_ZONE = "Europe/Berlin" -LANGUAGE_CODE = "en" +LANGUAGE_CODE = "en-us" LANGUAGES = ( + ("uk", _("Ukrainian")), ("en", _("English")), ("de", _("German")), - ("fr", _("French")), + ("cs", _("Czech")), ("el", _("Greek")), + ("fr", _("French")), ("hu", _("Hungarian")), ("pl", _("Polish")), ("pt", _("Portuguese")), @@ -170,3 +173,5 @@ FACILITY_MANAGER_GROUPNAME = "Facility Manager" ORGANIZATION_MANAGER_GROUPNAME = "Organization Manager" + +DEFAULT_SHIFT_CONFLICT_GRACE = timedelta(hours=1) diff --git a/volunteer_planner/settings/local.py b/volunteer_planner/settings/local.py index cc3411f4..b8bd3a9e 100644 --- a/volunteer_planner/settings/local.py +++ b/volunteer_planner/settings/local.py @@ -1,5 +1,4 @@ # coding=utf-8 -from datetime import timedelta from .base import * # noqa: F401 @@ -87,8 +86,6 @@ SECRET_KEY = os.environ.get("SECRET_KEY", "local") LANGUAGE_CODE = os.environ.get("LANGUAGE_CODE", "de") -DEFAULT_SHIFT_CONFLICT_GRACE = timedelta(hours=1) - # for testing on mobile devices in local networks it's necessary to overwrite # with a local ip ALLOWED_HOSTS = os.environ.get("ALLOWED_HOSTS", "localhost,127.0.0.1,[::1]").split( diff --git a/volunteer_planner/settings/production.py b/volunteer_planner/settings/production.py index fda060db..a85130af 100644 --- a/volunteer_planner/settings/production.py +++ b/volunteer_planner/settings/production.py @@ -1,7 +1,5 @@ # coding=utf-8 -from datetime import timedelta - from .base import * # noqa: F401 DEBUG = os.environ.get("BETA", False) @@ -51,7 +49,4 @@ } } -DEFAULT_SHIFT_CONFLICT_GRACE = timedelta(hours=1) - - INTERNAL_IPS = ["127.0.0.1", "172.20.0.1"] diff --git a/volunteer_planner/settings/tests.py b/volunteer_planner/settings/tests.py index fbef31c1..20c617ba 100644 --- a/volunteer_planner/settings/tests.py +++ b/volunteer_planner/settings/tests.py @@ -1,11 +1,8 @@ -from datetime import timedelta - from .local import * # noqa: F401 DEBUG = False # Needed for letting Selenium access our server. -ALLOWED_HOSTS = ["localhost"] +ALLOWED_HOSTS += ["localhost"] SECRET_KEY = "Kitten like fish" -DEFAULT_SHIFT_CONFLICT_GRACE = timedelta(hours=1) From ad798049a9308e6197f2356b5e6918a63c4b042f Mon Sep 17 00:00:00 2001 From: Christoph Meissner Date: Wed, 30 Mar 2022 18:16:54 +0200 Subject: [PATCH 3/5] Redirect admin users to admin index on 403 fixes #527 --- common/admin.py | 48 ++++++++++++++++++++++++++++-- locale/ar/LC_MESSAGES/django.po | 13 +++++++- locale/bg/LC_MESSAGES/django.po | 13 +++++++- locale/cs/LC_MESSAGES/django.po | 13 +++++++- locale/da/LC_MESSAGES/django.po | 13 +++++++- locale/de/LC_MESSAGES/django.po | 13 +++++++- locale/el/LC_MESSAGES/django.po | 13 +++++++- locale/en/LC_MESSAGES/django.po | 13 +++++++- locale/es/LC_MESSAGES/django.po | 13 +++++++- locale/es_MX/LC_MESSAGES/django.po | 13 +++++++- locale/fa/LC_MESSAGES/django.po | 13 +++++++- locale/fr/LC_MESSAGES/django.po | 13 +++++++- locale/hr/LC_MESSAGES/django.po | 13 +++++++- locale/hu/LC_MESSAGES/django.po | 13 +++++++- locale/hy/LC_MESSAGES/django.po | 13 +++++++- locale/it/LC_MESSAGES/django.po | 13 +++++++- locale/nl/LC_MESSAGES/django.po | 13 +++++++- locale/no/LC_MESSAGES/django.po | 13 +++++++- locale/pl/LC_MESSAGES/django.po | 13 +++++++- locale/pt/LC_MESSAGES/django.po | 13 +++++++- locale/pt_BR/LC_MESSAGES/django.po | 13 +++++++- locale/ro/LC_MESSAGES/django.po | 13 +++++++- locale/ru/LC_MESSAGES/django.po | 13 +++++++- locale/sk/LC_MESSAGES/django.po | 13 +++++++- locale/sl/LC_MESSAGES/django.po | 13 +++++++- locale/sq/LC_MESSAGES/django.po | 13 +++++++- locale/sr_RS/LC_MESSAGES/django.po | 13 +++++++- locale/sv/LC_MESSAGES/django.po | 13 +++++++- locale/tr/LC_MESSAGES/django.po | 13 +++++++- locale/tr_TR/LC_MESSAGES/django.po | 13 +++++++- locale/uk/LC_MESSAGES/django.po | 13 +++++++- locale/zh_CN/LC_MESSAGES/django.po | 13 +++++++- volunteer_planner/settings/base.py | 1 + 33 files changed, 419 insertions(+), 33 deletions(-) diff --git a/common/admin.py b/common/admin.py index b53e2c33..53823844 100644 --- a/common/admin.py +++ b/common/admin.py @@ -1,2 +1,46 @@ -# coding=utf-8 -# Register your models here. +import logging + +from django.contrib import messages +from django.core.exceptions import PermissionDenied +from django.http import HttpResponseRedirect +from django.urls import reverse +from django.utils.safestring import mark_safe +from django.utils.translation import gettext_lazy as _ + +logger = logging.getLogger(__name__) + + +class RedirectOnAdminPermissionDenied403: + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + response = self.get_response(request) + return response + + def process_exception(self, request, exception): + admin_index = reverse("admin:index") + if ( + hasattr(request, "user") + and getattr(request.user, "is_authenticated", False) + and getattr(request.user, "is_staff", False) + and request.path != admin_index + and request.path.startswith(admin_index) + and isinstance(exception, PermissionDenied) + ): + redirect_path = admin_index + error_code = 403 + error = _("Error {error_code}").format(error_code=error_code) + permission_denied = _("Permission denied") + error = f"{error}: {permission_denied}" + note = _( + "You were not allowed to do this and have been redirected to {redirect_path}." # noqa: E501 + ).format(redirect_path=redirect_path) + messages.error( + request, + mark_safe( + f"{note}
" + f"{error} - {request.method} {request.path}" + ), + ) + return HttpResponseRedirect(redirect_path) diff --git a/locale/ar/LC_MESSAGES/django.po b/locale/ar/LC_MESSAGES/django.po index 2f46278a..aea80928 100644 --- a/locale/ar/LC_MESSAGES/django.po +++ b/locale/ar/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2022-03-15 17:56+0000\n" "Last-Translator: Christoph Meißner\n" "Language-Team: Arabic (http://www.transifex.com/coders4help/volunteer-planner/language/ar/)\n" @@ -129,6 +129,17 @@ msgstr "مسح الحساب" msgid "Your user account has been deleted." msgstr "لقد تم مسح حسابك" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/bg/LC_MESSAGES/django.po b/locale/bg/LC_MESSAGES/django.po index b9e099dd..9fbf96d7 100644 --- a/locale/bg/LC_MESSAGES/django.po +++ b/locale/bg/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2022-03-15 17:56+0000\n" "Last-Translator: Christoph Meißner\n" "Language-Team: Bulgarian (http://www.transifex.com/coders4help/volunteer-planner/language/bg/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/cs/LC_MESSAGES/django.po b/locale/cs/LC_MESSAGES/django.po index e6eb308e..67cd9e1a 100644 --- a/locale/cs/LC_MESSAGES/django.po +++ b/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: trendspotter , 2019,2022\n" "Language-Team: Czech (http://www.transifex.com/coders4help/volunteer-planner/language/cs/)\n" @@ -128,6 +128,17 @@ msgstr "Smazat účet" msgid "Your user account has been deleted." msgstr "Váš uživatelský účet byl smazán." +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "další CSS" diff --git a/locale/da/LC_MESSAGES/django.po b/locale/da/LC_MESSAGES/django.po index d09110b7..23018970 100644 --- a/locale/da/LC_MESSAGES/django.po +++ b/locale/da/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2017-09-22 15:35+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Danish (http://www.transifex.com/coders4help/volunteer-planner/language/da/)\n" @@ -126,6 +126,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index e1881f60..cd5ddbc4 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Christoph Meißner, 2015,2022\n" "Language-Team: German (http://www.transifex.com/coders4help/volunteer-planner/language/de/)\n" @@ -140,6 +140,17 @@ msgstr "Benutzerkonto löschen" msgid "Your user account has been deleted." msgstr "Dein Benutzerkonto wurde gelöscht." +#, python-brace-format +msgid "Error {error_code}" +msgstr "Fehler {error_code}" + +msgid "Permission denied" +msgstr "Keine Berechtigung" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "Du kannst diese Aktion nicht ausführen und wurdest stattdessen nach {redirect_path} umgeleitet." + msgid "additional CSS" msgstr "zusätzliches CSS" diff --git a/locale/el/LC_MESSAGES/django.po b/locale/el/LC_MESSAGES/django.po index 91d1bf93..a3b4ba7c 100644 --- a/locale/el/LC_MESSAGES/django.po +++ b/locale/el/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Greek (http://www.transifex.com/coders4help/volunteer-planner/language/el/)\n" @@ -130,6 +130,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "επιπλέον CSS" diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index bd195b4c..f74af01e 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2015-10-04 21:53+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: English (http://www.transifex.com/coders4help/volunteer-planner/language/en/)\n" @@ -122,6 +122,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 838d3e75..d229397d 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-04-13 17:27+0000\n" "Last-Translator: Antonio Mireles \n" "Language-Team: Spanish (http://www.transifex.com/coders4help/volunteer-planner/language/es/)\n" @@ -129,6 +129,17 @@ msgstr "Eliminar Cuenta" msgid "Your user account has been deleted." msgstr "Tu cuenta de usuario ha sido eliminada." +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "CSS adicional" diff --git a/locale/es_MX/LC_MESSAGES/django.po b/locale/es_MX/LC_MESSAGES/django.po index 553c701c..1ddd2aac 100644 --- a/locale/es_MX/LC_MESSAGES/django.po +++ b/locale/es_MX/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/coders4help/volunteer-planner/language/es_MX/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/fa/LC_MESSAGES/django.po b/locale/fa/LC_MESSAGES/django.po index de359261..c6e06b1e 100644 --- a/locale/fa/LC_MESSAGES/django.po +++ b/locale/fa/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Persian (http://www.transifex.com/coders4help/volunteer-planner/language/fa/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 65c6136f..2f068b30 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-12-08 20:50+0000\n" "Last-Translator: Dolfeus \n" "Language-Team: French (http://www.transifex.com/coders4help/volunteer-planner/language/fr/)\n" @@ -131,6 +131,17 @@ msgstr "Supprimer le compte" msgid "Your user account has been deleted." msgstr "Votre compte a été supprimé" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "CSS supplémentaire" diff --git a/locale/hr/LC_MESSAGES/django.po b/locale/hr/LC_MESSAGES/django.po index 52ad7ddb..6ce1cfd8 100644 --- a/locale/hr/LC_MESSAGES/django.po +++ b/locale/hr/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Croatian (http://www.transifex.com/coders4help/volunteer-planner/language/hr/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/hu/LC_MESSAGES/django.po b/locale/hu/LC_MESSAGES/django.po index 7ada1a0f..0c4b829a 100644 --- a/locale/hu/LC_MESSAGES/django.po +++ b/locale/hu/LC_MESSAGES/django.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Hungarian (http://www.transifex.com/coders4help/volunteer-planner/language/hu/)\n" @@ -135,6 +135,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/hy/LC_MESSAGES/django.po b/locale/hy/LC_MESSAGES/django.po index d1f466dd..21f94653 100644 --- a/locale/hy/LC_MESSAGES/django.po +++ b/locale/hy/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Armenian (http://www.transifex.com/coders4help/volunteer-planner/language/hy/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/it/LC_MESSAGES/django.po b/locale/it/LC_MESSAGES/django.po index 24d03409..860b9c27 100644 --- a/locale/it/LC_MESSAGES/django.po +++ b/locale/it/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Italian (http://www.transifex.com/coders4help/volunteer-planner/language/it/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/nl/LC_MESSAGES/django.po b/locale/nl/LC_MESSAGES/django.po index be276440..2c98cb5a 100644 --- a/locale/nl/LC_MESSAGES/django.po +++ b/locale/nl/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Dutch (http://www.transifex.com/coders4help/volunteer-planner/language/nl/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/no/LC_MESSAGES/django.po b/locale/no/LC_MESSAGES/django.po index e1d8c317..42471047 100644 --- a/locale/no/LC_MESSAGES/django.po +++ b/locale/no/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Norwegian (http://www.transifex.com/coders4help/volunteer-planner/language/no/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/pl/LC_MESSAGES/django.po b/locale/pl/LC_MESSAGES/django.po index 590cbbb7..15928e8f 100644 --- a/locale/pl/LC_MESSAGES/django.po +++ b/locale/pl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2017-09-22 15:29+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Polish (http://www.transifex.com/coders4help/volunteer-planner/language/pl/)\n" @@ -129,6 +129,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index aa464b58..314bdadf 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Portuguese (http://www.transifex.com/coders4help/volunteer-planner/language/pt/)\n" @@ -130,6 +130,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "CSS adicional" diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index 913c69f7..278d6186 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/coders4help/volunteer-planner/language/pt_BR/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/ro/LC_MESSAGES/django.po b/locale/ro/LC_MESSAGES/django.po index ab111877..8b21299a 100644 --- a/locale/ro/LC_MESSAGES/django.po +++ b/locale/ro/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Romanian (http://www.transifex.com/coders4help/volunteer-planner/language/ro/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po index 489f4943..3491a11a 100644 --- a/locale/ru/LC_MESSAGES/django.po +++ b/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2022-03-10 13:42+0000\n" "Last-Translator: Anna Dunn\n" "Language-Team: Russian (http://www.transifex.com/coders4help/volunteer-planner/language/ru/)\n" @@ -129,6 +129,17 @@ msgstr "Удалить аккаунт" msgid "Your user account has been deleted." msgstr "Ваш аккаунт был удален." +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "дополнительный CSS" diff --git a/locale/sk/LC_MESSAGES/django.po b/locale/sk/LC_MESSAGES/django.po index a0535226..06625e7f 100644 --- a/locale/sk/LC_MESSAGES/django.po +++ b/locale/sk/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Slovak (http://www.transifex.com/coders4help/volunteer-planner/language/sk/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/sl/LC_MESSAGES/django.po b/locale/sl/LC_MESSAGES/django.po index 9132d83c..1f5abbbd 100644 --- a/locale/sl/LC_MESSAGES/django.po +++ b/locale/sl/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Slovenian (http://www.transifex.com/coders4help/volunteer-planner/language/sl/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/sq/LC_MESSAGES/django.po b/locale/sq/LC_MESSAGES/django.po index 33982ad7..e5f54179 100644 --- a/locale/sq/LC_MESSAGES/django.po +++ b/locale/sq/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Albanian (http://www.transifex.com/coders4help/volunteer-planner/language/sq/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/sr_RS/LC_MESSAGES/django.po b/locale/sr_RS/LC_MESSAGES/django.po index e59f40c5..0c50ff10 100644 --- a/locale/sr_RS/LC_MESSAGES/django.po +++ b/locale/sr_RS/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Serbian (Serbia) (http://www.transifex.com/coders4help/volunteer-planner/language/sr_RS/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po index a453aca9..291c8e94 100644 --- a/locale/sv/LC_MESSAGES/django.po +++ b/locale/sv/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Swedish (http://www.transifex.com/coders4help/volunteer-planner/language/sv/)\n" @@ -132,6 +132,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "ytterligare CSS" diff --git a/locale/tr/LC_MESSAGES/django.po b/locale/tr/LC_MESSAGES/django.po index 49979d4c..fc267446 100644 --- a/locale/tr/LC_MESSAGES/django.po +++ b/locale/tr/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2016-01-29 08:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Turkish (http://www.transifex.com/coders4help/volunteer-planner/language/tr/)\n" @@ -126,6 +126,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/tr_TR/LC_MESSAGES/django.po b/locale/tr_TR/LC_MESSAGES/django.po index 68f5a73e..d10baf46 100644 --- a/locale/tr_TR/LC_MESSAGES/django.po +++ b/locale/tr_TR/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/coders4help/volunteer-planner/language/tr_TR/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/uk/LC_MESSAGES/django.po b/locale/uk/LC_MESSAGES/django.po index 299240ca..5376f338 100644 --- a/locale/uk/LC_MESSAGES/django.po +++ b/locale/uk/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Anna Dunn, 2022\n" "Language-Team: Ukrainian (http://www.transifex.com/coders4help/volunteer-planner/language/uk/)\n" @@ -126,6 +126,17 @@ msgstr "Видалити обліковий запис" msgid "Your user account has been deleted." msgstr "Ваш обліковий запис користувача було видалено." +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index e984db59..a872ab8b 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-03-30 10:51+0200\n" +"POT-Creation-Date: 2022-03-30 18:28+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Chinese (China) (http://www.transifex.com/coders4help/volunteer-planner/language/zh_CN/)\n" @@ -125,6 +125,17 @@ msgstr "" msgid "Your user account has been deleted." msgstr "" +#, python-brace-format +msgid "Error {error_code}" +msgstr "" + +msgid "Permission denied" +msgstr "" + +#, python-brace-format +msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgstr "" + msgid "additional CSS" msgstr "" diff --git a/volunteer_planner/settings/base.py b/volunteer_planner/settings/base.py index 12c36b3f..aa9905ea 100644 --- a/volunteer_planner/settings/base.py +++ b/volunteer_planner/settings/base.py @@ -76,6 +76,7 @@ "django.contrib.auth.middleware.AuthenticationMiddleware", "django.contrib.messages.middleware.MessageMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", + "common.admin.RedirectOnAdminPermissionDenied403", ] AUTHENTICATION_BACKENDS = [ From dd1fd487b307cb0ce96d642239ac35177a234125 Mon Sep 17 00:00:00 2001 From: Christoph Meissner Date: Wed, 30 Mar 2022 19:14:54 +0200 Subject: [PATCH 4/5] Escape non-safe string parts better safe than sorry --- common/admin.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/admin.py b/common/admin.py index 53823844..1909bee8 100644 --- a/common/admin.py +++ b/common/admin.py @@ -4,6 +4,7 @@ from django.core.exceptions import PermissionDenied from django.http import HttpResponseRedirect from django.urls import reverse +from django.utils.html import escape from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ @@ -38,9 +39,7 @@ def process_exception(self, request, exception): ).format(redirect_path=redirect_path) messages.error( request, - mark_safe( - f"{note}
" - f"{error} - {request.method} {request.path}" - ), + mark_safe(f"{note}
{error} - ") + + escape(f"{request.method} {request.path}"), ) return HttpResponseRedirect(redirect_path) From 0e5abfb5ba217d1869a183e10a1c9bc606d4f520 Mon Sep 17 00:00:00 2001 From: Christoph Meissner Date: Wed, 30 Mar 2022 19:19:52 +0200 Subject: [PATCH 5/5] Fix wording --- common/admin.py | 2 +- locale/ar/LC_MESSAGES/django.po | 2 +- locale/bg/LC_MESSAGES/django.po | 2 +- locale/cs/LC_MESSAGES/django.po | 2 +- locale/da/LC_MESSAGES/django.po | 2 +- locale/de/LC_MESSAGES/django.po | 2 +- locale/el/LC_MESSAGES/django.po | 2 +- locale/en/LC_MESSAGES/django.po | 2 +- locale/es/LC_MESSAGES/django.po | 2 +- locale/es_MX/LC_MESSAGES/django.po | 2 +- locale/fa/LC_MESSAGES/django.po | 2 +- locale/fr/LC_MESSAGES/django.po | 2 +- locale/hr/LC_MESSAGES/django.po | 2 +- locale/hu/LC_MESSAGES/django.po | 2 +- locale/hy/LC_MESSAGES/django.po | 2 +- locale/it/LC_MESSAGES/django.po | 2 +- locale/nl/LC_MESSAGES/django.po | 2 +- locale/no/LC_MESSAGES/django.po | 2 +- locale/pl/LC_MESSAGES/django.po | 2 +- locale/pt/LC_MESSAGES/django.po | 2 +- locale/pt_BR/LC_MESSAGES/django.po | 2 +- locale/ro/LC_MESSAGES/django.po | 2 +- locale/ru/LC_MESSAGES/django.po | 2 +- locale/sk/LC_MESSAGES/django.po | 2 +- locale/sl/LC_MESSAGES/django.po | 2 +- locale/sq/LC_MESSAGES/django.po | 2 +- locale/sr_RS/LC_MESSAGES/django.po | 2 +- locale/sv/LC_MESSAGES/django.po | 2 +- locale/tr/LC_MESSAGES/django.po | 2 +- locale/tr_TR/LC_MESSAGES/django.po | 2 +- locale/uk/LC_MESSAGES/django.po | 2 +- locale/zh_CN/LC_MESSAGES/django.po | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/common/admin.py b/common/admin.py index 1909bee8..41531f87 100644 --- a/common/admin.py +++ b/common/admin.py @@ -35,7 +35,7 @@ def process_exception(self, request, exception): permission_denied = _("Permission denied") error = f"{error}: {permission_denied}" note = _( - "You were not allowed to do this and have been redirected to {redirect_path}." # noqa: E501 + "You are not allowed to do this and have been redirected to {redirect_path}." # noqa: E501 ).format(redirect_path=redirect_path) messages.error( request, diff --git a/locale/ar/LC_MESSAGES/django.po b/locale/ar/LC_MESSAGES/django.po index aea80928..ac6398a4 100644 --- a/locale/ar/LC_MESSAGES/django.po +++ b/locale/ar/LC_MESSAGES/django.po @@ -137,7 +137,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/bg/LC_MESSAGES/django.po b/locale/bg/LC_MESSAGES/django.po index 9fbf96d7..e544bffa 100644 --- a/locale/bg/LC_MESSAGES/django.po +++ b/locale/bg/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/cs/LC_MESSAGES/django.po b/locale/cs/LC_MESSAGES/django.po index 67cd9e1a..de11625e 100644 --- a/locale/cs/LC_MESSAGES/django.po +++ b/locale/cs/LC_MESSAGES/django.po @@ -136,7 +136,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/da/LC_MESSAGES/django.po b/locale/da/LC_MESSAGES/django.po index 23018970..497063c2 100644 --- a/locale/da/LC_MESSAGES/django.po +++ b/locale/da/LC_MESSAGES/django.po @@ -134,7 +134,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index cd5ddbc4..30a2dc19 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -148,7 +148,7 @@ msgid "Permission denied" msgstr "Keine Berechtigung" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "Du kannst diese Aktion nicht ausführen und wurdest stattdessen nach {redirect_path} umgeleitet." msgid "additional CSS" diff --git a/locale/el/LC_MESSAGES/django.po b/locale/el/LC_MESSAGES/django.po index a3b4ba7c..416d6431 100644 --- a/locale/el/LC_MESSAGES/django.po +++ b/locale/el/LC_MESSAGES/django.po @@ -138,7 +138,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index f74af01e..86d29ce2 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -130,7 +130,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index d229397d..f56835dd 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -137,7 +137,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/es_MX/LC_MESSAGES/django.po b/locale/es_MX/LC_MESSAGES/django.po index 1ddd2aac..82d5f011 100644 --- a/locale/es_MX/LC_MESSAGES/django.po +++ b/locale/es_MX/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/fa/LC_MESSAGES/django.po b/locale/fa/LC_MESSAGES/django.po index c6e06b1e..07f982dd 100644 --- a/locale/fa/LC_MESSAGES/django.po +++ b/locale/fa/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 2f068b30..e7f674a8 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -139,7 +139,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/hr/LC_MESSAGES/django.po b/locale/hr/LC_MESSAGES/django.po index 6ce1cfd8..16ffb2a6 100644 --- a/locale/hr/LC_MESSAGES/django.po +++ b/locale/hr/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/hu/LC_MESSAGES/django.po b/locale/hu/LC_MESSAGES/django.po index 0c4b829a..5f8280e0 100644 --- a/locale/hu/LC_MESSAGES/django.po +++ b/locale/hu/LC_MESSAGES/django.po @@ -143,7 +143,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/hy/LC_MESSAGES/django.po b/locale/hy/LC_MESSAGES/django.po index 21f94653..634e09fc 100644 --- a/locale/hy/LC_MESSAGES/django.po +++ b/locale/hy/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/it/LC_MESSAGES/django.po b/locale/it/LC_MESSAGES/django.po index 860b9c27..e5aa9695 100644 --- a/locale/it/LC_MESSAGES/django.po +++ b/locale/it/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/nl/LC_MESSAGES/django.po b/locale/nl/LC_MESSAGES/django.po index 2c98cb5a..74d58556 100644 --- a/locale/nl/LC_MESSAGES/django.po +++ b/locale/nl/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/no/LC_MESSAGES/django.po b/locale/no/LC_MESSAGES/django.po index 42471047..b3d3ea7e 100644 --- a/locale/no/LC_MESSAGES/django.po +++ b/locale/no/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/pl/LC_MESSAGES/django.po b/locale/pl/LC_MESSAGES/django.po index 15928e8f..7ff6ba9e 100644 --- a/locale/pl/LC_MESSAGES/django.po +++ b/locale/pl/LC_MESSAGES/django.po @@ -137,7 +137,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 314bdadf..ae411e7d 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -138,7 +138,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index 278d6186..fe2adffb 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/ro/LC_MESSAGES/django.po b/locale/ro/LC_MESSAGES/django.po index 8b21299a..b5406a9d 100644 --- a/locale/ro/LC_MESSAGES/django.po +++ b/locale/ro/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po index 3491a11a..a711b1ce 100644 --- a/locale/ru/LC_MESSAGES/django.po +++ b/locale/ru/LC_MESSAGES/django.po @@ -137,7 +137,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/sk/LC_MESSAGES/django.po b/locale/sk/LC_MESSAGES/django.po index 06625e7f..5cd3a692 100644 --- a/locale/sk/LC_MESSAGES/django.po +++ b/locale/sk/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/sl/LC_MESSAGES/django.po b/locale/sl/LC_MESSAGES/django.po index 1f5abbbd..1e612538 100644 --- a/locale/sl/LC_MESSAGES/django.po +++ b/locale/sl/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/sq/LC_MESSAGES/django.po b/locale/sq/LC_MESSAGES/django.po index e5f54179..dd5bc152 100644 --- a/locale/sq/LC_MESSAGES/django.po +++ b/locale/sq/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/sr_RS/LC_MESSAGES/django.po b/locale/sr_RS/LC_MESSAGES/django.po index 0c50ff10..92083573 100644 --- a/locale/sr_RS/LC_MESSAGES/django.po +++ b/locale/sr_RS/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po index 291c8e94..182a3e29 100644 --- a/locale/sv/LC_MESSAGES/django.po +++ b/locale/sv/LC_MESSAGES/django.po @@ -140,7 +140,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/tr/LC_MESSAGES/django.po b/locale/tr/LC_MESSAGES/django.po index fc267446..ad96440a 100644 --- a/locale/tr/LC_MESSAGES/django.po +++ b/locale/tr/LC_MESSAGES/django.po @@ -134,7 +134,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/tr_TR/LC_MESSAGES/django.po b/locale/tr_TR/LC_MESSAGES/django.po index d10baf46..0d3584bd 100644 --- a/locale/tr_TR/LC_MESSAGES/django.po +++ b/locale/tr_TR/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/uk/LC_MESSAGES/django.po b/locale/uk/LC_MESSAGES/django.po index 5376f338..64205700 100644 --- a/locale/uk/LC_MESSAGES/django.po +++ b/locale/uk/LC_MESSAGES/django.po @@ -134,7 +134,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS" diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index a872ab8b..57283ab4 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -133,7 +133,7 @@ msgid "Permission denied" msgstr "" #, python-brace-format -msgid "You were not allowed to do this and have been redirected to {redirect_path}." +msgid "You are not allowed to do this and have been redirected to {redirect_path}." msgstr "" msgid "additional CSS"