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
This commit is contained in:
Christian Cueni 2024-07-12 08:41:14 +00:00 committed by Daniel Egger
parent 9c58fbc0aa
commit 07a0d67a09
7 changed files with 51 additions and 55 deletions

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -38,32 +38,32 @@ msgstr "Réussi"
msgid "Nicht bestanden" msgid "Nicht bestanden"
msgstr "Échoué" msgstr "Échoué"
#: vbv_lernwelt/assignment/export.py:203 vbv_lernwelt/assignment/export.py:206 #: vbv_lernwelt/assignment/export.py:204 vbv_lernwelt/assignment/export.py:208
#: vbv_lernwelt/assignment/export.py:207 #: vbv_lernwelt/assignment/export.py:209
msgid "Keine Daten" msgid "Keine Daten"
msgstr "Aucune donnée" 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" msgid "Personal info"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:34 #: vbv_lernwelt/core/admin.py:40
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:45 #: vbv_lernwelt/core/admin.py:51
msgid "Important dates" msgid "Important dates"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:47 #: vbv_lernwelt/core/admin.py:53
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:62 #: vbv_lernwelt/core/admin.py:70
msgid "Organisation" msgid "Organisation"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:75 #: vbv_lernwelt/core/admin.py:83 vbv_lernwelt/sso/admin.py:86
msgid "Additional data" msgid "Additional data"
msgstr "" msgstr ""
@ -87,31 +87,31 @@ msgstr ""
msgid "Lehrgang-Seite" msgid "Lehrgang-Seite"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:272 #: vbv_lernwelt/course/models.py:278
msgid "Teilnehmer" msgid "Teilnehmer"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:273 #: vbv_lernwelt/course/models.py:279
msgid "Experte/Trainer" msgid "Experte/Trainer"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:332 #: vbv_lernwelt/course/models.py:338
msgid "Dokumente im Circle ein/aus" msgid "Dokumente im Circle ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:336 #: vbv_lernwelt/course/models.py:342
msgid "Lernmentor-Funktion ein/aus" msgid "Lernmentor-Funktion ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:340 #: vbv_lernwelt/course/models.py:346
msgid "Kompetenzweise ein/aus" msgid "Kompetenzweise ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:343 #: vbv_lernwelt/course/models.py:349
msgid "Versicherungsvermittler-Lehrgang" msgid "Versicherungsvermittler-Lehrgang"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:344 #: vbv_lernwelt/course/models.py:350
msgid "ÜK-Lehrgang" msgid "ÜK-Lehrgang"
msgstr "" msgstr ""
@ -120,31 +120,30 @@ msgid "export_anwesenheit"
msgstr "export_presence" msgstr "export_presence"
#: vbv_lernwelt/course_session/services/export_attendance.py:92 #: vbv_lernwelt/course_session/services/export_attendance.py:92
#| msgid "Anwesend"
msgid "Anwesenheit" msgid "Anwesenheit"
msgstr "Présence" msgstr "Présence"
#: vbv_lernwelt/course_session/services/export_attendance.py:116 #: vbv_lernwelt/course_session/services/export_attendance.py:117
msgid "Anwesend" msgid "Anwesend"
msgstr "Présent" msgstr "Présent"
#: vbv_lernwelt/course_session/services/export_attendance.py:116 #: vbv_lernwelt/course_session/services/export_attendance.py:117
msgid "Nicht anwesend" msgid "Nicht anwesend"
msgstr "Pas présent" msgstr "Pas présent"
#: vbv_lernwelt/course_session/services/export_attendance.py:123 #: vbv_lernwelt/course_session/services/export_attendance.py:124
msgid "Vorname" msgid "Vorname"
msgstr "Prénom" msgstr "Prénom"
#: vbv_lernwelt/course_session/services/export_attendance.py:124 #: vbv_lernwelt/course_session/services/export_attendance.py:125
msgid "Nachname" msgid "Nachname"
msgstr "Nom de famille" 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 #: 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" msgid "Lehrvertragsnummer"
msgstr "Numéro de contrat d'apprentissage" msgstr "Numéro de contrat d'apprentissage"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-06-18 15:24+0200\n" "POT-Creation-Date: 2024-07-12 09:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -38,32 +38,32 @@ msgstr "Superato"
msgid "Nicht bestanden" msgid "Nicht bestanden"
msgstr "Fallito" msgstr "Fallito"
#: vbv_lernwelt/assignment/export.py:203 vbv_lernwelt/assignment/export.py:206 #: vbv_lernwelt/assignment/export.py:204 vbv_lernwelt/assignment/export.py:208
#: vbv_lernwelt/assignment/export.py:207 #: vbv_lernwelt/assignment/export.py:209
msgid "Keine Daten" msgid "Keine Daten"
msgstr "Nessun dato" msgstr "Nessun dato"
#: vbv_lernwelt/core/admin.py:32 #: vbv_lernwelt/core/admin.py:38 vbv_lernwelt/sso/admin.py:83
msgid "Personal info" msgid "Personal info"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:34 #: vbv_lernwelt/core/admin.py:40
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:45 #: vbv_lernwelt/core/admin.py:51
msgid "Important dates" msgid "Important dates"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:47 #: vbv_lernwelt/core/admin.py:53
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:62 #: vbv_lernwelt/core/admin.py:70
msgid "Organisation" msgid "Organisation"
msgstr "" msgstr ""
#: vbv_lernwelt/core/admin.py:75 #: vbv_lernwelt/core/admin.py:83 vbv_lernwelt/sso/admin.py:86
msgid "Additional data" msgid "Additional data"
msgstr "" msgstr ""
@ -87,31 +87,31 @@ msgstr ""
msgid "Lehrgang-Seite" msgid "Lehrgang-Seite"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:272 #: vbv_lernwelt/course/models.py:278
msgid "Teilnehmer" msgid "Teilnehmer"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:273 #: vbv_lernwelt/course/models.py:279
msgid "Experte/Trainer" msgid "Experte/Trainer"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:332 #: vbv_lernwelt/course/models.py:338
msgid "Dokumente im Circle ein/aus" msgid "Dokumente im Circle ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:336 #: vbv_lernwelt/course/models.py:342
msgid "Lernmentor-Funktion ein/aus" msgid "Lernmentor-Funktion ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:340 #: vbv_lernwelt/course/models.py:346
msgid "Kompetenzweise ein/aus" msgid "Kompetenzweise ein/aus"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:343 #: vbv_lernwelt/course/models.py:349
msgid "Versicherungsvermittler-Lehrgang" msgid "Versicherungsvermittler-Lehrgang"
msgstr "" msgstr ""
#: vbv_lernwelt/course/models.py:344 #: vbv_lernwelt/course/models.py:350
msgid "ÜK-Lehrgang" msgid "ÜK-Lehrgang"
msgstr "" msgstr ""
@ -120,31 +120,30 @@ msgid "export_anwesenheit"
msgstr "esportazione_presenza" msgstr "esportazione_presenza"
#: vbv_lernwelt/course_session/services/export_attendance.py:92 #: vbv_lernwelt/course_session/services/export_attendance.py:92
#| msgid "Anwesend"
msgid "Anwesenheit" msgid "Anwesenheit"
msgstr "Presenza" msgstr "Presenza"
#: vbv_lernwelt/course_session/services/export_attendance.py:116 #: vbv_lernwelt/course_session/services/export_attendance.py:117
msgid "Anwesend" msgid "Anwesend"
msgstr "Presente" msgstr "Presente"
#: vbv_lernwelt/course_session/services/export_attendance.py:116 #: vbv_lernwelt/course_session/services/export_attendance.py:117
msgid "Nicht anwesend" msgid "Nicht anwesend"
msgstr "Non presente" msgstr "Non presente"
#: vbv_lernwelt/course_session/services/export_attendance.py:123 #: vbv_lernwelt/course_session/services/export_attendance.py:124
msgid "Vorname" msgid "Vorname"
msgstr "Nome" msgstr "Nome"
#: vbv_lernwelt/course_session/services/export_attendance.py:124 #: vbv_lernwelt/course_session/services/export_attendance.py:125
msgid "Nachname" msgid "Nachname"
msgstr "Cognome" 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 #: vbv_lernwelt/course_session/services/export_attendance.py:126
msgid "Email"
msgstr "Email"
#: vbv_lernwelt/course_session/services/export_attendance.py:127
msgid "Lehrvertragsnummer" msgid "Lehrvertragsnummer"
msgstr "Numero di contratto di tirocinio" msgstr "Numero di contratto di tirocinio"

View File

@ -119,7 +119,7 @@ distlib==0.3.7
# via virtualenv # via virtualenv
dj-database-url==2.0.0 dj-database-url==2.0.0
# via -r requirements.in # via -r requirements.in
django==3.2.20 django==4.2.13
# via # via
# -r requirements.in # -r requirements.in
# dj-database-url # dj-database-url
@ -466,7 +466,6 @@ python-slugify==8.0.1
pytz==2023.3 pytz==2023.3
# via # via
# -r requirements.in # -r requirements.in
# django
# django-modelcluster # django-modelcluster
# django-notifications-hq # django-notifications-hq
# djangorestframework # djangorestframework

View File

@ -11,7 +11,7 @@ click
# Django # 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-model-utils # https://github.com/jazzband/django-model-utils
django-redis # https://github.com/jazzband/django-redis django-redis # https://github.com/jazzband/django-redis
# Django REST Framework # Django REST Framework

View File

@ -83,7 +83,7 @@ deprecation==2.1.0
# via python-keycloak # via python-keycloak
dj-database-url==2.0.0 dj-database-url==2.0.0
# via -r requirements.in # via -r requirements.in
django==3.2.20 django==4.2.13
# via # via
# -r requirements.in # -r requirements.in
# dj-database-url # dj-database-url
@ -281,7 +281,6 @@ python-slugify==8.0.1
pytz==2023.3 pytz==2023.3
# via # via
# -r requirements.in # -r requirements.in
# django
# django-modelcluster # django-modelcluster
# django-notifications-hq # django-notifications-hq
# djangorestframework # djangorestframework