diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 81e0ebf..c7d77af 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 6db076d..41369e5 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-25 20:43+0200\n" +"POT-Creation-Date: 2018-01-25 21:32+0200\n" "PO-Revision-Date: 2017-11-02 23:09+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -162,7 +162,8 @@ msgid "id" msgstr "id" #: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110 -#: webapp/models.py:143 webapp/templates/kaehmy/kaehmy_list.html:36 +#: webapp/models.py:143 webapp/templates/form_listAll.html:36 +#: webapp/templates/kaehmy/kaehmy_list.html:36 msgid "Name" msgstr "Name" @@ -191,6 +192,7 @@ msgid "Last name" msgstr "Last name" #: members/models.py:16 webapp/models.py:144 +#: webapp/templates/form_listAll.html:40 #: webapp/templates/kaehmy/kaehmy_list.html:40 msgid "Email" msgstr "Email" @@ -283,6 +285,7 @@ msgstr "Don't forget to pay your membership fee!" #: members/templates/member_add_many.html:55 #: members/templates/member_add_many_confirm.html:22 #: templates/password_reset/recovery_form.html:10 +#: webapp/templates/form_listAll.html:48 #: webapp/templates/kaehmy/kaehmy_list.html:48 msgid "Send" msgstr "Send" @@ -920,11 +923,15 @@ msgstr "" msgid "Series" msgstr "" -#: webapp/models.py:298 +#: webapp/models.py:294 +msgid "Ohlhafv challenge: {} vs. {}" +msgstr "" + +#: webapp/models.py:302 msgid "Telegram channel" msgstr "" -#: webapp/models.py:299 +#: webapp/models.py:303 msgid "Telegram channels" msgstr "" @@ -940,6 +947,43 @@ msgstr "Contact" msgid "Event calendar" msgstr "Event calendar" +#: webapp/templates/form_listAll.html:24 webapp/templates/form_listAll.html:59 +#: webapp/templates/kaehmy/kaehmy_list.html:24 +#: webapp/templates/kaehmy/kaehmy_list.html:59 +msgid "All kaehmys" +msgstr "All applications" + +#: webapp/templates/form_listAll.html:32 +#: webapp/templates/kaehmy/kaehmy_list.html:32 +msgid "Commenting on post by " +msgstr "" + +#: webapp/templates/form_listAll.html:44 +#: webapp/templates/kaehmy/kaehmy_list.html:44 +msgid "Comment" +msgstr "" + +#: webapp/templates/form_listAll.html:57 +#: webapp/templates/kaehmy/kaehmy_list.html:57 +msgid "Filter kaehmys" +msgstr "Filter kaehmys" + +#: webapp/templates/form_listAll.html:70 +#: webapp/templates/kaehmy/kaehmy_list.html:70 +#: webapp/templates/kaehmy/kaehmy_statistics.html:18 +msgid "Total kaehmys:" +msgstr "Total applications:" + +#: webapp/templates/form_listAll.html:88 +#: webapp/templates/kaehmy/kaehmy_list.html:88 +msgid "Show comments" +msgstr "" + +#: webapp/templates/form_listAll.html:94 +#: webapp/templates/kaehmy/kaehmy_list.html:94 +msgid "Add comment" +msgstr "" + #: webapp/templates/guild.html:10 msgid "Kilta" msgstr "Guild" @@ -1025,36 +1069,6 @@ msgstr "" msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" -#: webapp/templates/kaehmy/kaehmy_list.html:24 -#: webapp/templates/kaehmy/kaehmy_list.html:59 -msgid "All kaehmys" -msgstr "All applications" - -#: webapp/templates/kaehmy/kaehmy_list.html:32 -msgid "Commenting on post by " -msgstr "" - -#: webapp/templates/kaehmy/kaehmy_list.html:44 -msgid "Comment" -msgstr "" - -#: webapp/templates/kaehmy/kaehmy_list.html:57 -msgid "Filter kaehmys" -msgstr "Filter kaehmys" - -#: webapp/templates/kaehmy/kaehmy_list.html:70 -#: webapp/templates/kaehmy/kaehmy_statistics.html:18 -msgid "Total kaehmys:" -msgstr "Total applications:" - -#: webapp/templates/kaehmy/kaehmy_list.html:88 -msgid "Show comments" -msgstr "" - -#: webapp/templates/kaehmy/kaehmy_list.html:94 -msgid "Add comment" -msgstr "" - #: webapp/templates/kaehmy/kaehmy_message.html:11 msgid "Reply" msgstr "" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index eb618c6..a6cc859 100644 Binary files a/locale/fi/LC_MESSAGES/django.mo and b/locale/fi/LC_MESSAGES/django.mo differ diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index 99985f9..a2c3441 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-25 20:43+0200\n" +"POT-Creation-Date: 2018-01-25 21:32+0200\n" "PO-Revision-Date: 2017-11-02 23:04+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -163,7 +163,8 @@ msgid "id" msgstr "id" #: infoscreen/templates/infoscreen_admin.html:140 webapp/models.py:110 -#: webapp/models.py:143 webapp/templates/kaehmy/kaehmy_list.html:36 +#: webapp/models.py:143 webapp/templates/form_listAll.html:36 +#: webapp/templates/kaehmy/kaehmy_list.html:36 msgid "Name" msgstr "Nimi" @@ -192,6 +193,7 @@ msgid "Last name" msgstr "Sukunimi" #: members/models.py:16 webapp/models.py:144 +#: webapp/templates/form_listAll.html:40 #: webapp/templates/kaehmy/kaehmy_list.html:40 msgid "Email" msgstr "Sähköposti" @@ -284,6 +286,7 @@ msgstr "Muista myös maksaa jäsenmaksusi!" #: members/templates/member_add_many.html:55 #: members/templates/member_add_many_confirm.html:22 #: templates/password_reset/recovery_form.html:10 +#: webapp/templates/form_listAll.html:48 #: webapp/templates/kaehmy/kaehmy_list.html:48 msgid "Send" msgstr "Lähetä" @@ -917,11 +920,15 @@ msgstr "Uhrin sähköpostiosoite" msgid "Series" msgstr "Sarja" -#: webapp/models.py:298 +#: webapp/models.py:294 +msgid "Ohlhafv challenge: {} vs. {}" +msgstr "Ohlhafv-haaste: {} vs. {}" + +#: webapp/models.py:302 msgid "Telegram channel" msgstr "Telegram-kanava" -#: webapp/models.py:299 +#: webapp/models.py:303 msgid "Telegram channels" msgstr "Telegram-kanavat" @@ -937,6 +944,43 @@ msgstr "Yhteystiedot" msgid "Event calendar" msgstr "Tapahtumakalenteri" +#: webapp/templates/form_listAll.html:24 webapp/templates/form_listAll.html:59 +#: webapp/templates/kaehmy/kaehmy_list.html:24 +#: webapp/templates/kaehmy/kaehmy_list.html:59 +msgid "All kaehmys" +msgstr "Kaikki kaehmyt" + +#: webapp/templates/form_listAll.html:32 +#: webapp/templates/kaehmy/kaehmy_list.html:32 +msgid "Commenting on post by " +msgstr "Kommentoidaan viestiin lähettäjältä " + +#: webapp/templates/form_listAll.html:44 +#: webapp/templates/kaehmy/kaehmy_list.html:44 +msgid "Comment" +msgstr "Kommentti" + +#: webapp/templates/form_listAll.html:57 +#: webapp/templates/kaehmy/kaehmy_list.html:57 +msgid "Filter kaehmys" +msgstr "Rajaa kaehmyjä" + +#: webapp/templates/form_listAll.html:70 +#: webapp/templates/kaehmy/kaehmy_list.html:70 +#: webapp/templates/kaehmy/kaehmy_statistics.html:18 +msgid "Total kaehmys:" +msgstr "Kaehmyjä yhteensä:" + +#: webapp/templates/form_listAll.html:88 +#: webapp/templates/kaehmy/kaehmy_list.html:88 +msgid "Show comments" +msgstr "Näytä kommentit" + +#: webapp/templates/form_listAll.html:94 +#: webapp/templates/kaehmy/kaehmy_list.html:94 +msgid "Add comment" +msgstr "Kommentoi" + #: webapp/templates/guild.html:10 msgid "Kilta" msgstr "Kilta" @@ -1025,36 +1069,6 @@ msgstr "Etusivulle" msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" -#: webapp/templates/kaehmy/kaehmy_list.html:24 -#: webapp/templates/kaehmy/kaehmy_list.html:59 -msgid "All kaehmys" -msgstr "Kaikki kaehmyt" - -#: webapp/templates/kaehmy/kaehmy_list.html:32 -msgid "Commenting on post by " -msgstr "Kommentoidaan viestiin lähettäjältä " - -#: webapp/templates/kaehmy/kaehmy_list.html:44 -msgid "Comment" -msgstr "Kommentti" - -#: webapp/templates/kaehmy/kaehmy_list.html:57 -msgid "Filter kaehmys" -msgstr "Rajaa kaehmyjä" - -#: webapp/templates/kaehmy/kaehmy_list.html:70 -#: webapp/templates/kaehmy/kaehmy_statistics.html:18 -msgid "Total kaehmys:" -msgstr "Kaehmyjä yhteensä:" - -#: webapp/templates/kaehmy/kaehmy_list.html:88 -msgid "Show comments" -msgstr "Näytä kommentit" - -#: webapp/templates/kaehmy/kaehmy_list.html:94 -msgid "Add comment" -msgstr "Kommentoi" - #: webapp/templates/kaehmy/kaehmy_message.html:11 msgid "Reply" msgstr "Vastaa" diff --git a/webapp/admin.py b/webapp/admin.py index 0cfeb8c..c797c31 100644 --- a/webapp/admin.py +++ b/webapp/admin.py @@ -3,7 +3,7 @@ from django.contrib import admin from webapp.models import Official, Role from webapp.models import Feed, Tag, BaseFeed, Event, Registration -from webapp.models import KaehmyForm, KaehmyMessage +from webapp.models import KaehmyForm, KaehmyMessage, OhlhafvChallenge from webapp.models import CustomKaehmyRole, PresetKaehmyRole from webapp.models import TelegramChannel from modeltranslation.admin import TranslationAdmin @@ -24,3 +24,4 @@ admin.site.register(KaehmyMessage) admin.site.register(CustomKaehmyRole) admin.site.register(PresetKaehmyRole, TranslationAdmin) admin.site.register(TelegramChannel) +admin.site.register(OhlhafvChallenge) \ No newline at end of file diff --git a/webapp/migrations/0037_auto_20180125_2131.py b/webapp/migrations/0037_auto_20180125_2131.py new file mode 100644 index 0000000..6ffc925 --- /dev/null +++ b/webapp/migrations/0037_auto_20180125_2131.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2018-01-25 19:31 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('webapp', '0036_auto_20180124_1712'), + ] + + operations = [ + migrations.AlterField( + model_name='ohlhafvchallenge', + name='message', + field=models.TextField(blank=True, verbose_name='Message'), + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='series', + field=models.CharField(choices=[('0.33 L', '0.33 L'), ('0.5 L', '0.5 L'), ('1.0 L', '1.0 L'), ('Team', 'Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)')], max_length=10, verbose_name='Series'), + ), + migrations.AlterField( + model_name='ohlhafvchallenge', + name='victim_email', + field=models.EmailField(max_length=254, verbose_name='Victim email'), + ), + ] diff --git a/webapp/models.py b/webapp/models.py index 7133d09..16ef4ac 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -289,6 +289,10 @@ class OhlhafvChallenge(models.Model): series = models.CharField(_('Series'), choices=SERIES_CHOICES, max_length=10) message = models.TextField(_('Message'), blank=True, null=False) + def __str__(self): + """Return model info.""" + return _('Ohlhafv challenge: {} vs. {}').format(self.challenger, self.victim) + # Telegram channel entry for Kaehmys class TelegramChannel(models.Model): @@ -311,3 +315,4 @@ auditlog.register(Event) auditlog.register(PresetRole) auditlog.register(Role) auditlog.register(Official) +auditlog.register(OhlhafvChallenge) \ No newline at end of file