From c855ffc10f2e2806a65eefbd042333255335e108 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 29 Oct 2017 12:11:15 +0200 Subject: [PATCH] Write translations and fix pep8 --- locale/fi/LC_MESSAGES/django.mo | Bin 13116 -> 14849 bytes locale/fi/LC_MESSAGES/django.po | 55 +++++++++++++++++--------------- members/forms.py | 2 +- members/views/applications.py | 16 +++++----- members/views/members.py | 2 +- 5 files changed, 39 insertions(+), 36 deletions(-) diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index f722445407e2aae81e4dd6b5bf7422047b1856f1..4769e3e257032e92837c277117cca32600134433 100644 GIT binary patch literal 14849 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 TqqBPulexb6pcN~GOU(ZUQ5sP{ delta 4828 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 diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index a690686..0e8961c 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -3,24 +3,24 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-10-28 14:37+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"PO-Revision-Date: 2017-10-29 11:57+0200\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\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 msgid "ABB jobs" -msgstr "ABB-työpaikat" +msgstr "ABB:n työpaikat" #: .\infoscreen\models.py:112 msgid "APY Item" @@ -276,15 +276,15 @@ msgstr "Hylkää" #: .\members\templates\application_index.html:8 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 msgid "Täytä vain alla oleva lomake" -msgstr "" +msgstr "Täytä vain alla oleva lomake" #: .\members\templates\application_index.html:10 msgid "Muista myös maksaa jäsenmaksusi!" -msgstr "" +msgstr "Muista myös maksaa jäsenmaksusi!" #: .\members\templates\application_index.html:16 #: .\members\templates\member_add_many.html:48 @@ -299,11 +299,11 @@ msgstr "Jäsenhakemukset" #: .\members\templates\application_success.html:8 msgid "Hienoa! Jäsenhakemuksesi on nyt lähetetty." -msgstr "" +msgstr "Hienoa! Jäsenhakemuksesi on nyt lähetetty." #: .\members\templates\application_success.html:9 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\members_base.html:55 @@ -493,7 +493,7 @@ msgstr "Hakemuksen ID ei määritelty" #: .\members\views\applications.py:73 msgid "Application missing 'id' field." -msgstr "Hakemuksen ID ei määritelty" +msgstr "Hakemuksen ID ei määritelty." #: .\members\views\applications.py:83 msgid "Email {} is already in use by a member. Application cannot be accepted." @@ -607,7 +607,7 @@ msgstr "Virheellinen puhelinnumero" #: .\webapp\forms.py:84 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 msgid "Webapp" @@ -725,7 +725,7 @@ msgstr "Kategoria" #: .\webapp\models.py:116 msgid "board member" -msgstr "Hallituksen jäsen" +msgstr "hallituksen jäsen" #: .\webapp\models.py:122 msgid "Description" @@ -753,11 +753,11 @@ msgstr "Aikaleima" #: .\webapp\models.py:159 msgid "Kaehmykommentti" -msgstr "" +msgstr "Kaehmykommentti" #: .\webapp\models.py:160 msgid "Kaehmykommentit" -msgstr "" +msgstr "Kaehmykommentit" #: .\webapp\models.py:162 msgid "Message" @@ -769,7 +769,7 @@ msgstr "Kaehmylomake" #: .\webapp\models.py:182 msgid "Kaehmylomakkeet" -msgstr "" +msgstr "Kaehmylomakkeet" #: .\webapp\models.py:185 .\webapp\models.py:258 msgid "Phone number" @@ -884,34 +884,37 @@ msgid "" " eikä siis missään nimessä sitova ilmoittautumien mihinkään " "tehtävään!" 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 msgid "Päivämääriä & deadlineja" -msgstr "" +msgstr "Päivämääriä & deadlineja" #: .\webapp\templates\kaehmy.html:28 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 msgid "Vaalikokous, osa 1 (puheenjohtajan valinta)" -msgstr "" +msgstr "Vaalikokous, osa 1 (puheenjohtajan valinta)" #: .\webapp\templates\kaehmy.html:30 msgid "Vaalikokous, osa 2 (hallituksen valinta)" -msgstr "" +msgstr "Vaalikokous, osa 2 (hallituksen valinta)" #: .\webapp\templates\kaehmy.html:31 msgid "Kiltailta" -msgstr "" +msgstr "Kiltailta" #: .\webapp\templates\kaehmy.html:32 msgid "Haku toimariksi olisi hyvä tehdä ennen tätä!" -msgstr "" +msgstr "Haku toimariksi olisi hyvä tehdä ennen tätä!" #: .\webapp\templates\kaehmy.html:33 msgid "Vaalikokous, osa 3 (toimarien valinta)" -msgstr "" +msgstr "Vaalikokous, osa 3 (toimarien valinta)" #: .\webapp\templates\kaehmy_list.html:24 #: .\webapp\templates\kaehmy_list.html:59 @@ -920,7 +923,7 @@ msgstr "Kaikki kaehmyt" #: .\webapp\templates\kaehmy_list.html:32 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 msgid "Comment" diff --git a/members/forms.py b/members/forms.py index aae74dc..a0d6bd5 100644 --- a/members/forms.py +++ b/members/forms.py @@ -121,4 +121,4 @@ class ApplicationForm(forms.ModelForm): super(ApplicationForm, self).__init__(*args, **kwargs) self.fields['AYY'].label = _("I'm a member of AYY") - self.fields['jas'].label = _("I want to receive a weekly newsletter") \ No newline at end of file + self.fields['jas'].label = _("I want to receive a weekly newsletter") diff --git a/members/views/applications.py b/members/views/applications.py index a53a961..3fb0cef 100644 --- a/members/views/applications.py +++ b/members/views/applications.py @@ -68,7 +68,7 @@ def application_accept(request, *args, **kwargs): if id is not None: application = Request.objects.get(id=id) else: - return render(request, + return render(request, 'error.html', {'error': _("Application missing 'id' field.")}) @@ -79,9 +79,9 @@ def application_accept(request, *args, **kwargs): if Member.objects.filter(email=application.email).exists(): return render(request, - 'error.html', - {'error': _('Email {} is already in use by a member. Application cannot be accepted.').format(application.email)}) - + 'error.html', + {'error': _('Email {} is already in use by a member. Application cannot be accepted.').format(application.email)}) + member = application.to_member() member.save() application.delete() @@ -91,14 +91,14 @@ def application_accept(request, *args, **kwargs): "register with the following info: {}" .format(form)) notification = "{} {}.".format(_("Successfully accepted application"), - str(application)) + str(application)) return HttpResponseRedirect( '/members/list?notification={}'.format(html.escape(notification))) except Exception as ex: logging.exception('Exception while accepting application') return render(request, - 'error.html', - {'error': str(ex)}) + 'error.html', + {'error': str(ex)}) else: logging.info(form) return render(request, @@ -125,7 +125,7 @@ def application_delete(request, *args, **kwargs): application.delete() logging.info( "Delete application in member register with the following id: {}" - .format(id)) + .format(id)) return HttpResponseRedirect( '/members/applications?notification={}' .format(html.escape(notification))) diff --git a/members/views/members.py b/members/views/members.py index 4165612..eb2a3c4 100644 --- a/members/views/members.py +++ b/members/views/members.py @@ -143,7 +143,7 @@ def member_update(request, *args, **kwargs): if id is not None: member = Member.objects.get(id=id) else: - return render(request, + return render(request, 'error.html', {'error': _("Member missing 'id' field.")}) logging.debug(member)