Merge branch '354-change-password' of edugit.org:AlekSIS/Official/AlekSIS-Core...

Merge branch '354-change-password' of edugit.org:AlekSIS/Official/AlekSIS-Core into 354-change-password

aleksis/core/menus.py

@@ -67,7 +67,13 @@ MENUS = {
                     "name": _("Change password"),
                     "url": "account_change_password",
                     "icon": "password",
-                    "validators": ["menu_generator.validators.is_authenticated", ("aleksis.core.util.predicates.permission_validator", "core.can_change_password")],
+                    "validators": [
+                        "menu_generator.validators.is_authenticated",
+                        (
+                            "aleksis.core.util.predicates.permission_validator",
+                            "core.can_change_password",
+                        ),
+                    ],
                 },
                 {
                     "name": _("Me"),

aleksis/core/templates/account/password_change.html

 {% extends "core/base.html" %}
 
-{% load i18n materia_form %}
+{% load i18n material_form %}
 
 {% block browser_title %}{% trans "Change password" %}{% endblock %}
 {% block page_title %}{% trans "Change password" %}{% endblock %}
@@ -9,15 +9,15 @@
   <div class="alert warning">
     <p>
       <i class="material-icons left">warning</i>
-      {% blocktrans %}Forgot your current password? Click here to reset it: <a href="{% url 'account_reset_password' %}">"Forgot Password?</a></a>.{% endblocktrans %}
+      {% trans "Forgot your current password? Click here to reset it:" %} <a href="{% url 'account_reset_password' %}">{% trans "Forgot Password?" %}</a></a>.
     </p>
   </div>
 
   <form method="post" action="{% url 'account_change_password' %}">
     {% csrf_token %}
-    {% form form=form %}
+    {% form form=form %}{% endform %}
     {% trans "Change password" as caption %}
-    {% include "core/partials/save_button.html" with caption=caption icon="priotity_high" %}
+    {% include "core/partials/save_button.html" with caption=caption icon="priority_high" %}
   </form>
 
 {% endblock %}