Merge branch 'master' into feature/language-country-code

package.json

@@ -22,7 +22,7 @@
     "d3": "^7.8.2",
     "datatables": "^1.10.18",
     "devbridge-autocomplete": "^1.4.11",
-    "jquery": "^3.6.3",
+    "jquery": "^3.6.4",
     "masonry-layout": "^4.2.2",
     "metrics-graphics": "^2.15.6",
     "popper.js": "^1.16.1",

requirements.txt

@@ -19,7 +19,7 @@ django-email-verification~=0.3.1
 django_compressor~=4.3
 django_extensions~=3.2
 django-storages~=1.13
-django-environ==0.9.0
+django-environ==0.10.0
 easy-thumbnails==2.8.5
 fontawesomefree~=6.3.0
 icalendar==4.1.0
@@ -34,7 +34,7 @@ tzdata==2022.7
 #boto3
 
 # REST API
-django-cors-headers==3.13.0
+django-cors-headers==3.14.0
 django-filter==22.1
 djangorestframework~=3.14
 djangorestframework-simplejwt[crypto]==5.2.2

requirements_dev.txt

@@ -12,7 +12,7 @@ wheel==0.38.4
 pymongo==4.3.3
 
 # Development packages
-coverage==7.1.0
+coverage==7.2.1
 django-debug-toolbar==3.8.1
 tblib==1.7.0
 isort==5.12.0

wger/locale/de/LC_MESSAGES/django.po

@@ -12,15 +12,15 @@ msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-11-10 16:03+0100\n"
-"PO-Revision-Date: 2022-12-14 21:49+0000\n"
-"Last-Translator: Christoph Suesser <fitzzz@fitzzz.de>\n"
+"PO-Revision-Date: 2023-02-20 19:37+0000\n"
+"Last-Translator: Roland Geider <roland@geider.net>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/wger/web/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.15-dev\n"
+"X-Generator: Weblate 4.16-dev\n"
 
 #: config/models/gym_config.py:46 gym/templates/gym/list.html:50
 msgid "Default gym"
@@ -76,10 +76,8 @@ msgid "Another sample day"
 msgstr "Noch ein Beispieltag"
 
 #: core/demo.py:211
-#, fuzzy
-#| msgid "Sample nutrional plan"
 msgid "Sample nutritional plan"
-msgstr "Beispiel Ernährungplan"
+msgstr "Beispiel Ernährungsplan"
 
 #: core/demo.py:343 core/demo.py:345 core/demo.py:347
 #, python-brace-format
@@ -539,10 +537,9 @@ msgstr "E-Mail-Bestätigung"
 
 #: core/templates/email_verification/email_body_html.tpl:9
 #: core/templates/email_verification/email_body_txt.tpl:3
-#, fuzzy, python-format
-#| msgid "Calendar for %(username)s"
+#, python-format
 msgid "You are almost there, %(username)s!"
-msgstr "Kalender für %(username)s"
+msgstr "Fast geschafft %(username)s!"
 
 #: core/templates/email_verification/email_body_html.tpl:11
 #, python-format
@@ -888,10 +885,8 @@ msgid "Administration"
 msgstr "Administration"
 
 #: core/templates/navigation.html:68
-#, fuzzy
-#| msgid "Exercise day"
 msgid "Exercise edit history"
-msgstr "Übungstag"
+msgstr "Übungen - Bearbeitungshistorie"
 
 #: core/templates/navigation.html:69 exercises/models/base.py:84
 msgid "Equipment"
@@ -1416,10 +1411,8 @@ msgid "Preferences"
 msgstr "Einstellungen"
 
 #: core/templates/user/preferences.html:19
-#, fuzzy
-#| msgid "Send emails"
 msgid "Verified email"
-msgstr "E-Mails senden"
+msgstr "Verifizierte E-Mail"
 
 #: core/templates/user/preferences.html:24
 msgid "Unverified email"
@@ -1608,7 +1601,7 @@ msgstr "Sprache"
 
 #: exercises/models/exercise_alias.py:38
 msgid "Alias for an exercise"
-msgstr "Alias für eine Übung"
+msgstr "Alternativer Name für eine Übung"
 
 #: exercises/models/image.py:55
 msgid "Line"
@@ -1667,13 +1660,12 @@ msgstr "Alternative Bezeichnung"
 
 #: exercises/models/muscle.py:48
 msgid "A more basic name for the muscle"
-msgstr "Einfacher Name füür den Muskel"
+msgstr "Einfacherer Name für den Muskel"
 
 #: exercises/models/video.py:50
-#, fuzzy, python-format
-#| msgid "Maximum file size is 100MB."
+#, python-format
 msgid "Maximum file size is %(size)sMB."
-msgstr "Die maximale Dateigröße beträgt 100 MB."
+msgstr "Die maximale Dateigröße beträgt %(size)sMB."
 
 #: exercises/models/video.py:57 exercises/models/video.py:65
 msgid "File type is not supported"
@@ -1685,7 +1677,7 @@ msgstr "Die Datei ist kein gültiges Video"
 
 #: exercises/models/video.py:101
 msgid "Main video"
-msgstr "Hauptvideo"
+msgstr "Hauptfilm"
 
 #: exercises/models/video.py:107
 msgid "Video"
@@ -1731,8 +1723,6 @@ msgid "Exercise admin history"
 msgstr "Übungstag"
 
 #: exercises/templates/history/overview.html:27
-#, fuzzy
-#| msgid "Actions"
 msgid "Action"
 msgstr "Aktionen"
 
@@ -1748,18 +1738,12 @@ msgid "User"
 msgstr "Benutzer"
 
 #: exercises/templates/history/overview.html:29
-#, fuzzy
-#| msgctxt "As in \"email subject\""
-#| msgid "Subject"
 msgid "Object"
-msgstr "Betreff"
+msgstr "Objekt"
 
 #: exercises/templates/history/overview.html:31
-#, fuzzy
-#| msgctxt "Noun, not verb"
-#| msgid "Change"
 msgid "Changes"
-msgstr "Änderung"
+msgstr "Änderungen"
 
 #: exercises/templates/history/overview.html:32
 msgid "Revert"
@@ -1770,10 +1754,8 @@ msgid "View Object"
 msgstr "Objekt anzeigen"
 
 #: exercises/templates/history/overview.html:75
-#, fuzzy
-#| msgid "View logs"
 msgid "View changes"
-msgstr "Logs anzeigen"
+msgstr "Änderungen anzeigen"
 
 #: exercises/templates/history/overview.html:86
 msgid "Revert changes"
@@ -1805,13 +1787,9 @@ msgid "Delete equipment?"
 msgstr "Gerät löschen?"
 
 #: exercises/views/exercises.py:161
-#, fuzzy, python-format
-#| msgid ""
-#| "%(name_original)s is too similar to existing exercise "
-#| "\"%(exercise_name)s\""
+#, python-format
 msgid "%(name)s is too similar to existing exercise \"%(exercise_name)s\""
-msgstr ""
-"%(name_original)s ist zu ähnlich zur bestehenden Übung „%(exercise_name)s“"
+msgstr "%(name)s ist zu ähnlich zur bestehenden Übung „%(exercise_name)s“"
 
 #: exercises/views/exercises.py:184
 msgid "This will delete the exercise from all workouts."
@@ -2160,10 +2138,8 @@ msgid "Dumbbell"
 msgstr "Kurzhantel"
 
 #: i18n.tpl:8
-#, fuzzy
-#| msgid "Biceps brachii"
 msgid "Biceps"
-msgstr "Armbeuger"
+msgstr "Bizeps"
 
 #: i18n.tpl:9
 msgid "SZ-Bar"
@@ -2254,10 +2230,8 @@ msgid "Barbell"
 msgstr "Langhantel"
 
 #: i18n.tpl:31
-#, fuzzy
-#| msgid "Triceps brachii"
 msgid "Triceps"
-msgstr "Armstrecker"
+msgstr "Trizeps"
 
 #: mailer/forms.py:34 mailer/templates/mailer/gym/preview.html:32
 msgctxt "As in \"email subject\""
@@ -3072,10 +3046,8 @@ msgid "Meal"
 msgstr "Mahlzeit"
 
 #: nutrition/models/log.py:65
-#, fuzzy
-#| msgid "Time (approx)"
 msgid "Date and Time (Approx.)"
-msgstr "Uhrzeit (ca.)"
+msgstr "Uhrzeit und Datum (ca.)"
 
 #: nutrition/models/meal.py:61
 msgid "Time (approx)"