Merge branch 'master' into pr-1875

Author: scrapcode

.github/workflows/docker-base.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.2.0
+        uses: docker/setup-qemu-action@v3.4.0
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/docker-demo.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.2.0
+        uses: docker/setup-qemu-action@v3.4.0
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/docker.yml

@@ -43,7 +43,7 @@ jobs:
             ${{ env.REGISTRY_IMAGE }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.2.0
+        uses: docker/setup-qemu-action@v3.4.0
 
       - name: Set up Docker Buildx
         id: buildx

AUTHORS.rst

@@ -86,6 +86,7 @@ Developers
 * Joshua Shelley - https://github.com/navyjosh
 * Matt Harrison - https://github.com/Maralai
 * Cam Cecil - https://github.com/scrapcode
+* Ali Rahbar - https://github.com/crypto-a
 
 
 Translators

requirements.txt

@@ -12,11 +12,11 @@ django-axes[ipware]==7.0.1
 django-bootstrap-breadcrumbs2==1.0.0 # fork of django-bootstrap-breadcrumbs, we might need to migrate away completely
 django-crispy-forms~=2.3
 django-email-verification~=0.3.3
-django-environ==0.11.2
+django-environ==0.12.0
 django-formtools~=2.5
 django-prometheus==2.3.1
 django-recaptcha~=4.0.0
-django-simple-history~=3.7
+django-simple-history~=3.8
 django-storages~=1.14
 django-compressor~=4.5
 drf-spectacular[sidecar]==0.28.0
@@ -26,7 +26,7 @@ fontawesomefree~=6.6.0
 icalendar==6.1.0
 invoke==2.2.0
 openfoodfacts==2.2.0
-pillow==11.0.0
+pillow==11.1.0
 reportlab==4.2.5
 requests==2.32.3
 tqdm==4.67.1

requirements_dev.txt

@@ -12,7 +12,7 @@ wheel==0.45.1
 pymongo==4.10.1
 
 # for running the dummy entry generators
-faker==33.3.0
+faker==35.0.0
 
 # Development packages
 django-extensions~=3.2

requirements_docker.txt

@@ -7,4 +7,4 @@
 
 django-redis==5.4.0
 gunicorn==23.0.0
-psycopg==3.2.3
+psycopg==3.2.4

wger/locale/hr/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-14 19:23+0100\n"
-"PO-Revision-Date: 2024-07-31 17:09+0000\n"
+"PO-Revision-Date: 2025-02-08 19:39+0000\n"
 "Last-Translator: Milo Ivir <[email protected]>\n"
 "Language-Team: Croatian <https://hosted.weblate.org/projects/wger/web/hr/>\n"
 "Language: hr\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.7-dev\n"
+"X-Generator: Weblate 5.10-dev\n"
 
 #: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
@@ -859,10 +859,8 @@ msgid "next"
 msgstr "dalje"
 
 #: core/templates/tags/render_day.html:44
-#, fuzzy
-#| msgid "Placeholder image for exercise"
 msgid "Placeholder image for translation"
-msgstr "Primjer slike za vježbu"
+msgstr "Primjer slike za prevođenje"
 
 #: core/templates/template.html:123 manager/templates/calendar/month.html:138
 #: manager/templates/schedule/view.html:215
@@ -2380,10 +2378,8 @@ msgid "No schedules found."
 msgstr "Nijedan raspored nije pronađen."
 
 #: manager/templates/schedule/overview.html:28
-#, fuzzy
-#| msgid "Add one now."
 msgid "Add one now"
-msgstr "Dodaj jedan sada."
+msgstr "Dodaj jedan sada"
 
 #: manager/templates/schedule/overview.html:36
 msgid ""
@@ -2394,13 +2390,6 @@ msgstr ""
 "        u nizu."
 
 #: manager/templates/schedule/overview.html:39
-#, fuzzy
-#| msgid ""
-#| "You can indicate how long you want to do each workout\n"
-#| "        before jumping to the next. It is also possible to create a loop, "
-#| "so you\n"
-#| "        always do the same workouts in succession, e.g. A > B > C > A > B "
-#| "> C and so on."
 msgid ""
 "You can indicate how long you want to do each workout\n"
 "        before jumping to the next. It is also possible to create a loop, so "
@@ -2498,13 +2487,6 @@ msgstr "Izvezi ovaj raspored kao datoteku kalendara."
 
 #: manager/templates/schedule/view.html:202
 #: manager/templates/workout/view.html:76
-#, fuzzy
-#| msgid ""
-#| "You can then import the file it into your calendar\n"
-#| "                        application for example google calendar, outlook "
-#| "or iCal. This will create\n"
-#| "                        an appointment for each training day with the "
-#| "appropriate exercises."
 msgid ""
 "You can then import the file it into your calendar\n"
 "                        application for example google calendar, outlook or "

wger/locale/ko/LC_MESSAGES/django.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-14 19:23+0100\n"
-"PO-Revision-Date: 2022-01-21 19:55+0000\n"
-"Last-Translator: namong79 <airmedic79@naver.com>\n"
+"PO-Revision-Date: 2025-02-18 12:40+0000\n"
+"Last-Translator: Gyu-sun Youm <omniavinco@gmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/wger/web/ko/>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.11-dev\n"
+"X-Generator: Weblate 5.10.1-dev\n"
 
 #: config/models/gym_config.py:46 gym/templates/gym/list.html:56
 msgid "Default gym"
@@ -191,7 +191,7 @@ msgstr "유효하지 않은 비밀번호"
 
 #: core/forms.py:265 core/forms.py:340
 msgid "The form is secured with reCAPTCHA"
-msgstr ""
+msgstr "양식은 reCAPTCHA로 보호됩니다"
 
 #: core/forms.py:281 core/forms.py:303 core/templates/navigation.html:284
 #: core/templates/navigation.html:296 core/templates/template.html:150
@@ -221,7 +221,7 @@ msgstr ""
 
 #: core/models/days_of_week.py:29
 msgid "Day of the week"
-msgstr ""
+msgstr "요일"
 
 #: core/models/language.py:31 core/templates/language/view.html:21
 msgid "Language short name"
@@ -239,30 +239,31 @@ msgstr "언어명"
 
 #: core/models/license.py:29
 msgid "Full name"
-msgstr ""
+msgstr "풀 네임"
 
 #: core/models/license.py:31
 msgid ""
 "If a license has been localized, e.g. the Creative Commons licenses for the "
 "different countries, add them as separate entries here."
-msgstr ""
+msgstr "라이선스가 지역화된 경우(예: 각 국가별 크리에이티브 커먼즈 라이선스) 여기 "
+"별도의 항목으로 추가하세요."
 
 #: core/models/license.py:40
 msgid "Short name, e.g. CC-BY-SA 3"
-msgstr ""
+msgstr "짧은 이름, 예: CC-BY-SA 3"
 
 #: core/models/license.py:45 nutrition/models/ingredient.py:208
 msgid "Link"
-msgstr ""
+msgstr "링크"
 
 #: core/models/license.py:46
 msgid "Link to license text or other information"
-msgstr ""
+msgstr "라이선스 문서 또는 기타 정보 링크"
 
 #: core/models/profile.py:56
 #, python-format
 msgid "%(birthdate)s is not a valid birthdate"
-msgstr "%(birthdate)s은 유효하지 않은 생년월일입니다."
+msgstr "%(birthdate)s은 유효하지 않은 생년월일입니다"
 
 #: core/models/profile.py:65
 msgid "Male"
@@ -274,15 +275,15 @@ msgstr "여성"
 
 #: core/models/profile.py:73
 msgid "Low"
-msgstr ""
+msgstr "낮음"
 
 #: core/models/profile.py:74
 msgid "Medium"
-msgstr ""
+msgstr "중간"
 
 #: core/models/profile.py:75
 msgid "High"
-msgstr ""
+msgstr "높음"
 
 #: core/models/profile.py:81
 msgid "Metric (kilogram)"
@@ -294,15 +295,15 @@ msgstr "야드파운드법 (pound)"
 
 #: core/models/profile.py:118
 msgid "Show exercise comments"
-msgstr ""
+msgstr "운동 코멘트 표시"
 
 #: core/models/profile.py:119
 msgid "Check to show exercise comments on the workout view"
-msgstr ""
+msgstr "workout 보기에 운동 코멘트를 표시하려면 이 항목을 선택하세요"
 
 #: core/models/profile.py:129
 msgid "Also use ingredients in English"
-msgstr ""
+msgstr "원료를 영어로도 함께 표기하세요"
 
 #: core/models/profile.py:131
 msgid ""