From f531b3958728bf5b3562e974bc1194ad054e1e9e Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Mon, 16 Oct 2017 18:11:33 +0300
Subject: [PATCH] Edit labels on form fields

---
 locale/en/LC_MESSAGES/django.mo | Bin 7141 -> 7141 bytes
 locale/en/LC_MESSAGES/django.po |  18 +++++++++++++-----
 locale/fi/LC_MESSAGES/django.mo | Bin 11347 -> 11479 bytes
 locale/fi/LC_MESSAGES/django.po |  18 +++++++++++++-----
 webapp/forms.py                 |   3 +++
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index c8c0421ad767f80ef0f6b216ce76e0fc219cdecd..046dfb9a9aabdb5f878a6a49838492b42929549f 100644
GIT binary patch
delta 17
YcmaEA{?vTK10fa*D?@|LPlOmb0Ywl7WdHyG

delta 17
YcmaEA{?vTK10fbuD`V5mPlOmb0YxDOX#fBK

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 366ef4f..3141f91 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-16 15:35+0300\n"
+"POT-Creation-Date: 2017-10-16 18:10+0300\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"
@@ -550,23 +550,31 @@ msgstr ""
 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
 msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
 
-#: webapp/forms.py:28
+#: webapp/forms.py:25
+msgid "Email (not public)"
+msgstr ""
+
+#: webapp/forms.py:26
+msgid "Phone number (not public)"
+msgstr ""
+
+#: webapp/forms.py:31
 #, fuzzy
 #| msgid "Total challenges:"
 msgid "Custom roles"
 msgstr "Total challenges:"
 
-#: webapp/forms.py:35 webapp/templates/kaehmy.html:30
+#: webapp/forms.py:38 webapp/templates/kaehmy.html:30
 #, fuzzy
 #| msgid "Total challenges:"
 msgid "Preset roles"
 msgstr "Total challenges:"
 
-#: webapp/forms.py:57
+#: webapp/forms.py:60
 msgid "Invalid phone number"
 msgstr ""
 
-#: webapp/forms.py:65
+#: webapp/forms.py:68
 msgid "Custom role with the same name already exists."
 msgstr ""
 
diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo
index 46d2998fde2851710e794df475ef50ca27267252..88de84a01612d361079e8d90c308b1547db071b0 100644
GIT binary patch
delta 4302
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
E1HuTi2><{9

delta 4176
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

diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po
index 70e301e..218326a 100644
--- a/locale/fi/LC_MESSAGES/django.po
+++ b/locale/fi/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-16 15:35+0300\n"
+"POT-Creation-Date: 2017-10-16 18:10+0300\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"
@@ -543,19 +543,27 @@ msgstr "Vaihda"
 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
 msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
 
-#: webapp/forms.py:28
+#: webapp/forms.py:25
+msgid "Email (not public)"
+msgstr "Sähköposti (ei julkinen)"
+
+#: webapp/forms.py:26
+msgid "Phone number (not public)"
+msgstr "Puhelinnumero (ei julkinen)"
+
+#: webapp/forms.py:31
 msgid "Custom roles"
 msgstr "Uudet virat"
 
-#: webapp/forms.py:35 webapp/templates/kaehmy.html:30
+#: webapp/forms.py:38 webapp/templates/kaehmy.html:30
 msgid "Preset roles"
 msgstr "Kaehmyvirat"
 
-#: webapp/forms.py:57
+#: webapp/forms.py:60
 msgid "Invalid phone number"
 msgstr "Virheellinen puhelinnumero"
 
-#: webapp/forms.py:65
+#: webapp/forms.py:68
 msgid "Custom role with the same name already exists."
 msgstr "Samanniminen virka on jo olemassa"
 
diff --git a/webapp/forms.py b/webapp/forms.py
index cf2ed64..3b7e4cd 100644
--- a/webapp/forms.py
+++ b/webapp/forms.py
@@ -22,6 +22,9 @@ class KaehmyForm_Form(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super(KaehmyForm_Form, self).__init__(*args, **kwargs)
 
+        self.fields["email"].label = _('Email (not public)')
+        self.fields["phone_number"].label = _('Phone number (not public)')
+
         custom_roles_exist = CustomKaehmyRole.objects.all().exists()
         self.fields["custom_roles"].widget = forms.widgets.CheckboxSelectMultiple() if custom_roles_exist else forms.HiddenInput()
         self.fields["custom_roles"].help_text = ""