From ee126335b87b816d606fc58714de886e8f9fd509 Mon Sep 17 00:00:00 2001
From: Christian Merten <christian@merten.dev>
Date: Thu, 14 Nov 2024 00:48:27 +0100
Subject: [PATCH] members/views: hide country, add translations

---
 .../members/locale/de/LC_MESSAGES/django.po   | 21 +++++++++++++++----
 .../templates/members/member_form.html        |  6 +++---
 jdav_web/members/views.py                     |  4 ++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/jdav_web/members/locale/de/LC_MESSAGES/django.po b/jdav_web/members/locale/de/LC_MESSAGES/django.po
index a5c56a1..804c8d8 100644
--- a/jdav_web/members/locale/de/LC_MESSAGES/django.po
+++ b/jdav_web/members/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-13 23:36+0100\n"
+"POT-Creation-Date: 2024-11-14 00:45+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,7 @@ msgid "Means of transportation"
 msgstr "Verkehrsmittel"
 
 #: members/admin.py:656
+#, python-format
 msgid "You are not allowed to view all members on note list %(name)s."
 msgstr ""
 "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Notizliste "
@@ -822,8 +823,8 @@ msgid ""
 "Thanks for echoing back. Please enter the password, which you can find in "
 "the email we sent you.\n"
 msgstr ""
-"Danke für die Rückmeldung. Bitte gebe das Passwort ein, welches du in der "
-"E-Mail findest.\n"
+"Danke für die Rückmeldung. Bitte gebe das Passwort ein, welches du in der E-"
+"Mail findest.\n"
 
 #: members/templates/members/echo_password.html:24
 #: members/templates/members/member_form.html:37
@@ -901,9 +902,21 @@ msgstr ""
 msgid "Emergency contacts:"
 msgstr "Notfallkontakte:"
 
+#: members/templates/members/member_form.html:20
+#: members/templates/members/member_form.html:43
+msgid "Remove"
+msgstr "Entfernen"
+
+#: members/templates/members/member_form.html:24
+msgid "Add more"
+msgstr "Weiteren hinzufügen"
+
 #: members/templates/members/member_form.html:28
+#, python-format
 msgid "I am already or will become a member of the DAV %(sektion)s soon."
-msgstr "Ich bin bereits Mitglied der DAV %(sektion)s, oder beantrage die Mitgliedschaft zeitnah."
+msgstr ""
+"Ich bin bereits Mitglied der DAV %(sektion)s, oder beantrage die "
+"Mitgliedschaft zeitnah."
 
 #: members/templates/members/member_form.html:30
 #: members/templates/members/register_waiting_list.html:36
diff --git a/jdav_web/members/templates/members/member_form.html b/jdav_web/members/templates/members/member_form.html
index 4280557..e0aabbd 100644
--- a/jdav_web/members/templates/members/member_form.html
+++ b/jdav_web/members/templates/members/member_form.html
@@ -17,11 +17,11 @@
         {% for form in emergency_contacts_formset.forms %}
         <div class="form-row" {% if form.DELETE.value %}style="display:none"{% endif %}>
             {{form}}
-            <button type="button" class="remove-form-button" onclick="setHidden(this)">Remove</button>
+            <button type="button" class="remove-form-button" onclick="setHidden(this)">{% trans "Remove" %}</button>
         </div>
         {% endfor %}
     </div>
-    <button type="button" id="add-form-button">Add More</button>
+    <button type="button" id="add-form-button">{% trans "Add more" %}</button>
     {% if registration %}
     <p>
     <input type="checkbox" required>
@@ -40,7 +40,7 @@
 <div id="empty_form" class="form-row" style="display:none">
     {{ emergency_contacts_formset.empty_form }}
     <button type="button" id="empty_remove_form_button" class="remove-form-button"
-        onclick="setHidden(this)">Remove</button>
+        onclick="setHidden(this)">{% trans "Remove" %}</button>
 </div>
 
 <script>
diff --git a/jdav_web/members/views.py b/jdav_web/members/views.py
index 8575a93..28b9dc1 100644
--- a/jdav_web/members/views.py
+++ b/jdav_web/members/views.py
@@ -13,7 +13,7 @@ from django.conf import settings
 class MemberForm(ModelForm):
     class Meta:
         model = Member
-        fields = ['prename', 'lastname', 'street', 'plz', 'town', 'address_extra', 'country',
+        fields = ['prename', 'lastname', 'street', 'plz', 'town', 'address_extra',
                   'phone_number']
 
 class MemberRegistrationForm(ModelForm):
@@ -25,7 +25,7 @@ class MemberRegistrationForm(ModelForm):
 
     class Meta:
         model = Member
-        fields = ['prename', 'lastname', 'street', 'plz', 'town', 'address_extra', 'country',
+        fields = ['prename', 'lastname', 'street', 'plz', 'town', 'address_extra',
                   'phone_number', 'birth_date', 'gender', 'email', 'alternative_email',
                   'registration_form']
         widgets = {