From f168deb6553291e7d8796c74efaa3d3ee29210b6 Mon Sep 17 00:00:00 2001
From: m5ka <m5ka@posteo.de>
Date: Mon, 25 Mar 2024 17:23:02 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=92=AC=20fix=20formatting=20and=20?=
 =?UTF-8?q?text=20on=20password=20fields=20in=20signup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 moku/forms/user.py               | 4 ----
 moku/templates/moku/signup.jinja | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/moku/forms/user.py b/moku/forms/user.py
index 5122278..508b580 100644
--- a/moku/forms/user.py
+++ b/moku/forms/user.py
@@ -16,14 +16,10 @@ class UserForm(UserCreationForm):
         labels = {
             "username": _("username"),
             "email": _("email address"),
-            "password1": _("password"),
-            "password2": _("password (again)"),
         }
         help_texts = {
             "username": User._meta.get_field("username").help_text,
             "email": User._meta.get_field("email").help_text,
-            "password1": _("make a secure password that you've never used before!"),
-            "password2": _("just type the password again to confirm"),
         }
 
     def __init__(self, *args, **kwargs):
diff --git a/moku/templates/moku/signup.jinja b/moku/templates/moku/signup.jinja
index 27f9569..1b132cd 100644
--- a/moku/templates/moku/signup.jinja
+++ b/moku/templates/moku/signup.jinja
@@ -16,14 +16,14 @@
                 <span class="help">{{ form.email.help_text }}</span>
             </div>
             <div class="field">
-                <label for="id_password1">{{ form.password1.label }}</label>
+                <label for="id_password1">{% trans %}password{% endtrans %}</label>
                 <input type="password" name="password1" id="id_password1" required>
-                <span class="help">{{ form.password1.help_text|safe }}</span>
+                <span class="help">{% trans %}make a secure password that you've never used before!{% endtrans %}</span>
             </div>
             <div class="field">
-                <label for="id_password2">{{ form.password2.label }}</label>
+                <label for="id_password2">{% trans %}password (again){% endtrans %}</label>
                 <input type="password" name="password2" id="id_password2" required>
-                <span class="help">{{ form.password2.help_text }}</span>
+                <span class="help">{% trans %}just type the password again to confirm.{% endtrans %}</span>
             </div>
             <div class="field">
                 <label for="id_captcha">captcha</label>