Write translations and fix pep8
This commit is contained in:
Binary file not shown.
@@ -3,24 +3,24 @@
|
|||||||
# This file is distributed under the same license as the PACKAGE package.
|
# This file is distributed under the same license as the PACKAGE package.
|
||||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||||
#
|
#
|
||||||
#, fuzzy
|
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: \n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2017-10-28 14:37+0100\n"
|
"POT-Creation-Date: 2017-10-28 14:37+0100\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: 2017-10-29 11:57+0200\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Language: fi\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
|
||||||
"Language: \n"
|
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||||
|
"Last-Translator: \n"
|
||||||
|
"Language-Team: \n"
|
||||||
|
"X-Generator: Poedit 2.0.4\n"
|
||||||
|
|
||||||
#: .\infoscreen\models.py:97
|
#: .\infoscreen\models.py:97
|
||||||
msgid "ABB jobs"
|
msgid "ABB jobs"
|
||||||
msgstr "ABB-työpaikat"
|
msgstr "ABB:n työpaikat"
|
||||||
|
|
||||||
#: .\infoscreen\models.py:112
|
#: .\infoscreen\models.py:112
|
||||||
msgid "APY Item"
|
msgid "APY Item"
|
||||||
@@ -276,15 +276,15 @@ msgstr "Hylkää"
|
|||||||
|
|
||||||
#: .\members\templates\application_index.html:8
|
#: .\members\templates\application_index.html:8
|
||||||
msgid "Killan jäseneksi liittyminen on helppoa ja hauskaa!"
|
msgid "Killan jäseneksi liittyminen on helppoa ja hauskaa!"
|
||||||
msgstr ""
|
msgstr "Killan jäseneksi liittyminen on helppoa ja hauskaa!"
|
||||||
|
|
||||||
#: .\members\templates\application_index.html:9
|
#: .\members\templates\application_index.html:9
|
||||||
msgid "Täytä vain alla oleva lomake"
|
msgid "Täytä vain alla oleva lomake"
|
||||||
msgstr ""
|
msgstr "Täytä vain alla oleva lomake"
|
||||||
|
|
||||||
#: .\members\templates\application_index.html:10
|
#: .\members\templates\application_index.html:10
|
||||||
msgid "Muista myös maksaa jäsenmaksusi!"
|
msgid "Muista myös maksaa jäsenmaksusi!"
|
||||||
msgstr ""
|
msgstr "Muista myös maksaa jäsenmaksusi!"
|
||||||
|
|
||||||
#: .\members\templates\application_index.html:16
|
#: .\members\templates\application_index.html:16
|
||||||
#: .\members\templates\member_add_many.html:48
|
#: .\members\templates\member_add_many.html:48
|
||||||
@@ -299,11 +299,11 @@ msgstr "Jäsenhakemukset"
|
|||||||
|
|
||||||
#: .\members\templates\application_success.html:8
|
#: .\members\templates\application_success.html:8
|
||||||
msgid "Hienoa! Jäsenhakemuksesi on nyt lähetetty."
|
msgid "Hienoa! Jäsenhakemuksesi on nyt lähetetty."
|
||||||
msgstr ""
|
msgstr "Hienoa! Jäsenhakemuksesi on nyt lähetetty."
|
||||||
|
|
||||||
#: .\members\templates\application_success.html:9
|
#: .\members\templates\application_success.html:9
|
||||||
msgid "Takaisin Sähköinsinöörikillan web-sivuille"
|
msgid "Takaisin Sähköinsinöörikillan web-sivuille"
|
||||||
msgstr ""
|
msgstr "Takaisin Sähköinsinöörikillan web-sivuille"
|
||||||
|
|
||||||
#: .\members\templates\member_add.html:8
|
#: .\members\templates\member_add.html:8
|
||||||
#: .\members\templates\members_base.html:55
|
#: .\members\templates\members_base.html:55
|
||||||
@@ -493,7 +493,7 @@ msgstr "Hakemuksen ID ei määritelty"
|
|||||||
|
|
||||||
#: .\members\views\applications.py:73
|
#: .\members\views\applications.py:73
|
||||||
msgid "Application missing 'id' field."
|
msgid "Application missing 'id' field."
|
||||||
msgstr "Hakemuksen ID ei määritelty"
|
msgstr "Hakemuksen ID ei määritelty."
|
||||||
|
|
||||||
#: .\members\views\applications.py:83
|
#: .\members\views\applications.py:83
|
||||||
msgid "Email {} is already in use by a member. Application cannot be accepted."
|
msgid "Email {} is already in use by a member. Application cannot be accepted."
|
||||||
@@ -607,7 +607,7 @@ msgstr "Virheellinen puhelinnumero"
|
|||||||
|
|
||||||
#: .\webapp\forms.py:84
|
#: .\webapp\forms.py:84
|
||||||
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\models.py:17
|
#: .\webapp\models.py:17
|
||||||
msgid "Webapp"
|
msgid "Webapp"
|
||||||
@@ -725,7 +725,7 @@ msgstr "Kategoria"
|
|||||||
|
|
||||||
#: .\webapp\models.py:116
|
#: .\webapp\models.py:116
|
||||||
msgid "board member"
|
msgid "board member"
|
||||||
msgstr "Hallituksen jäsen"
|
msgstr "hallituksen jäsen"
|
||||||
|
|
||||||
#: .\webapp\models.py:122
|
#: .\webapp\models.py:122
|
||||||
msgid "Description"
|
msgid "Description"
|
||||||
@@ -753,11 +753,11 @@ msgstr "Aikaleima"
|
|||||||
|
|
||||||
#: .\webapp\models.py:159
|
#: .\webapp\models.py:159
|
||||||
msgid "Kaehmykommentti"
|
msgid "Kaehmykommentti"
|
||||||
msgstr ""
|
msgstr "Kaehmykommentti"
|
||||||
|
|
||||||
#: .\webapp\models.py:160
|
#: .\webapp\models.py:160
|
||||||
msgid "Kaehmykommentit"
|
msgid "Kaehmykommentit"
|
||||||
msgstr ""
|
msgstr "Kaehmykommentit"
|
||||||
|
|
||||||
#: .\webapp\models.py:162
|
#: .\webapp\models.py:162
|
||||||
msgid "Message"
|
msgid "Message"
|
||||||
@@ -769,7 +769,7 @@ msgstr "Kaehmylomake"
|
|||||||
|
|
||||||
#: .\webapp\models.py:182
|
#: .\webapp\models.py:182
|
||||||
msgid "Kaehmylomakkeet"
|
msgid "Kaehmylomakkeet"
|
||||||
msgstr ""
|
msgstr "Kaehmylomakkeet"
|
||||||
|
|
||||||
#: .\webapp\models.py:185 .\webapp\models.py:258
|
#: .\webapp\models.py:185 .\webapp\models.py:258
|
||||||
msgid "Phone number"
|
msgid "Phone number"
|
||||||
@@ -884,34 +884,37 @@ msgid ""
|
|||||||
" eikä siis missään nimessä sitova ilmoittautumien mihinkään "
|
" eikä siis missään nimessä sitova ilmoittautumien mihinkään "
|
||||||
"tehtävään!"
|
"tehtävään!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
"Muista, että kaehmyn lähettäminen on kiinnostuksen ilmaus \n"
|
||||||
|
" eikä siis missään nimessä sitova ilmoittautumien mihinkään "
|
||||||
|
"tehtävään!"
|
||||||
|
|
||||||
#: .\webapp\templates\kaehmy.html:26
|
#: .\webapp\templates\kaehmy.html:26
|
||||||
msgid "Päivämääriä & deadlineja"
|
msgid "Päivämääriä & deadlineja"
|
||||||
msgstr ""
|
msgstr "Päivämääriä & deadlineja"
|
||||||
|
|
||||||
#: .\webapp\templates\kaehmy.html:28
|
#: .\webapp\templates\kaehmy.html:28
|
||||||
msgid "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)"
|
msgid "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)"
|
||||||
msgstr ""
|
msgstr "Hallitustyrkkypaneeli (haku hallitukseen olisi hyvä tehdä ennen tätä!)"
|
||||||
|
|
||||||
#: .\webapp\templates\kaehmy.html:29
|
#: .\webapp\templates\kaehmy.html:29
|
||||||
msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)"
|
msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)"
|
||||||
msgstr ""
|
msgstr "Vaalikokous, osa 1 (puheenjohtajan valinta)"
|
||||||
|
|
||||||
#: .\webapp\templates\kaehmy.html:30
|
#: .\webapp\templates\kaehmy.html:30
|
||||||
msgid "Vaalikokous, osa 2 (hallituksen valinta)"
|
msgid "Vaalikokous, osa 2 (hallituksen valinta)"
|
||||||
msgstr ""
|
msgstr "Vaalikokous, osa 2 (hallituksen valinta)"
|
||||||
|
|
||||||
#: .\webapp\templates\kaehmy.html:31
|
#: .\webapp\templates\kaehmy.html:31
|
||||||
msgid "Kiltailta"
|
msgid "Kiltailta"
|
||||||
msgstr ""
|
msgstr "Kiltailta"
|
||||||
|
|
||||||
#: .\webapp\templates\kaehmy.html:32
|
#: .\webapp\templates\kaehmy.html:32
|
||||||
msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!"
|
msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!"
|
||||||
msgstr ""
|
msgstr "Haku toimariksi olisi hyvä tehdä ennen tätä!"
|
||||||
|
|
||||||
#: .\webapp\templates\kaehmy.html:33
|
#: .\webapp\templates\kaehmy.html:33
|
||||||
msgid "Vaalikokous, osa 3 (toimarien valinta)"
|
msgid "Vaalikokous, osa 3 (toimarien valinta)"
|
||||||
msgstr ""
|
msgstr "Vaalikokous, osa 3 (toimarien valinta)"
|
||||||
|
|
||||||
#: .\webapp\templates\kaehmy_list.html:24
|
#: .\webapp\templates\kaehmy_list.html:24
|
||||||
#: .\webapp\templates\kaehmy_list.html:59
|
#: .\webapp\templates\kaehmy_list.html:59
|
||||||
@@ -920,7 +923,7 @@ msgstr "Kaikki kaehmyt"
|
|||||||
|
|
||||||
#: .\webapp\templates\kaehmy_list.html:32
|
#: .\webapp\templates\kaehmy_list.html:32
|
||||||
msgid "Commenting on post by "
|
msgid "Commenting on post by "
|
||||||
msgstr "Kommentoidaan viestiin lähettäjältä"
|
msgstr "Kommentoidaan viestiin lähettäjältä "
|
||||||
|
|
||||||
#: .\webapp\templates\kaehmy_list.html:44
|
#: .\webapp\templates\kaehmy_list.html:44
|
||||||
msgid "Comment"
|
msgid "Comment"
|
||||||
|
|||||||
+1
-1
@@ -121,4 +121,4 @@ class ApplicationForm(forms.ModelForm):
|
|||||||
super(ApplicationForm, self).__init__(*args, **kwargs)
|
super(ApplicationForm, self).__init__(*args, **kwargs)
|
||||||
|
|
||||||
self.fields['AYY'].label = _("I'm a member of AYY")
|
self.fields['AYY'].label = _("I'm a member of AYY")
|
||||||
self.fields['jas'].label = _("I want to receive a weekly newsletter")
|
self.fields['jas'].label = _("I want to receive a weekly newsletter")
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ def application_accept(request, *args, **kwargs):
|
|||||||
if id is not None:
|
if id is not None:
|
||||||
application = Request.objects.get(id=id)
|
application = Request.objects.get(id=id)
|
||||||
else:
|
else:
|
||||||
return render(request,
|
return render(request,
|
||||||
'error.html',
|
'error.html',
|
||||||
{'error': _("Application missing 'id' field.")})
|
{'error': _("Application missing 'id' field.")})
|
||||||
|
|
||||||
@@ -79,9 +79,9 @@ def application_accept(request, *args, **kwargs):
|
|||||||
|
|
||||||
if Member.objects.filter(email=application.email).exists():
|
if Member.objects.filter(email=application.email).exists():
|
||||||
return render(request,
|
return render(request,
|
||||||
'error.html',
|
'error.html',
|
||||||
{'error': _('Email {} is already in use by a member. Application cannot be accepted.').format(application.email)})
|
{'error': _('Email {} is already in use by a member. Application cannot be accepted.').format(application.email)})
|
||||||
|
|
||||||
member = application.to_member()
|
member = application.to_member()
|
||||||
member.save()
|
member.save()
|
||||||
application.delete()
|
application.delete()
|
||||||
@@ -91,14 +91,14 @@ def application_accept(request, *args, **kwargs):
|
|||||||
"register with the following info: {}"
|
"register with the following info: {}"
|
||||||
.format(form))
|
.format(form))
|
||||||
notification = "{} {}.".format(_("Successfully accepted application"),
|
notification = "{} {}.".format(_("Successfully accepted application"),
|
||||||
str(application))
|
str(application))
|
||||||
return HttpResponseRedirect(
|
return HttpResponseRedirect(
|
||||||
'/members/list?notification={}'.format(html.escape(notification)))
|
'/members/list?notification={}'.format(html.escape(notification)))
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
logging.exception('Exception while accepting application')
|
logging.exception('Exception while accepting application')
|
||||||
return render(request,
|
return render(request,
|
||||||
'error.html',
|
'error.html',
|
||||||
{'error': str(ex)})
|
{'error': str(ex)})
|
||||||
else:
|
else:
|
||||||
logging.info(form)
|
logging.info(form)
|
||||||
return render(request,
|
return render(request,
|
||||||
@@ -125,7 +125,7 @@ def application_delete(request, *args, **kwargs):
|
|||||||
application.delete()
|
application.delete()
|
||||||
logging.info(
|
logging.info(
|
||||||
"Delete application in member register with the following id: {}"
|
"Delete application in member register with the following id: {}"
|
||||||
.format(id))
|
.format(id))
|
||||||
return HttpResponseRedirect(
|
return HttpResponseRedirect(
|
||||||
'/members/applications?notification={}'
|
'/members/applications?notification={}'
|
||||||
.format(html.escape(notification)))
|
.format(html.escape(notification)))
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ def member_update(request, *args, **kwargs):
|
|||||||
if id is not None:
|
if id is not None:
|
||||||
member = Member.objects.get(id=id)
|
member = Member.objects.get(id=id)
|
||||||
else:
|
else:
|
||||||
return render(request,
|
return render(request,
|
||||||
'error.html',
|
'error.html',
|
||||||
{'error': _("Member missing 'id' field.")})
|
{'error': _("Member missing 'id' field.")})
|
||||||
logging.debug(member)
|
logging.debug(member)
|
||||||
|
|||||||
Reference in New Issue
Block a user