From d6d2a8cae6e7eba37e04c70ffc225eb3821a8fc5 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Tue, 17 Oct 2017 19:45:32 +0300 Subject: [PATCH] Add language selection to footer --- locale/en/LC_MESSAGES/django.mo | Bin 9326 -> 9325 bytes locale/en/LC_MESSAGES/django.po | 18 +++++++++++------- locale/fi/LC_MESSAGES/django.mo | Bin 12483 -> 12483 bytes locale/fi/LC_MESSAGES/django.po | 4 ++-- static/css/footer.css | 5 +++++ templates/footer.html | 17 ++++++++++++++++- webapp/templates/base.html | 4 +++- webapp/templates/kaehmy_list.html | 2 +- 8 files changed, 38 insertions(+), 12 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index b0ad8902931417592ebe8e5c7008d69dc499e67b..647f6b60bb72ea5a8a10ce0143bcf182ca03943e 100644 GIT binary patch delta 488 zcmXZZy)Q#i7{~D^Ty-U-s*RU0^!6eoD(P?s%;KiA(NsyP#6YagO)zy3VGwgi%S~9iOa$7`Ix7?t2L^%Y&>4;;a- zH16UU@gHh^w%jYIh+4mZLs(5+Llv-&I;U2SdINO^^a4AmjYp^(wonO9ku&TJb;B6v z@EJ?kMO`HCo6TSa71z?Zfy#G+DzuGy(Tk9dzMzA8%3D;0PpCp(a0%aW5uI6*<1*?i dwy+QPk~_DNb5>S^An_-C_wumtkPLXu{(mq5XbRRF7X7DXv7yy!pTUs5MM8QI^%@vx;A_N<;wzM!D z2!j8BT8NEkV_~llu(I;|BUgQP_AxuN`yKoQx4-EqZ)TgG*$4)h!Cg#ah(maQqj-#3 zKSix~a2zi&hc`Hb52$l*xQL$^Vya-~U<0-Ps9=%JGH5a}iB~v)=pbDs7-n3^|R!8O!Z c?BO6D#`o@i&e\n" "Language-Team: LANGUAGE \n" @@ -538,7 +538,7 @@ msgstr "Missing \"textfield\" POST request field" msgid "Go" msgstr "" -#: templates/footer.html:7 +#: templates/footer.html:22 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" @@ -837,9 +837,12 @@ msgid "" "henkilöön." msgstr "" "Express your interest in the guild for the next year.\n" -"This list contains both board and non-board positions, categorized by area of responsibility.\n" -"If you have anything to ask about the positions, seek out people who have held that position before or contact the board.\n" -"Best positions to consider for English speaking people are in the International category." +"This list contains both board and non-board positions, categorized by area " +"of responsibility.\n" +"If you have anything to ask about the positions, seek out people who have " +"held that position before or contact the board.\n" +"Best positions to consider for English speaking people are in the " +"International category." #: webapp/templates/kaehmy.html:23 msgid "" @@ -847,7 +850,8 @@ msgid "" " eikä siis missään nimessä sitova ilmoittautumien mihinkään " "tehtävään!" msgstr "" -"Note, that sending an application is not binding and should be considered as a gesture of interest." +"Note, that sending an application is not binding and should be considered as " +"a gesture of interest." #: webapp/templates/kaehmy.html:26 msgid "Päivämääriä & deadlineja" @@ -908,7 +912,7 @@ msgstr "" #: webapp/templates/kaehmy_navigation.html:6 msgid "List kaehmys" -msgstr "List applications:" +msgstr "List applications" #: webapp/templates/kaehmy_navigation.html:7 msgid "New kaehmy" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index 71dba2b970bbe1bca19e2634f2dba32391512c34..9d377ddd6387a0203343503537829ad95dc5160c 100644 GIT binary patch delta 17 ZcmX?{csOyx9eEZ@D^t_W59A*U002lp2YLVi delta 17 ZcmX?{csOyx9eEZDD-+Aj59A*U002lx2Ydhk diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index bd8ff4a..f4a03cb 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/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-10-17 18:49+0300\n" +"POT-Creation-Date: 2017-10-17 19:55+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -539,7 +539,7 @@ msgstr "Puuttuva \"textfield\" POST-kenttä" msgid "Go" msgstr "Vaihda" -#: templates/footer.html:7 +#: templates/footer.html:22 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" diff --git a/static/css/footer.css b/static/css/footer.css index 03adad6..144b05e 100644 --- a/static/css/footer.css +++ b/static/css/footer.css @@ -23,3 +23,8 @@ margin-left: 1vh; margin-right: 1vh; } + +.lang-select { + width: 10rem; + display: inline-block; +} \ No newline at end of file diff --git a/templates/footer.html b/templates/footer.html index 736d423..d47e2e6 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -4,6 +4,21 @@
- {% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %} +
{% csrf_token %} + + + + +
+ {% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}
diff --git a/webapp/templates/base.html b/webapp/templates/base.html index 064b47a..db2d8ab 100644 --- a/webapp/templates/base.html +++ b/webapp/templates/base.html @@ -44,6 +44,8 @@ {% endblock %} - {% include "footer.html" %} + {% block footer %} + {% include "footer.html" %} + {% endblock footer %} diff --git a/webapp/templates/kaehmy_list.html b/webapp/templates/kaehmy_list.html index b5cabcb..2c535be 100644 --- a/webapp/templates/kaehmy_list.html +++ b/webapp/templates/kaehmy_list.html @@ -90,4 +90,4 @@ {% endfor %} -{% endblock content %} +{% endblock content %} \ No newline at end of file