From 7d17d8a84f32b7067881d0cb8f7e6f9c2e68402e Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 25 Jan 2018 21:36:00 +0200 Subject: [PATCH] Add Ohlhafv to admin and auditlog --- locale/en/LC_MESSAGES/django.mo | Bin 14234 -> 14234 bytes locale/en/LC_MESSAGES/django.po | 82 +++++++++++-------- locale/fi/LC_MESSAGES/django.mo | Bin 17376 -> 17447 bytes locale/fi/LC_MESSAGES/django.po | 82 +++++++++++-------- webapp/admin.py | 3 +- webapp/migrations/0037_auto_20180125_2131.py | 30 +++++++ webapp/models.py | 5 ++ 7 files changed, 133 insertions(+), 69 deletions(-) create mode 100644 webapp/migrations/0037_auto_20180125_2131.py diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 81e0ebf4b99ac1b2cafe12f5a416264bdcd85e84..c7d77afb2fe03014b351d32beff18d6e30b148cb 100644 GIT binary patch delta 17 YcmbQ0KP!KOmkNuam9f!gKNTNg06JF%i2wiq delta 17 YcmbQ0KP!KOmkNu4m5K3YKNTNg06JR*iU0rr 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 eb618c67388e9d26d6e7ff4d35d84f391f27521e..a6cc859d0672595ff317a591791a6706d4e9cb53 100644 GIT binary patch delta 5011 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 delta 4963 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