From c34e31c0e59736bcb62ab2d7e9a3cd7fadb1a91a Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 5 Feb 2017 23:02:04 +0200 Subject: [PATCH] Add some translations for i18n --- locale/en/LC_MESSAGES/django.mo | Bin 0 -> 378 bytes locale/en/LC_MESSAGES/django.po | 140 +++++++++++++++++++++++++++ locale/fi/LC_MESSAGES/django.mo | Bin 0 -> 1798 bytes locale/fi/LC_MESSAGES/django.po | 141 ++++++++++++++++++++++++++++ members/templates/member_list.html | 46 ++++----- members/templates/members_base.html | 124 ++++++++++++------------ sikweb/settings-sample.py | 13 ++- sikweb/urls.py | 5 + 8 files changed, 387 insertions(+), 82 deletions(-) create mode 100644 locale/en/LC_MESSAGES/django.mo create mode 100644 locale/en/LC_MESSAGES/django.po create mode 100644 locale/fi/LC_MESSAGES/django.mo create mode 100644 locale/fi/LC_MESSAGES/django.po diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..c971c7b6c83359afe2436adab8e0ff60e3e9976d GIT binary patch literal 378 zcmYL^K~KUk7=|%=+R?Lz9=zd)g~T{38Y(Ne*luJD61`QZa|T<|6{A1Izvpl9TVmu* zp0r7yetr9MeDvMH93UsiDRPLMA#Gx0gojtSw$6WM-o2SsfOHK@_`2eb^>NVW$ss>8ONHoh!7<;1wUV=mi!^nX4FM$q#Uf`DX<1QUgiXs%| zqi%=)d5?k@pmIn!xzCwOyH9y0BB`4IrPsFE=-@mflZBKd<4TaBP&}0*o+O2s&u>w+ z)lOFiN~7Nykvy9&+R8&IN1M9me6@G5s!EmE|F7Sp(b(BwEI#+O#oobuhV$)4*Y=vM gUbSybxLK4Fi1%Jw>&18wcIDQ!tr&@)>kxH*0aICKK>z>% literal 0 HcmV?d00001 diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po new file mode 100644 index 0000000..b36a4c5 --- /dev/null +++ b/locale/en/LC_MESSAGES/django.po @@ -0,0 +1,140 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-05 20:18+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: members/templates/member_list.html:13 members/templates/member_list.html:48 +msgid "Added" +msgstr "" + +#: members/templates/member_list.html:14 +msgid "Added after" +msgstr "" + +#: members/templates/member_list.html:15 +msgid "Added before" +msgstr "" + +#: members/templates/member_list.html:20 members/templates/member_list.html:49 +msgid "Paid" +msgstr "" + +#: members/templates/member_list.html:21 +msgid "Paid after" +msgstr "" + +#: members/templates/member_list.html:22 +msgid "Paid before" +msgstr "" + +#: members/templates/member_list.html:27 +msgid "Search" +msgstr "" + +#: members/templates/member_list.html:28 +msgid "Filter" +msgstr "" + +#: members/templates/member_list.html:29 +msgid "Reset" +msgstr "" + +#: members/templates/member_list.html:32 members/templates/members_base.html:13 +msgid "Member register" +msgstr "" + +#: members/templates/member_list.html:37 +msgid "Member count" +msgstr "" + +#: members/templates/member_list.html:42 +msgid "Last name" +msgstr "" + +#: members/templates/member_list.html:43 +msgid "First name" +msgstr "" + +#: members/templates/member_list.html:44 +msgid "Email" +msgstr "" + +#: members/templates/member_list.html:45 +msgid "AYY member" +msgstr "" + +#: members/templates/member_list.html:46 +msgid "JAS recipient" +msgstr "" + +#: members/templates/member_list.html:47 +msgid "Residence" +msgstr "" + +#: members/templates/member_list.html:63 +msgid "Update payment" +msgstr "" + +#: members/templates/member_list.html:64 +msgid "Edit" +msgstr "" + +#: members/templates/member_list.html:65 +msgid "Delete" +msgstr "" + +#: members/templates/member_list.html:65 +msgid "Are you sure?" +msgstr "" + +#: members/templates/members_base.html:49 +msgid "Member list" +msgstr "" + +#: members/templates/members_base.html:50 +msgid "Add member" +msgstr "" + +#: members/templates/members_base.html:51 +msgid "Add multiple" +msgstr "" + +#: members/templates/members_base.html:52 +msgid "Member application" +msgstr "" + +#: members/templates/members_base.html:55 sikweb/settings-sample.py:140 +#: sikweb/settings.py:146 +msgid "Finnish" +msgstr "" + +#: members/templates/members_base.html:56 sikweb/settings-sample.py:139 +#: sikweb/settings.py:145 +msgid "English" +msgstr "" + +#: members/templates/members_base.html:58 +msgid "Change language" +msgstr "" + +#: members/templates/members_base.html:70 +msgid "Member register of SIK ry" +msgstr "" + +#: members/templates/members_base.html:75 +msgid "Log out" +msgstr "" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..7ebb96b125c8a0d954f0f958672541b0181398cf GIT binary patch literal 1798 zcmZ9L&u<$=6vwAf3YhStB|!O67=(nVqHUc>h{&mFmt@nrv17}2DuTpe;+@!&-JMy@ z&RX>!&_4hPjvSDD2PBjWKZN812avcRAu3UE;l~LHA-I9~K6{;rj{N2`Z|2RL_uf9= zIdk$ohVcUAImqG(#?FHa_h7>K2rPjg7yJxdfc_PDANU>k5O}-T{{?&)`k&yV;E8(~ zI|ZHwPl9Jbx_1t|AAG4eUn=w!klw3+Z@! zr1w4r$={bC*?kSt``?4)_eYT8`xSfy{2h!?gMUEsuV763!-BWK2cW+To(A79_CEwE z-Y-D9_YFvXe*h`ZpNjq8K)U}|vHvfKA3FtOvReSj?;=QcFN5UwV!m?GphHK5E{=wo`6t| z>Hghg-beHXT(Yx}Mac6Iw8V5gj+t_$`p*Z&O!1zB(D$N&PcY4$@_h{QEQI;HyF8J} zp0vyl!~ZSw*r_y@v@gTi%*DQ&S;~;_$$evSY$YF=oM*X}m)ZJ2=)UAJ=3Mk8+mNwz zk_Dl1EJ%ckS)lu|$_8vx#pG*KX+2YI=C~G#WY_%;x3Z^FCADL9G2gG7J~z2zjcL4G zq-m^r!YQNYTRoHGMsbc;j@DN8q2amWY_4;&&pWj(Zbz&oR5+cABuSs=*p``e46_QQ z?n%~>!uAGiCk=&@JQbsaB5hf7AbZZMh29NmGsIQlEq{H>zZ&oxLAz6HZkO6JHP(5J ztgk}vjl7?ET~pzuR`q^_!}GTpwoFB zrn7J5b)`ruyzXyb-Jy^#)$3Pcb-~#Fu?<3P)EdEYe#;lirFEkn^7p!<6mdIw(_Kts zq4XN>4TMGIsyp3HZ}r%Y!rGVC3v|zfO7|;#bx*lcE6%Nmy-j12tip9VRkP~K8lNqz zuW0^al`o%PD^cH8G(VV(GpSi!Ws~t_e7BlsQaLd@b#8RDAiFq{^NTp*QfsJ9^lD`I zP}oFVW;cWygn~y(#)`EJ`bV%vZlXvC)|re4(c~~SnNv)nqlLzzlN&UIU|DVw#R8XW z1)`n3AwGu?+Bhc;a66A?M_bAsh&;@B9-E9^pJp=B-^b(5eXkHi0%jD%$bwhKTTuT+Zf;4D`)=!_K&uW literal 0 HcmV?d00001 diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po new file mode 100644 index 0000000..4d33998 --- /dev/null +++ b/locale/fi/LC_MESSAGES/django.po @@ -0,0 +1,141 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-05 20:18+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \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" + +#: members/templates/member_list.html:13 members/templates/member_list.html:48 +msgid "Added" +msgstr "Lisätty" + +#: members/templates/member_list.html:14 +msgid "Added after" +msgstr "Lisätty jälkeen" + +#: members/templates/member_list.html:15 +msgid "Added before" +msgstr "Lisätty ennen" + +#: members/templates/member_list.html:20 members/templates/member_list.html:49 +msgid "Paid" +msgstr "Maksettu" + +#: members/templates/member_list.html:21 +msgid "Paid after" +msgstr "Maksettu jälkeen" + +#: members/templates/member_list.html:22 +msgid "Paid before" +msgstr "Maksettu ennen" + +#: members/templates/member_list.html:27 +msgid "Search" +msgstr "Haku" + +#: members/templates/member_list.html:28 +msgid "Filter" +msgstr "Suodata" + +#: members/templates/member_list.html:29 +msgid "Reset" +msgstr "Nollaa" + +#: members/templates/member_list.html:32 members/templates/members_base.html:13 +msgid "Member register" +msgstr "Jäsenrekisteri" + +#: members/templates/member_list.html:37 +msgid "Member count" +msgstr "Lukumäärä" + +#: members/templates/member_list.html:42 +msgid "Last name" +msgstr "Sukunimi" + +#: members/templates/member_list.html:43 +msgid "First name" +msgstr "Etunimi" + +#: members/templates/member_list.html:44 +msgid "Email" +msgstr "Sähköposti" + +#: members/templates/member_list.html:45 +msgid "AYY member" +msgstr "AYY:n jäsen" + +#: members/templates/member_list.html:46 +msgid "JAS recipient" +msgstr "JAS-vastaanottaja" + +#: members/templates/member_list.html:47 +msgid "Residence" +msgstr "Asuinpaikka" + +#: members/templates/member_list.html:63 +msgid "Update payment" +msgstr "Päivitä maksu" + +#: members/templates/member_list.html:64 +msgid "Edit" +msgstr "Muokkaa" + +#: members/templates/member_list.html:65 +msgid "Delete" +msgstr "Poista" + +#: members/templates/member_list.html:65 +msgid "Are you sure?" +msgstr "Oletko varma?" + +#: members/templates/members_base.html:49 +msgid "Member list" +msgstr "Jäsenlistaus" + +#: members/templates/members_base.html:50 +msgid "Add member" +msgstr "Lisää jäsen" + +#: members/templates/members_base.html:51 +msgid "Add multiple" +msgstr "Lisää useita" + +#: members/templates/members_base.html:52 +msgid "Member application" +msgstr "Jäsenhakemus" + +#: members/templates/members_base.html:55 sikweb/settings-sample.py:140 +#: sikweb/settings.py:146 +msgid "Finnish" +msgstr "suomi" + +#: members/templates/members_base.html:56 sikweb/settings-sample.py:139 +#: sikweb/settings.py:145 +msgid "English" +msgstr "englanti" + +#: members/templates/members_base.html:58 +msgid "Change language" +msgstr "Vaihda kieli" + +#: members/templates/members_base.html:70 +msgid "Member register of SIK ry" +msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri" + +#: members/templates/members_base.html:75 +msgid "Log out" +msgstr "Kirjaudu ulos" diff --git a/members/templates/member_list.html b/members/templates/member_list.html index 78a4393..bbd76ab 100644 --- a/members/templates/member_list.html +++ b/members/templates/member_list.html @@ -1,6 +1,7 @@ {% extends "members_base.html" %} {% load static %} +{% load i18n %} {% block content %}
@@ -9,40 +10,41 @@
- - - + + +
- - - + + +
- - - + + +
-

Jäsenlista (jäseniä: {$ members.length $})

- +

{% trans "Member register" %}

+
- - - - - - - - + + + + + + + + + @@ -56,9 +58,9 @@ diff --git a/members/templates/members_base.html b/members/templates/members_base.html index cd2af83..d23f96f 100644 --- a/members/templates/members_base.html +++ b/members/templates/members_base.html @@ -3,75 +3,81 @@ {% load i18n %} - - - - - - + + + + + + - Jäsenrekisteri - - - - + {% trans "Member register" %} + + + + - - + + - - + + - - + + - - - - - - + + + + + + - - - - - - + + - - - + + + - - -
+ + +
- - - + + - {% block content %} - {% endblock content %} -
- + + + +
+ + {% block content %} + {% endblock content %} +
+ diff --git a/sikweb/settings-sample.py b/sikweb/settings-sample.py index 6dfd78f..7a6c0e8 100644 --- a/sikweb/settings-sample.py +++ b/sikweb/settings-sample.py @@ -135,7 +135,18 @@ LOGPATH = "logs/debug.log" # Internationalization # https://docs.djangoproject.com/en/1.9/topics/i18n/ -LANGUAGE_CODE = 'en-us' +LANGUAGES = ( + ('en', _('English')), + ('fi', _('Finnish')), +) + +LANGUAGE_CODE = 'fi' + +LOCALE_PATHS = ( + os.path.join(BASE_DIR, 'locale'), +) + +print("LOCALE_PATHS: {}".format(LOCALE_PATHS)) TIME_ZONE = 'Europe/Helsinki' diff --git a/sikweb/urls.py b/sikweb/urls.py index e563a20..b9b7d06 100644 --- a/sikweb/urls.py +++ b/sikweb/urls.py @@ -17,6 +17,7 @@ Including another URLconf from django.conf.urls import url from django.contrib import admin from django.views.generic.base import RedirectView +from django.conf.urls import include # main from webapp.views import main_index # login @@ -114,4 +115,8 @@ urlpatterns = [ url(r'^application/$', application_index), url(r'^application/success$', application_success_index), url(r'^favicon\.ico$', favicon_view), + + # i18n default view for changing the active language + url(r'^i18n/', include('django.conf.urls.i18n')), + ]
SukunimiEtunimiSähköpostiAYY-jäsenJAS-listallaAsuinpaikkaLisättyMaksanut{% trans "Last name" %}{% trans "First name" %}{% trans "Email" %}{% trans "AYY member" %}{% trans "JAS recipient" %}{% trans "Residence" %}{% trans "Added" %}{% trans "Paid" %}{% trans "Member count" %}: {$ members.length $}
{$ x.created $} {$ x.paid $} - - Muokkaa - + + {% trans "Edit" %} +