From 07a0d67a098e8ae5946ec78f3b19569100c36542 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Fri, 12 Jul 2024 08:41:14 +0000 Subject: [PATCH] Merged in feature/VBV-456-dj-upgrade (pull request #352) Upgrade Django * Upgrade Django * Update French translation for `Email` * Update French translation for `Email` take 2 * Update translation for `Email` take 3 * Update translation for `Email` take 6 Approved-by: Daniel Egger --- server/locale/fr/LC_MESSAGES/django.mo | Bin 2618 -> 2619 bytes server/locale/fr/LC_MESSAGES/django.po | 49 +++++++++++------------ server/locale/it/LC_MESSAGES/django.mo | Bin 2527 -> 2526 bytes server/locale/it/LC_MESSAGES/django.po | 49 +++++++++++------------ server/requirements/requirements-dev.txt | 3 +- server/requirements/requirements.in | 2 +- server/requirements/requirements.txt | 3 +- 7 files changed, 51 insertions(+), 55 deletions(-) diff --git a/server/locale/fr/LC_MESSAGES/django.mo b/server/locale/fr/LC_MESSAGES/django.mo index 4bf66c9da0ddbb21cd9b59cb4283183ae62f6714..ce61e8a72769e42ae28aef9a3d86d6a038be81e4 100644 GIT binary patch delta 194 zcmXZVu?m7<6o%pNC$S9cU)&6gXbH5Ty)AE{sWotD=nmSYiz!^BZbOCe4!nVupk6{a zoacN84(Aa(gIjDauB3`K#TFOX^?5RseDVxOxWX}RkkXd6!xR(DagQY)&~lXF2~(`` mjG-qj@#<;)AMPyXEE?oiZ?yRBwR{c9QSmY#$0SAV9tS_ka~4kk delta 192 zcmXZVu?m845XbSKl$IfX7pH`faA>HYy-{DGsWlK>e1qojWdw&HUqgj@17DyiqAwvF z_qpG}aZT_Ds;zakCAE%Z@P%s}#_Y``j~wD0H@Lt9QaaKSOmK%cJmDSBXgJC+#}r#E laOp}hmag{yp<)rS=#X2z(Z}zo;cG}<)lcg)t$XJ(`2m;E77PFY diff --git a/server/locale/fr/LC_MESSAGES/django.po b/server/locale/fr/LC_MESSAGES/django.po index d338278e..949dc188 100644 --- a/server/locale/fr/LC_MESSAGES/django.po +++ b/server/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 15:24+0200\n" +"POT-Creation-Date: 2024-07-12 09:37+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,32 +38,32 @@ msgstr "Réussi" msgid "Nicht bestanden" msgstr "Échoué" -#: vbv_lernwelt/assignment/export.py:203 vbv_lernwelt/assignment/export.py:206 -#: vbv_lernwelt/assignment/export.py:207 +#: vbv_lernwelt/assignment/export.py:204 vbv_lernwelt/assignment/export.py:208 +#: vbv_lernwelt/assignment/export.py:209 msgid "Keine Daten" msgstr "Aucune donnée" -#: vbv_lernwelt/core/admin.py:32 +#: vbv_lernwelt/core/admin.py:38 vbv_lernwelt/sso/admin.py:83 msgid "Personal info" msgstr "" -#: vbv_lernwelt/core/admin.py:34 +#: vbv_lernwelt/core/admin.py:40 msgid "Permissions" msgstr "" -#: vbv_lernwelt/core/admin.py:45 +#: vbv_lernwelt/core/admin.py:51 msgid "Important dates" msgstr "" -#: vbv_lernwelt/core/admin.py:47 +#: vbv_lernwelt/core/admin.py:53 msgid "Profile" msgstr "" -#: vbv_lernwelt/core/admin.py:62 +#: vbv_lernwelt/core/admin.py:70 msgid "Organisation" msgstr "" -#: vbv_lernwelt/core/admin.py:75 +#: vbv_lernwelt/core/admin.py:83 vbv_lernwelt/sso/admin.py:86 msgid "Additional data" msgstr "" @@ -87,31 +87,31 @@ msgstr "" msgid "Lehrgang-Seite" msgstr "" -#: vbv_lernwelt/course/models.py:272 +#: vbv_lernwelt/course/models.py:278 msgid "Teilnehmer" msgstr "" -#: vbv_lernwelt/course/models.py:273 +#: vbv_lernwelt/course/models.py:279 msgid "Experte/Trainer" msgstr "" -#: vbv_lernwelt/course/models.py:332 +#: vbv_lernwelt/course/models.py:338 msgid "Dokumente im Circle ein/aus" msgstr "" -#: vbv_lernwelt/course/models.py:336 +#: vbv_lernwelt/course/models.py:342 msgid "Lernmentor-Funktion ein/aus" msgstr "" -#: vbv_lernwelt/course/models.py:340 +#: vbv_lernwelt/course/models.py:346 msgid "Kompetenzweise ein/aus" msgstr "" -#: vbv_lernwelt/course/models.py:343 +#: vbv_lernwelt/course/models.py:349 msgid "Versicherungsvermittler-Lehrgang" msgstr "" -#: vbv_lernwelt/course/models.py:344 +#: vbv_lernwelt/course/models.py:350 msgid "ÜK-Lehrgang" msgstr "" @@ -120,31 +120,30 @@ msgid "export_anwesenheit" msgstr "export_presence" #: vbv_lernwelt/course_session/services/export_attendance.py:92 -#| msgid "Anwesend" msgid "Anwesenheit" msgstr "Présence" -#: vbv_lernwelt/course_session/services/export_attendance.py:116 +#: vbv_lernwelt/course_session/services/export_attendance.py:117 msgid "Anwesend" msgstr "Présent" -#: vbv_lernwelt/course_session/services/export_attendance.py:116 +#: vbv_lernwelt/course_session/services/export_attendance.py:117 msgid "Nicht anwesend" msgstr "Pas présent" -#: vbv_lernwelt/course_session/services/export_attendance.py:123 +#: vbv_lernwelt/course_session/services/export_attendance.py:124 msgid "Vorname" msgstr "Prénom" -#: vbv_lernwelt/course_session/services/export_attendance.py:124 +#: vbv_lernwelt/course_session/services/export_attendance.py:125 msgid "Nachname" msgstr "Nom de famille" -#: vbv_lernwelt/course_session/services/export_attendance.py:125 -msgid "Email" -msgstr "Email" - #: vbv_lernwelt/course_session/services/export_attendance.py:126 +msgid "Email" +msgstr "E-mail" + +#: vbv_lernwelt/course_session/services/export_attendance.py:127 msgid "Lehrvertragsnummer" msgstr "Numéro de contrat d'apprentissage" diff --git a/server/locale/it/LC_MESSAGES/django.mo b/server/locale/it/LC_MESSAGES/django.mo index e565176b12302822ffe11e760d3c45cc798eda61..9cd960ba104f8242c39253523e57dd8031e5d563 100644 GIT binary patch delta 192 zcmXZUu?m846vg2qsr@B~KpGkXNeq;zrL85JdJX56wnnE`M+fH~AaHB$6+|M)v8M?7 z2`%Tl=U%v7@D6TED|aL{t~A0IhWNoD8p6jh_I*Zp7^97A+~NjfJmCRL++&AloEs^@ l3Nw7*6c?UWN*Q*1?H5PnrVCE6_a0cNL3sGaDRwwSL-;ttzE22)Gjwo`TijrbN8IBTGi>pMkt?#m m5_7CE#JQ1`Bn&&g_KO2@lM9Zq_\n" "Language-Team: LANGUAGE \n" @@ -38,32 +38,32 @@ msgstr "Superato" msgid "Nicht bestanden" msgstr "Fallito" -#: vbv_lernwelt/assignment/export.py:203 vbv_lernwelt/assignment/export.py:206 -#: vbv_lernwelt/assignment/export.py:207 +#: vbv_lernwelt/assignment/export.py:204 vbv_lernwelt/assignment/export.py:208 +#: vbv_lernwelt/assignment/export.py:209 msgid "Keine Daten" msgstr "Nessun dato" -#: vbv_lernwelt/core/admin.py:32 +#: vbv_lernwelt/core/admin.py:38 vbv_lernwelt/sso/admin.py:83 msgid "Personal info" msgstr "" -#: vbv_lernwelt/core/admin.py:34 +#: vbv_lernwelt/core/admin.py:40 msgid "Permissions" msgstr "" -#: vbv_lernwelt/core/admin.py:45 +#: vbv_lernwelt/core/admin.py:51 msgid "Important dates" msgstr "" -#: vbv_lernwelt/core/admin.py:47 +#: vbv_lernwelt/core/admin.py:53 msgid "Profile" msgstr "" -#: vbv_lernwelt/core/admin.py:62 +#: vbv_lernwelt/core/admin.py:70 msgid "Organisation" msgstr "" -#: vbv_lernwelt/core/admin.py:75 +#: vbv_lernwelt/core/admin.py:83 vbv_lernwelt/sso/admin.py:86 msgid "Additional data" msgstr "" @@ -87,31 +87,31 @@ msgstr "" msgid "Lehrgang-Seite" msgstr "" -#: vbv_lernwelt/course/models.py:272 +#: vbv_lernwelt/course/models.py:278 msgid "Teilnehmer" msgstr "" -#: vbv_lernwelt/course/models.py:273 +#: vbv_lernwelt/course/models.py:279 msgid "Experte/Trainer" msgstr "" -#: vbv_lernwelt/course/models.py:332 +#: vbv_lernwelt/course/models.py:338 msgid "Dokumente im Circle ein/aus" msgstr "" -#: vbv_lernwelt/course/models.py:336 +#: vbv_lernwelt/course/models.py:342 msgid "Lernmentor-Funktion ein/aus" msgstr "" -#: vbv_lernwelt/course/models.py:340 +#: vbv_lernwelt/course/models.py:346 msgid "Kompetenzweise ein/aus" msgstr "" -#: vbv_lernwelt/course/models.py:343 +#: vbv_lernwelt/course/models.py:349 msgid "Versicherungsvermittler-Lehrgang" msgstr "" -#: vbv_lernwelt/course/models.py:344 +#: vbv_lernwelt/course/models.py:350 msgid "ÜK-Lehrgang" msgstr "" @@ -120,31 +120,30 @@ msgid "export_anwesenheit" msgstr "esportazione_presenza" #: vbv_lernwelt/course_session/services/export_attendance.py:92 -#| msgid "Anwesend" msgid "Anwesenheit" msgstr "Presenza" -#: vbv_lernwelt/course_session/services/export_attendance.py:116 +#: vbv_lernwelt/course_session/services/export_attendance.py:117 msgid "Anwesend" msgstr "Presente" -#: vbv_lernwelt/course_session/services/export_attendance.py:116 +#: vbv_lernwelt/course_session/services/export_attendance.py:117 msgid "Nicht anwesend" msgstr "Non presente" -#: vbv_lernwelt/course_session/services/export_attendance.py:123 +#: vbv_lernwelt/course_session/services/export_attendance.py:124 msgid "Vorname" msgstr "Nome" -#: vbv_lernwelt/course_session/services/export_attendance.py:124 +#: vbv_lernwelt/course_session/services/export_attendance.py:125 msgid "Nachname" msgstr "Cognome" -#: vbv_lernwelt/course_session/services/export_attendance.py:125 -msgid "Email" -msgstr "E-mail" - #: vbv_lernwelt/course_session/services/export_attendance.py:126 +msgid "Email" +msgstr "Email" + +#: vbv_lernwelt/course_session/services/export_attendance.py:127 msgid "Lehrvertragsnummer" msgstr "Numero di contratto di tirocinio" diff --git a/server/requirements/requirements-dev.txt b/server/requirements/requirements-dev.txt index c7bff388..a39638bc 100644 --- a/server/requirements/requirements-dev.txt +++ b/server/requirements/requirements-dev.txt @@ -119,7 +119,7 @@ distlib==0.3.7 # via virtualenv dj-database-url==2.0.0 # via -r requirements.in -django==3.2.20 +django==4.2.13 # via # -r requirements.in # dj-database-url @@ -466,7 +466,6 @@ python-slugify==8.0.1 pytz==2023.3 # via # -r requirements.in - # django # django-modelcluster # django-notifications-hq # djangorestframework diff --git a/server/requirements/requirements.in b/server/requirements/requirements.in index e9bb64b3..95f30844 100644 --- a/server/requirements/requirements.in +++ b/server/requirements/requirements.in @@ -11,7 +11,7 @@ click # Django # ------------------------------------------------------------------------------ -django<4 # https://www.djangoproject.com/ +django==4.2.13 # https://www.djangoproject.com/ django-model-utils # https://github.com/jazzband/django-model-utils django-redis # https://github.com/jazzband/django-redis # Django REST Framework diff --git a/server/requirements/requirements.txt b/server/requirements/requirements.txt index c8c19eb4..f8ffe439 100644 --- a/server/requirements/requirements.txt +++ b/server/requirements/requirements.txt @@ -83,7 +83,7 @@ deprecation==2.1.0 # via python-keycloak dj-database-url==2.0.0 # via -r requirements.in -django==3.2.20 +django==4.2.13 # via # -r requirements.in # dj-database-url @@ -281,7 +281,6 @@ python-slugify==8.0.1 pytz==2023.3 # via # -r requirements.in - # django # django-modelcluster # django-notifications-hq # djangorestframework