TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Edit labels on form fields

Browse Source
This commit is contained in:
Jan Tuomi
2017-10-16 18:11:33 +03:00
parent ce1cd1b890
commit f531b39587
5 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locale/en/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
locale/en/LC_MESSAGES/django.po
+13 -5
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -550,23 +550,31 @@ msgstr ""
msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "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 #, fuzzy
#| msgid "Total challenges:" #| msgid "Total challenges:"
msgid "Custom roles" msgid "Custom roles"
msgstr "Total challenges:" msgstr "Total challenges:"
#: webapp/forms.py:35 webapp/templates/kaehmy.html:30 #: webapp/forms.py:38 webapp/templates/kaehmy.html:30
#, fuzzy #, fuzzy
#| msgid "Total challenges:" #| msgid "Total challenges:"
msgid "Preset roles" msgid "Preset roles"
msgstr "Total challenges:" msgstr "Total challenges:"
#: webapp/forms.py:57 #: webapp/forms.py:60
msgid "Invalid phone number" msgid "Invalid phone number"
msgstr "" msgstr ""
#: webapp/forms.py:65 #: webapp/forms.py:68
msgid "Custom role with the same name already exists." msgid "Custom role with the same name already exists."
msgstr "" msgstr ""
locale/fi/LC_MESSAGES/django.mo
BIN
View File
Binary file not shown.
locale/fi/LC_MESSAGES/django.po
+13 -5
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -543,19 +543,27 @@ msgstr "Vaihda"
msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry"
msgstr "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" msgid "Custom roles"
msgstr "Uudet virat" msgstr "Uudet virat"
#: webapp/forms.py:35 webapp/templates/kaehmy.html:30 #: webapp/forms.py:38 webapp/templates/kaehmy.html:30
msgid "Preset roles" msgid "Preset roles"
msgstr "Kaehmyvirat" msgstr "Kaehmyvirat"
#: webapp/forms.py:57 #: webapp/forms.py:60
msgid "Invalid phone number" msgid "Invalid phone number"
msgstr "Virheellinen puhelinnumero" msgstr "Virheellinen puhelinnumero"
#: webapp/forms.py:65 #: webapp/forms.py:68
msgid "Custom role with the same name already exists." msgid "Custom role with the same name already exists."
msgstr "Samanniminen virka on jo olemassa" msgstr "Samanniminen virka on jo olemassa"
webapp/forms.py
+3
View File
@@ -22,6 +22,9 @@ class KaehmyForm_Form(forms.ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(KaehmyForm_Form, self).__init__(*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() 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"].widget = forms.widgets.CheckboxSelectMultiple() if custom_roles_exist else forms.HiddenInput()
self.fields["custom_roles"].help_text = "" self.fields["custom_roles"].help_text = ""