From 36c04c3a6705192217a364841f9aec7207db9bf5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
 <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Fri, 18 Oct 2013 14:03:34 +0200
Subject: [PATCH 1/1] Translation for curriculum app

---
 curriculum/locale/pl/LC_MESSAGES/django.mo    | Bin 1490 -> 2133 bytes
 curriculum/locale/pl/LC_MESSAGES/django.po    |  96 ++++++++++++------
 .../templates/curriculum/competence_list.html |  21 ++--
 curriculum/views.py                           |   6 +-
 4 files changed, 79 insertions(+), 44 deletions(-)

diff --git a/curriculum/locale/pl/LC_MESSAGES/django.mo b/curriculum/locale/pl/LC_MESSAGES/django.mo
index 51d7de4912cf92464172425e242f77925d8d5f7c..e26e73a7edee107491f276376cabbe7f0a371be8 100644
GIT binary patch
literal 2133
zcmaKr&u<(x6vtgC6t?_qf$~e#AQ~D)vz<vo6>YO^(``~kP0}dY1|e~AXPjB@&W;Cr
zrrTZhfDl!M#1#qD8#e?uIKrV)BK`z8R7l+T4-g^;zHc&{ouq25^?vN<?|XjF9{+jl
z@Yf9O?V|61r_di9!XH}l1Y^g+Pr+BgJK&4pJ@7;Dhr<3Bco_44z_Z{E=zvpCGFAZv
zNO2<YDEJvj@xB6I2EPN3fj@&3|2Oa@@b`j$gQWWxB>$t>jOHgm@*4-A24}&izy^pP
zTP)@);1SH5;4|PS;C<96!4sH&0O!}h3n0ba0MCFekn;Wp#E<=mzxTnP!1usEK+5Mo
zkm4M{CNw_@z79@+?}C>>(r<z%!7o9I`#ty$_-kQ*03s!}15zG`kSx`A9E6FDfmC0$
z;5114)j*`c7C_Q1gLH-DOL{s>99`aC!2h$wnC^xe)lPnJ%j=*VD8E<G>7L#|e+!-3
zo9L7qt~md0o(HMXy;052(d0m*+$c|W$>^Sy+}GVirZV=Gw5&0l^tmrm8EQk;`5?ng
z>6l0Iri|FK43yv^4!DXpwdodXDwRg~@Eit#FNG124l~KtWhDJn2K(08dQ11%$2#NP
z%%<Gt8ZJ`oBrw-;DZxJ9G`h>vmgJGLY4!1La(~iQwwIPH4Y5N})M(k3*6p4E*31~?
zXHnKg37N5obI`I+g!AZ@B{bhB*gefsklbKdAgymyLMP7l$`DbJ=tCCE<gEm^!9t_6
zgvFvOnKpqm%;LZ)NI}b1jc&u{EC$YoG!|<$zB<>qI(KEBZ_KZ)FJ4=ztjR>1)LFKn
z3Y<$>Xq~36@yhD8rqeJozia0*K8_lnbiFCZa~*Gnd($=7n{X#x7eZ%E-c%I4taB$F
z7rLpMcXq<{pj*NPJ53{E8;Mk#8ebEE?C{1wv^#>&8WCu$^s0VtxESl6_6O3&BGHlU
zh^jVWHHpq6P8?<;lulEMZjCR^tz5ZI^~^3UU5pgTMjF(yytq6+D&DKQm4=S-{Ueut
zf}&D+D?O7$LdEB}-x9dyw0^z0;LMD4l=G%E&V20aK*eE=&)iUHWi`r-h@1ty2wUTE
zl22`Y>Kxx4)=$Uvy2meYmt*;q=bo=m^0BdeI9s2l;b}6vv!2Uu-_Gr%amV4~!Dn*3
zf*TyjFxt8kh&JyGA6i?ot9#G2WL9id4;0=EzL^f5W;^bakRD`N#k=&Nqqy(4xEj9c
zT<y2mNBtY9SC;e=Q9EM$7y6p)VC!4nBgxj?vV;%vH`=d0BuWluRAr+&M0w0(!FSb4
zmhAh+BaJ|=2@WUdDxLBkJOi7Go{~H<Iy9oId$K)J^dBwJgTCJuk6F(HBe!8(!HS|D
zxockYqqo$FvcnjqtJ;m)AKjj0Mh|*w`wKkvED?C>gB~4OB-^pxzPELk1p_6vKQGW{
F{{t}SLs0+#

delta 487
zcmX}oJ4?f06vpwB_O<qAZz?)?L6;7NVyEuy;@}r>vvcR-7+nOxEfgG_L~sy6NlQ0T
z1fk+2bQ9@bzky5tPfb1K<d>72<UMajh0l!tU2<I`mdOpWM{be_9w*`%)A)kw`M?a0
zaTR~Ch_RSi30E+WWh`Jlav#-qh<d;MSNnF%g<d?z1-wFs*HL|oi`4g+#6D`6C)9^d
zXkNn$RDFZ%_<%b&#9f@=Hs)AF8>!-!`DP6+^q__G*ePn#Gt^+0$YFPpkEn$Pn7~)m
zfbYm$v(O(?=y{yXsUVg}Ev|m8m2YxNk!<Ea_|9yA`3>zlOKO;T=+`PVNN^PY3YxAH
Xj9uE*Dtoo?&9%JnH&O9|YO*{9wXZ2%

diff --git a/curriculum/locale/pl/LC_MESSAGES/django.po b/curriculum/locale/pl/LC_MESSAGES/django.po
index 3c5d709..a9cdad2 100644
--- a/curriculum/locale/pl/LC_MESSAGES/django.po
+++ b/curriculum/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-08 13:11+0100\n"
+"POT-Creation-Date: 2013-10-18 14:01+0200\n"
 "PO-Revision-Date: 2013-02-08 13:16+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,23 +15,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2)\n"
 
-#: models.py:8
-#: models.py:22
-#: models.py:47
-msgid "name"
-msgstr "nazwa"
-
-#: models.py:9
-#: models.py:23
-#: models.py:48
+#: models.py:9 models.py:33 models.py:68
 msgid "slug"
 msgstr ""
 
-#: models.py:10
-#: models.py:24
-#: models.py:49
+#: models.py:10 models.py:34 models.py:69
 msgid "order"
 msgstr "kolejność"
 
@@ -43,59 +34,98 @@ msgstr "dział"
 msgid "sections"
 msgstr "działy"
 
-#: models.py:28
+#: models.py:27 models.py:63 models.py:80
+msgid "name"
+msgstr "nazwa"
+
+#: models.py:38
 msgid "competence"
 msgstr "kompetencja"
 
-#: models.py:29
+#: models.py:39
 msgid "competences"
 msgstr "kompetencje"
 
-#: models.py:46
-msgid "group"
-msgstr "grupa"
-
-#: models.py:53
+#: models.py:73
 msgid "educational level"
 msgstr "poziom edukacyjny"
 
-#: models.py:54
+#: models.py:74
 msgid "educational levels"
 msgstr "poziomy edukacyjne"
 
-#: models.py:62
-msgid "description"
-msgstr "opis"
+#: models.py:81
+msgid "group"
+msgstr "grupa"
 
-#: models.py:66
+#: models.py:91
 msgid "competence on level"
 msgstr "kompetencja na poziomie"
 
-#: models.py:67
+#: models.py:92
 msgid "competences on levels"
 msgstr "kompetencje na poziomach"
 
-#: models.py:81
+#: models.py:101
+msgid "description"
+msgstr "opis"
+
+#: models.py:109
 msgid "curriculum level"
 msgstr "poziom w podstawie programowej"
 
-#: models.py:82
+#: models.py:110
 msgid "curriculum levels"
 msgstr "poziomy w podstawie programowej"
 
-#: models.py:93
+#: models.py:122
 msgid "curriculum course"
 msgstr "przedmiot w podstawie programowej"
 
-#: models.py:94
+#: models.py:123
 msgid "curriculum courses"
 msgstr "przedmioty w podstawie programowej"
 
-#: models.py:111
+#: models.py:141
 msgid "curriculum item"
 msgstr "pozycja w podstawie programowej"
 
-#: models.py:112
+#: models.py:142
 msgid "curriculum items"
 msgstr "podstawa programowa"
 
+#: views.py:51
+msgid "You must select at least one competency from the list."
+msgstr "Proszę wybrać kompetencje z listy."
+
+#: views.py:53
+msgid "You must select at least one education level."
+msgstr "Proszę wybrać poziom edukacyjny."
+
+#: templates/curriculum/competence_list.html:8
+msgid "Media and information literacy competencies catalogue"
+msgstr "Katalog kompetencji medialnych i informacyjnych"
+
+#: templates/curriculum/competence_list.html:15
+msgid "Browse competencies"
+msgstr "Przeglądaj kompetencje"
+
+#: templates/curriculum/competence_list.html:15
+msgid "expand"
+msgstr "rozwiń"
+
+#: templates/curriculum/competence_list.html:18
+msgid "Education level"
+msgstr "Poziom edukacyjny"
+
+#: templates/curriculum/competence_list.html:31
+msgid "Competency categories"
+msgstr "Kategories kompetencji"
+
+#: templates/curriculum/competence_list.html:49
+msgid "Show"
+msgstr "Pokaż"
+
+#: templates/curriculum/competence_list.html:55
+msgid "Selected competencies"
+msgstr "Wybrane kompetencje"
diff --git a/curriculum/templates/curriculum/competence_list.html b/curriculum/templates/curriculum/competence_list.html
index 499e316..3009b49 100755
--- a/curriculum/templates/curriculum/competence_list.html
+++ b/curriculum/templates/curriculum/competence_list.html
@@ -1,18 +1,21 @@
 {% extends "base_mil.html" %}
 {% load chunks %}
+{% load i18n %}
 
-{% block title %}Katalog kompetencji medialnych i informacyjnych{% endblock %}
+{% block title %}{% trans 'Media and information literacy competencies catalogue' %}{% endblock %}
 
 {% block body %}
-<h1>Katalog kompetencji medialnych i informacyjnych</h1>
+<h1>{% trans 'Media and information literacy competencies catalogue' %}</h1>
 
-{% chunk 'katalog_kompetencji' %}
+{% if request.LANGUAGE_CODE == 'pl' %}
+    {% chunk 'katalog_kompetencji' %}
+{% endif %}
 
 <div class="curriculum-form">
-<h2><a>Przeglądaj kompetencje <span>(rozwiń)</span></a></h2>
+<h2><a>{% trans 'Browse competencies' %} <span>({% trans 'expand' %})</span></a></h2>
 <form>
 
-<h3>Poziom edukacyjny:</h3>
+<h3>{% trans 'Education level' %}:</h3>
 {% if errors.level %}<p class="error">{{ errors.level }}</p>{% endif %}
 {% for lev_group, levels in levels.items %}
     <strong>{{ lev_group }}</strong>
@@ -25,14 +28,14 @@
     </ul>
 {% endfor %}
 
-<h3>Kategorie kompetencji:</h3>
+<h3>{% trans 'Competency categories' %}:</h3>
 {% if errors.competences %}<p class="error">{{ errors.competences }}</p>{% endif %}
 <ul class="curriculum-sections">
 {% for section in sections %}
     <li class="curriculum-section">
     <label><input type="checkbox" class="s" name="s" value="{{ section.pk }}"
         {% if section.pk in sect_ids %}checked="checked"{% endif %} /> {{ section }}</label>
-        <a class="curriculum-section-toggler">(rozwiń)</a>
+        <a class="curriculum-section-toggler">({% trans 'expand' %})</a>
     <ul class="competences">
     {% for competence in section.competence_set.all %}
         <li class="competence"><label><input class="c" type="checkbox" name="c" value="{{ competence.pk }}"
@@ -43,13 +46,13 @@
     </li>
 {% endfor %}
 </ul>
-<button>Pokaż</button>
+<button>{% trans 'Show' %}</button>
 </form>
 </div>
 
 {% if chosen_competences %}
 
-<h2>Wybrane kompetencje – {{ level }}</h2>
+<h2>{% trans 'Selected competencies' %} – {{ level }}</h2>
 
 {% for section, competences in chosen_competences.items %}
     <h3>{{ section }}</h3>
diff --git a/curriculum/views.py b/curriculum/views.py
index b643ae2..25606f1 100644
--- a/curriculum/views.py
+++ b/curriculum/views.py
@@ -2,6 +2,8 @@
 from django.db import models
 from django.views.generic import DetailView, ListView
 from django.utils.datastructures import SortedDict
+from django.utils.translation import ugettext as _
+
 from .models import Competence, Section, Level, CompetenceLevel
 
 
@@ -46,9 +48,9 @@ class CompetencesView(ListView):
 
         if not (comp_ids or sect_ids):
             if level:
-                errors["competences"] = u"Proszę wybrać kompetencje z listy."
+                errors["competences"] = _('You must select at least one competency from the list.')
         elif level is None:
-            errors["level"] = u"Proszę wybrać poziom edukacyjny."
+            errors["level"] = _('You must select at least one education level.')
         else:
             chosen_competences = SortedDict()
             for competence in Competence.objects.filter(
-- 
2.20.1