Merge remote-tracking branch 'origin/master'

AUTHORS.rst

@@ -84,6 +84,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

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

requirements_dev.txt

@@ -16,8 +16,8 @@ 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.2
+ruff==0.8.3
 tblib==3.0.0

wger/core/templates/navigation.html

@@ -281,7 +281,7 @@
                         <li class="dropdown nav-item">
                             <a href="#" class="dropdown-toggle nav-link text-white"
                                data-bs-toggle="dropdown">
-                                {% translate "Login" %} / {% translate "Register" %}
+                                {% translate "Login" %}{% if allow_registration %} / {% translate "Register" %}{% endif %}
                                 <span class="caret"></span>
                             </a>
                             <ul class="dropdown-menu">
@@ -290,12 +290,14 @@
                                         {% translate "Login" %}
                                     </a>
                                 </li>
+                                {% if allow_registration %}
                                 <li>
                                     <a class="dropdown-item"
                                        href="{% url 'core:user:registration' %}">
                                         {% translate "Register" %}
                                     </a>
                                 </li>
+                                {% endif %}
                                 <li>
                                     <a class="dropdown-item"
                                        href="{% url 'core:user:password_reset' %}">

wger/core/templates/user/login.html

@@ -13,13 +13,15 @@
 
 
 {% block sidebar %}
+{% if allow_registration %}
 <h4>{% translate "No account?" %}</h4>
 <p>
     <a href="{% url 'core:user:registration' %}">
         <span class="{% fa_class 'sign-in-alt' %}"></span>
         {% translate "Register" %}
     </a>
 </p>
+{% endif %}
 
 <h4>{% translate "Forgot password?" %}</h4>
 <p>

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 <tomyan112@yahoo.com.hk>\n"
+"PO-Revision-Date: 2024-12-24 13:06+0000\n"
+"Last-Translator: shlomi assaf <shlomiasaf@gmail.com>\n"
 "Language-Team: Hebrew <https://hosted.weblate.org/projects/wger/web/he/>\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

wger/software/templates/features.html

@@ -325,13 +325,13 @@ <h1 class="display-3 uppercase font-bebas-neue header-community">
         </section>
 
         <!-- sign up section -->
-        <section class="main-section  ">
+        {% if allow_registration %}
+        <section class="main-section">
             <div class="container d-flex align-items-center justify-content-center sign-up-bg">
-
                 <!-- form -->
                 <form method="post"
-                      action="{% url 'core:user:registration' %}"
-                      class="row justify-content-center">
+                    action="{% url 'core:user:registration' %}"
+                    class="row justify-content-center">
                     {% csrf_token %}
                     <h3 class="col-12 text-center fs-1 uppercase font-bebas-neue">
                         {% translate "Sign Up Now For Free" %}
@@ -342,6 +342,7 @@ <h3 class="col-12 text-center fs-1 uppercase font-bebas-neue">
                 </form>
             </div>
         </section>
+        {% endif %}
 
         <!-- not enough section  -->
         <section class="bg-bottom-menu p-5">
@@ -417,11 +418,13 @@ <h6 class="text-white fw-bold text-center">
                         <li class="list-group-item bg-transparent border-0 text-light ps-0">
                             <h1 class="fs-5 text-white">{% translate "Account" %}</h1>
                         </li>
+                        {% if allow_registration %}
                         <li class="list-group-item bg-transparent border-0 text-light fw-lighter ps-0">
                             <a href="{% url 'core:user:registration' %}">
                                 {% translate "Register" %}
                             </a>
                         </li>
+                        {% endif %}
                         <li class="list-group-item bg-transparent border-0 text-light fw-lighter ps-0">
                             <a href="{% url 'core:user:login' %}">
                                 {% translate "Login" %}