From d89ac230e6ca40731f8b727bdd42c1bab8b1d4e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 23:08:17 +0000 Subject: [PATCH 1/8] Bump ruff from 0.8.2 to 0.8.3 Bumps [ruff](https://github.com/astral-sh/ruff) from 0.8.2 to 0.8.3. - [Release notes](https://github.com/astral-sh/ruff/releases) - [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md) - [Commits](https://github.com/astral-sh/ruff/compare/0.8.2...0.8.3) --- updated-dependencies: - dependency-name: ruff dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index b491efcd2..b4e7582da 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -19,5 +19,5 @@ django-extensions~=3.2 coverage==7.6.7 django-debug-toolbar==4.4.5 isort==5.13.2 -ruff==0.8.2 +ruff==0.8.3 tblib==3.0.0 From bd92b17ebc7001da2fa2e014b7b6a8ecff630996 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 23:13:56 +0000 Subject: [PATCH 2/8] Bump django-axes[ipware] from 7.0.0 to 7.0.1 Bumps [django-axes[ipware]](https://github.com/jazzband/django-axes) from 7.0.0 to 7.0.1. - [Release notes](https://github.com/jazzband/django-axes/releases) - [Changelog](https://github.com/jazzband/django-axes/blob/master/CHANGES.rst) - [Commits](https://github.com/jazzband/django-axes/compare/7.0.0...7.0.1) --- updated-dependencies: - dependency-name: django-axes[ipware] dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8a8fb2e09..75eae5246 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ bleach[css]~=6.2 celery[redis]==5.4.0 crispy-bootstrap5==2024.10 django-activity-stream==2.0.0 -django-axes[ipware]==7.0.0 +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 From 36c58553898d0684dc4bceeeb0abf1a90681ac9b Mon Sep 17 00:00:00 2001 From: shlomi assaf Date: Mon, 23 Dec 2024 12:59:37 +0000 Subject: [PATCH 3/8] Translated using Weblate (Hebrew) Currently translated at 1.0% (7 of 685 strings) Translation: wger Workout Manager/Web App Translate-URL: https://hosted.weblate.org/projects/wger/web/he/ --- wger/locale/he/LC_MESSAGES/django.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/wger/locale/he/LC_MESSAGES/django.po b/wger/locale/he/LC_MESSAGES/django.po index 732983243..3f91d6f5e 100644 --- a/wger/locale/he/LC_MESSAGES/django.po +++ b/wger/locale/he/LC_MESSAGES/django.po @@ -8,15 +8,15 @@ 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-05-24 13:09+0000\n" -"Last-Translator: Tsz Hong CHAN \n" +"PO-Revision-Date: 2024-12-24 13:06+0000\n" +"Last-Translator: shlomi assaf \n" "Language-Team: Hebrew \n" "Language: he\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 5.6-dev\n" +"X-Generator: Weblate 5.10-dev\n" #: config/models/gym_config.py:46 gym/templates/gym/list.html:56 msgid "Default gym" @@ -52,23 +52,23 @@ msgstr "" #: nutrition/templates/ingredient/view.html:209 #: nutrition/templates/units/list.html:19 msgid "Edit" -msgstr "" +msgstr "עריכה" #: core/demo.py:96 msgid "Sample workout" -msgstr "" +msgstr "אימון לדוגמא" #: core/demo.py:100 msgid "Sample day" -msgstr "" +msgstr "יום לדוגמא" #: core/demo.py:104 msgid "Another sample day" -msgstr "" +msgstr "יום לדוגמא נוסף" #: core/demo.py:212 msgid "Sample nutritional plan" -msgstr "" +msgstr "דיאטה לדוגמא" #: core/demo.py:344 core/demo.py:346 core/demo.py:348 #, python-brace-format From 2fb082cfaadbabb67ae419bf12b59c40edce5781 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Dec 2024 23:23:28 +0000 Subject: [PATCH 4/8] Bump coverage from 7.6.7 to 7.6.10 Bumps [coverage](https://github.com/nedbat/coveragepy) from 7.6.7 to 7.6.10. - [Release notes](https://github.com/nedbat/coveragepy/releases) - [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) - [Commits](https://github.com/nedbat/coveragepy/compare/7.6.7...7.6.10) --- updated-dependencies: - dependency-name: coverage dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index b4e7582da..42fa43710 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -16,7 +16,7 @@ faker==26.0.0 # Development packages django-extensions~=3.2 -coverage==7.6.7 +coverage==7.6.10 django-debug-toolbar==4.4.5 isort==5.13.2 ruff==0.8.3 From cfac06f82e7115943d1e485eae6cb33069c6c3d8 Mon Sep 17 00:00:00 2001 From: Matthew Harrison Date: Sat, 28 Dec 2024 23:28:29 +0000 Subject: [PATCH 5/8] Add conditional registration section in login and features templates --- wger/core/templates/user/login.html | 2 ++ wger/software/templates/features.html | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/wger/core/templates/user/login.html b/wger/core/templates/user/login.html index d4b7e17a1..04137919d 100644 --- a/wger/core/templates/user/login.html +++ b/wger/core/templates/user/login.html @@ -13,6 +13,7 @@ {% block sidebar %} +{% if allow_registration %}

{% translate "No account?" %}

@@ -20,6 +21,7 @@

{% translate "No account?" %}

{% translate "Register" %}

+{% endif %}

{% translate "Forgot password?" %}

diff --git a/wger/software/templates/features.html b/wger/software/templates/features.html index 7c61070b3..6b2655bf3 100644 --- a/wger/software/templates/features.html +++ b/wger/software/templates/features.html @@ -325,13 +325,13 @@

-
+ {% if allow_registration %} +
+ {% endif %}
From 4d4be20644bb1cf7400990e7a91bbc783509453c Mon Sep 17 00:00:00 2001 From: Matthew Harrison Date: Sat, 28 Dec 2024 23:31:43 +0000 Subject: [PATCH 6/8] Add Matt Harrison to the AUTHORS list --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index 7f9d9df46..ef905246c 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -83,6 +83,7 @@ Developers * Taylor Fuller - https://github.com/taylor-fuller * eyJhb - https://github.com/eyJhb * Joshua Shelley - https://github.com/navyjosh +* Matt Harrison - https://github.com/Maralai Translators From 4e5f486bb1e79b18c0862d7eeda84395cc849406 Mon Sep 17 00:00:00 2001 From: Matthew Harrison Date: Sat, 28 Dec 2024 23:40:17 +0000 Subject: [PATCH 7/8] Add conditional display for registration link in navigation --- wger/core/templates/navigation.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html index df635447c..00f0d28df 100644 --- a/wger/core/templates/navigation.html +++ b/wger/core/templates/navigation.html @@ -281,7 +281,7 @@
  • - {% translate "Login" %} / {% translate "Register" %} + {% translate "Login" %}{% if allow_registration %} / {% translate "Register" %}{% endif %}