From b798f62a6b831cf0a2e65b47e7c4ef9466269b9a Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sat, 13 May 2017 10:43:23 +0300 Subject: [PATCH] Forgot to stage files :0 --- locale/en/LC_MESSAGES/django.mo | Bin 3573 -> 4007 bytes locale/en/LC_MESSAGES/django.po | 207 ++++++++++-------- locale/fi/LC_MESSAGES/django.mo | Bin 3756 -> 4220 bytes locale/fi/LC_MESSAGES/django.po | 199 +++++++++-------- members/migrations/0005_auto_20170513_1029.py | 30 +++ members/templates/application_list.html | 7 +- members/templates/error.html | 18 ++ members/templates/member_list.html | 6 +- members/templates/payment_list.html | 7 +- members/views.py | 19 +- 10 files changed, 297 insertions(+), 196 deletions(-) create mode 100644 members/migrations/0005_auto_20170513_1029.py create mode 100644 members/templates/error.html diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 336f47c6b2409ca1f750bdeb8923d3fede4f5d62..dde7de56015416ec5525a471a87c140aeaa9d4ae 100644 GIT binary patch literal 4007 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 diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 9a91689..267980a 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-11 22:23+0300\n" +"POT-Creation-Date: 2017-05-13 10:29+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,7 +50,7 @@ msgid "External image" msgstr "External image" #: infoscreen/templates/infoscreen_admin.html:23 -#: members/templates/members_base.html:51 +#: members/templates/members_base.html:67 msgid "Log out" msgstr "Log out" @@ -88,7 +88,6 @@ msgstr "Add to rotation" #: infoscreen/templates/infoscreen_admin.html:84 #: infoscreen/templates/infoscreen_admin.html:101 #: infoscreen/templates/infoscreen_admin.html:105 -#: members/templates/member_list.html:84 msgid "Delete" msgstr "Delete" @@ -151,15 +150,15 @@ msgstr "Instance" msgid "Duration" msgstr "Duration" -#: members/models.py:11 members/templates/member_list.html.py:57 +#: members/models.py:11 msgid "First name" msgstr "First name" -#: members/models.py:12 members/templates/member_list.html.py:56 +#: members/models.py:12 msgid "Last name" msgstr "Last name" -#: members/models.py:13 members/templates/member_list.html.py:58 +#: members/models.py:13 msgid "Email" msgstr "Email" @@ -167,7 +166,7 @@ msgstr "Email" msgid "Place of residence" msgstr "Place of residence" -#: members/models.py:15 +#: members/models.py:15 members/models.py:35 msgid "AYY" msgstr "AYY" @@ -175,122 +174,149 @@ msgstr "AYY" msgid "JAS" msgstr "JAS" -#: members/templates/add_member.html:8 members/templates/edit_member.html:8 -#: members/templates/members_base.html:42 +#: members/models.py:36 +msgid "Cash" +msgstr "Cash" + +#: members/models.py:37 +msgid "Bank transfer" +msgstr "Bank transfer" + +#: members/templates/application_list.html:8 +msgid "Member applications" +msgstr "Member applications" + +#: members/templates/error.html:8 +msgid "Error" +msgstr "Error" + +#: members/templates/error.html:15 +msgid "Back" +msgstr "Back" + +#: members/templates/member_add.html:8 members/templates/member_edit.html:8 +#: members/templates/members_base.html:43 msgid "Add member" msgstr "Add member" -#: members/templates/add_member.html:15 members/templates/edit_member.html:16 +#: members/templates/member_add.html:15 members/templates/member_edit.html:16 +#: members/templates/payment_add.html:15 msgid "Save" -msgstr "" +msgstr "Save" -#: members/templates/delete_member_confirm.html:8 +#: members/templates/member_delete_confirm.html:8 msgid "Are you sure you want to delete this member?" msgstr "Are you sure you want to delete this member?" -#: members/templates/delete_member_confirm.html:17 +#: members/templates/member_delete_confirm.html:17 msgid "Yes, I'm sure" msgstr "Yes, I'm sure" -#: members/templates/member_list.html:9 -msgid "Show filters" -msgstr "Show filters" - -#: members/templates/member_list.html:15 -msgid "Search" -msgstr "Search" - -#: members/templates/member_list.html:20 -msgid "Added after" -msgstr "Added after" - -#: members/templates/member_list.html:24 -msgid "Added before" -msgstr "Added before" - -#: members/templates/member_list.html:30 -msgid "Paid after" -msgstr "Paid after" - -#: members/templates/member_list.html:34 -msgid "Paid before" -msgstr "Paid before" - -#: members/templates/member_list.html:40 -msgid "Filter" -msgstr "Filter" - -#: members/templates/member_list.html:41 -msgid "Reset" -msgstr "Reset" - -#: members/templates/member_list.html:49 members/templates/members_base.html:15 +#: members/templates/member_list.html:11 members/templates/members_base.html:15 msgid "Member register" msgstr "Member register" -#: members/templates/member_list.html:50 +#: members/templates/member_list.html:17 members/templates/payment_list.html:14 msgid "Download CSV" msgstr "Download CSV" -#: members/templates/member_list.html:59 -msgid "AYY member" -msgstr "AYY member" +#: members/templates/member_list.html:24 members/templates/payment_list.html:21 +msgid "Search" +msgstr "Search" -#: members/templates/member_list.html:60 -msgid "JAS recipient" -msgstr "JAS recipient" +#: members/templates/member_list.html:29 members/templates/payment_list.html:26 +msgid "Added after" +msgstr "Added after" -#: members/templates/member_list.html:61 -msgid "Residence" -msgstr "Residence" +#: members/templates/member_list.html:33 members/templates/payment_list.html:30 +msgid "Added before" +msgstr "Added before" -#: members/templates/member_list.html:62 -msgid "Added" -msgstr "Added" +#: members/templates/member_list.html:39 members/templates/payment_list.html:36 +msgid "Paid after" +msgstr "Paid after" -#: members/templates/member_list.html:63 -msgid "Paid" -msgstr "Paid" +#: members/templates/member_list.html:43 members/templates/payment_list.html:40 +msgid "Paid before" +msgstr "Paid before" -#: members/templates/member_list.html:64 -msgid "Member count" -msgstr "Member count" +#: members/templates/member_list.html:49 members/templates/payment_list.html:46 +msgid "Filter" +msgstr "Filter" -#: members/templates/member_list.html:79 -msgid "Update payment" -msgstr "Update payment" +#: members/templates/member_list.html:50 members/templates/payment_list.html:47 +msgid "Reset" +msgstr "Reset" -#: members/templates/member_list.html:81 -msgid "Edit" -msgstr "Edit" +#: members/templates/member_list.html:58 members/templates/payment_list.html:55 +msgid "Show filters" +msgstr "Show filters" -#: members/templates/members_base.html:41 -msgid "Member list" -msgstr "Member list" +#: members/templates/members_base.html:40 webapp/templates/main_index.html:7 +msgid "Members" +msgstr "Members" -#: members/templates/members_base.html:43 +#: members/templates/members_base.html:42 +#, fuzzy +#| msgid "Add member" +msgid "List members" +msgstr "Add member" + +#: members/templates/members_base.html:44 msgid "Add multiple" msgstr "Add multiple" -#: members/templates/members_base.html:44 -msgid "Member application" -msgstr "Member application" +#: members/templates/members_base.html:48 +msgid "Payments" +msgstr "Payments" -#: members/templates/members_base.html:60 +#: members/templates/members_base.html:50 +msgid "List payments" +msgstr "List payments" + +#: members/templates/members_base.html:51 members/templates/payment_add.html:8 +msgid "Add payment" +msgstr "Add payment" + +#: members/templates/members_base.html:55 +msgid "Applications" +msgstr "Applications" + +#: members/templates/members_base.html:57 +msgid "List applications" +msgstr "List applications" + +#: members/templates/members_base.html:58 +msgid "Application form" +msgstr "Application form" + +#: members/templates/members_base.html:63 members/templates/settings.html:11 +msgid "Settings" +msgstr "Settings" + +#: members/templates/members_base.html:80 msgid "Member register of SIK ry" msgstr "Member register of SIK ry" -#: sikweb/settings-docker-sample.py:171 sikweb/settings-sample.py:171 -#: sikweb/settings.py:171 -msgid "English" -msgstr "English" +#: members/templates/payment_list.html:8 +msgid "Payment events" +msgstr "Payment events" -#: sikweb/settings-docker-sample.py:172 sikweb/settings-sample.py:172 -#: sikweb/settings.py:172 +#: members/templates/settings.html:17 +msgid "Language" +msgstr "Language" + +#: members/templates/settings.html:20 sikweb/settings-docker-sample.py:174 +#: sikweb/settings-sample.py:173 sikweb/settings.py:173 msgid "Finnish" msgstr "Finnish" -#: templates/footer.html:11 +#: members/templates/settings.html:21 sikweb/settings-docker-sample.py:173 +#: sikweb/settings-sample.py:172 sikweb/settings.py:172 +msgid "English" +msgstr "English" + +#: templates/footer.html:7 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" @@ -298,10 +324,6 @@ msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgid "SIK Admin" msgstr "SIK Admin" -#: webapp/templates/main_index.html:7 -msgid "Members" -msgstr "Members" - #: webapp/templates/main_index.html:8 msgid "Infoscreen" msgstr "Infoscreen" @@ -324,7 +346,4 @@ msgstr "Sössö" #: webapp/templates/navigation.html:32 msgid "Contact" -msgstr "Contact" - -#~ msgid "Are you sure?" -#~ msgstr "Are you sure?" +msgstr "Contact" \ No newline at end of file diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index 6e3eef08b0df4eff52939db95c5d1e27e3c46661..27335276dbf34f96e0e652d98f0e3eb4a995b350 100644 GIT binary patch literal 4220 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 uPdNO5O-}(I!B3tH^Za{Dxs3CA8HPAQhl-gWNn>\n" "Language-Team: LANGUAGE \n" @@ -51,7 +51,7 @@ msgid "External image" msgstr "Ulkoinen kuva" #: infoscreen/templates/infoscreen_admin.html:23 -#: members/templates/members_base.html:51 +#: members/templates/members_base.html:67 msgid "Log out" msgstr "Kirjaudu ulos" @@ -89,7 +89,6 @@ msgstr "Lisää rotaatioon" #: infoscreen/templates/infoscreen_admin.html:84 #: infoscreen/templates/infoscreen_admin.html:101 #: infoscreen/templates/infoscreen_admin.html:105 -#: members/templates/member_list.html:84 msgid "Delete" msgstr "Poista" @@ -152,15 +151,15 @@ msgstr "Dia" msgid "Duration" msgstr "Kesto" -#: members/models.py:11 members/templates/member_list.html.py:57 +#: members/models.py:11 msgid "First name" msgstr "Etunimi" -#: members/models.py:12 members/templates/member_list.html.py:56 +#: members/models.py:12 msgid "Last name" msgstr "Sukunimi" -#: members/models.py:13 members/templates/member_list.html.py:58 +#: members/models.py:13 msgid "Email" msgstr "Sähköposti" @@ -168,7 +167,7 @@ msgstr "Sähköposti" msgid "Place of residence" msgstr "Asuinpaikka" -#: members/models.py:15 +#: members/models.py:15 members/models.py:35 msgid "AYY" msgstr "AYY" @@ -176,122 +175,147 @@ msgstr "AYY" msgid "JAS" msgstr "JAS" -#: members/templates/add_member.html:8 members/templates/edit_member.html:8 -#: members/templates/members_base.html:42 +#: members/models.py:36 +msgid "Cash" +msgstr "Käteinen" + +#: members/models.py:37 +msgid "Bank transfer" +msgstr "Tilisiirto" + +#: members/templates/application_list.html:8 +msgid "Member applications" +msgstr "Jäsenhakemukset" + +#: members/templates/error.html:8 +msgid "Error" +msgstr "Virhe" + +#: members/templates/error.html:15 +msgid "Back" +msgstr "Takaisin" + +#: members/templates/member_add.html:8 members/templates/member_edit.html:8 +#: members/templates/members_base.html:43 msgid "Add member" msgstr "Lisää jäsen" -#: members/templates/add_member.html:15 members/templates/edit_member.html:16 +#: members/templates/member_add.html:15 members/templates/member_edit.html:16 +#: members/templates/payment_add.html:15 msgid "Save" msgstr "Tallenna" -#: members/templates/delete_member_confirm.html:8 +#: members/templates/member_delete_confirm.html:8 msgid "Are you sure you want to delete this member?" msgstr "Oletko varma, että haluat poistaa tämän jäsenen?" -#: members/templates/delete_member_confirm.html:17 +#: members/templates/member_delete_confirm.html:17 msgid "Yes, I'm sure" msgstr "Kyllä, olen varma" -#: members/templates/member_list.html:9 -msgid "Show filters" -msgstr "Näytä suodattimet" - -#: members/templates/member_list.html:15 -msgid "Search" -msgstr "Haku" - -#: members/templates/member_list.html:20 -msgid "Added after" -msgstr "Lisätty jälkeen" - -#: members/templates/member_list.html:24 -msgid "Added before" -msgstr "Lisätty ennen" - -#: members/templates/member_list.html:30 -msgid "Paid after" -msgstr "Maksettu jälkeen" - -#: members/templates/member_list.html:34 -msgid "Paid before" -msgstr "Maksettu ennen" - -#: members/templates/member_list.html:40 -msgid "Filter" -msgstr "Suodata" - -#: members/templates/member_list.html:41 -msgid "Reset" -msgstr "Nollaa" - -#: members/templates/member_list.html:49 members/templates/members_base.html:15 +#: members/templates/member_list.html:11 members/templates/members_base.html:15 msgid "Member register" msgstr "Jäsenrekisteri" -#: members/templates/member_list.html:50 +#: members/templates/member_list.html:17 members/templates/payment_list.html:14 msgid "Download CSV" msgstr "Lataa CSV" -#: members/templates/member_list.html:59 -msgid "AYY member" -msgstr "AYY:n jäsen" +#: members/templates/member_list.html:24 members/templates/payment_list.html:21 +msgid "Search" +msgstr "Haku" -#: members/templates/member_list.html:60 -msgid "JAS recipient" -msgstr "JAS-vastaanottaja" +#: members/templates/member_list.html:29 members/templates/payment_list.html:26 +msgid "Added after" +msgstr "Lisätty jälkeen" -#: members/templates/member_list.html:61 -msgid "Residence" -msgstr "Asuinpaikka" +#: members/templates/member_list.html:33 members/templates/payment_list.html:30 +msgid "Added before" +msgstr "Lisätty ennen" -#: members/templates/member_list.html:62 -msgid "Added" -msgstr "Lisätty" +#: members/templates/member_list.html:39 members/templates/payment_list.html:36 +msgid "Paid after" +msgstr "Maksettu jälkeen" -#: members/templates/member_list.html:63 -msgid "Paid" -msgstr "Maksettu" +#: members/templates/member_list.html:43 members/templates/payment_list.html:40 +msgid "Paid before" +msgstr "Maksettu ennen" -#: members/templates/member_list.html:64 -msgid "Member count" -msgstr "Lukumäärä" +#: members/templates/member_list.html:49 members/templates/payment_list.html:46 +msgid "Filter" +msgstr "Suodata" -#: members/templates/member_list.html:79 -msgid "Update payment" -msgstr "Päivitä maksu" +#: members/templates/member_list.html:50 members/templates/payment_list.html:47 +msgid "Reset" +msgstr "Nollaa" -#: members/templates/member_list.html:81 -msgid "Edit" -msgstr "Muokkaa" +#: members/templates/member_list.html:58 members/templates/payment_list.html:55 +msgid "Show filters" +msgstr "Näytä suodattimet" -#: members/templates/members_base.html:41 -msgid "Member list" +#: members/templates/members_base.html:40 webapp/templates/main_index.html:7 +msgid "Members" +msgstr "Jäsenet" + +#: members/templates/members_base.html:42 +msgid "List members" msgstr "Jäsenlistaus" -#: members/templates/members_base.html:43 +#: members/templates/members_base.html:44 msgid "Add multiple" msgstr "Lisää useita" -#: members/templates/members_base.html:44 -msgid "Member application" -msgstr "Jäsenhakemus" +#: members/templates/members_base.html:48 +msgid "Payments" +msgstr "Maksutapahtumat" -#: members/templates/members_base.html:60 +#: members/templates/members_base.html:50 +msgid "List payments" +msgstr "Maksulistaus" + +#: members/templates/members_base.html:51 members/templates/payment_add.html:8 +msgid "Add payment" +msgstr "Lisää maksu" + +#: members/templates/members_base.html:55 +msgid "Applications" +msgstr "Jäsenhakemukset" + +#: members/templates/members_base.html:57 +msgid "List applications" +msgstr "Hakemuslistaus" + +#: members/templates/members_base.html:58 +msgid "Application form" +msgstr "Jäsenhakemuslomake" + +#: members/templates/members_base.html:63 members/templates/settings.html:11 +msgid "Settings" +msgstr "Asetukset" + +#: members/templates/members_base.html:80 msgid "Member register of SIK ry" msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri" -#: sikweb/settings-docker-sample.py:171 sikweb/settings-sample.py:171 -#: sikweb/settings.py:171 -msgid "English" -msgstr "englanti" +#: members/templates/payment_list.html:8 +msgid "Payment events" +msgstr "Maksutapahtumat" -#: sikweb/settings-docker-sample.py:172 sikweb/settings-sample.py:172 -#: sikweb/settings.py:172 +#: members/templates/settings.html:17 +msgid "Language" +msgstr "Kieli" + +#: members/templates/settings.html:20 sikweb/settings-docker-sample.py:174 +#: sikweb/settings-sample.py:173 sikweb/settings.py:173 msgid "Finnish" msgstr "suomi" -#: templates/footer.html:11 +#: members/templates/settings.html:21 sikweb/settings-docker-sample.py:173 +#: sikweb/settings-sample.py:172 sikweb/settings.py:172 +msgid "English" +msgstr "englanti" + +#: templates/footer.html:7 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" @@ -299,10 +323,6 @@ msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgid "SIK Admin" msgstr "SIK Hallintapaneeli" -#: webapp/templates/main_index.html:7 -msgid "Members" -msgstr "Jäsenlistaus" - #: webapp/templates/main_index.html:8 msgid "Infoscreen" msgstr "Infonäyttö" @@ -326,6 +346,3 @@ msgstr "Sössö" #: webapp/templates/navigation.html:32 msgid "Contact" msgstr "Yhteystiedot" - -#~ msgid "Are you sure?" -#~ msgstr "Oletko varma?" diff --git a/members/migrations/0005_auto_20170513_1029.py b/members/migrations/0005_auto_20170513_1029.py new file mode 100644 index 0000000..32c81e4 --- /dev/null +++ b/members/migrations/0005_auto_20170513_1029.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-05-13 07:29 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0004_auto_20170512_1454'), + ] + + operations = [ + migrations.RemoveField( + model_name='member', + name='paid', + ), + migrations.AlterField( + model_name='payment', + name='date', + field=models.DateTimeField(default=datetime.datetime(2017, 5, 13, 10, 29, 50, 116064)), + ), + migrations.AlterField( + model_name='payment', + name='source', + field=models.CharField(choices=[('AYY', 'AYY'), ('cash', 'Cash'), ('bank_transfer', 'Bank transfer')], max_length=255), + ), + ] diff --git a/members/templates/application_list.html b/members/templates/application_list.html index 4bad49d..b9a4bfc 100644 --- a/members/templates/application_list.html +++ b/members/templates/application_list.html @@ -4,10 +4,11 @@ {% block content %}
-

{% trans "Member applications" %}

-
+
+

{% trans "Member applications" %}

+
-
{{ table|safe }}
+ {% endblock content %} diff --git a/members/templates/error.html b/members/templates/error.html new file mode 100644 index 0000000..b8c30ae --- /dev/null +++ b/members/templates/error.html @@ -0,0 +1,18 @@ +{% extends "members_base.html" %} + +{% load static %} +{% load i18n %} +{% block content %} +
+
+

{% trans "Error" %}

+
+ +
+ {{ error }} +
+
+ +
+
+{% endblock content %} diff --git a/members/templates/member_list.html b/members/templates/member_list.html index f44f88e..dff458d 100644 --- a/members/templates/member_list.html +++ b/members/templates/member_list.html @@ -8,12 +8,14 @@
-

{% trans "Member register" %}

- {% trans "Download CSV" %} +

{% trans "Member register" %}

{{ table|safe }} +
diff --git a/members/templates/payment_list.html b/members/templates/payment_list.html index 53af160..74fc26a 100644 --- a/members/templates/payment_list.html +++ b/members/templates/payment_list.html @@ -5,12 +5,15 @@ {% block content %}
-

{% trans "Payment events" %}

- {% trans "Download CSV" %} +

{% trans "Payment events" %}

{{ table|safe }} + +
diff --git a/members/views.py b/members/views.py index 859cf6f..fcadb51 100644 --- a/members/views.py +++ b/members/views.py @@ -53,6 +53,19 @@ def send_mail_wrapper(subject, message): def convert_table_to_html(table, request): + ''' + This is a horrible hack for converting a table object to raw html. + Even with extensive research I wasn't able to find a way to add a path + prefix "e.g. /members/list" to the query strings "e.g. ?sort=foo", so I + did it manually with string.replace. + + Note: When adding the html to a page, you need to run it through + the "safe" filter. E.g. "{{ table|safe }}" + + :param table: Table object from members.tables + :param request: HttpRequest + :return: Raw html string + ''' table_as_html = table.as_html(request) path = request.path @@ -118,8 +131,7 @@ def member_submit(request, *args, **kwargs): memberlogger.info("Saved new member to member register with the following info: {}".format(form)) return HttpResponseRedirect('/members') else: - print(form.errors) - return HttpResponse('oh shit') + return render(request, 'error.html', {'error': form.errors}) @ensure_csrf_cookie @@ -254,8 +266,7 @@ def payment_submit(request, *args, **kwargs): memberlogger.info("Saved new payment to member register with the following info: {}".format(form)) return HttpResponseRedirect('/members/payments') else: - print(form.errors) - return HttpResponse('oh shit') + return render(request, 'error.html', {'error': form.errors}) @ensure_csrf_cookie @require_http_methods(["GET"])