Translation for curriculum app

diff --git a/curriculum/locale/pl/LC_MESSAGES/django.mo b/curriculum/locale/pl/LC_MESSAGES/django.mo
index 51d7de4..e26e73a 100644 (file)
Binary files a/curriculum/locale/pl/LC_MESSAGES/django.mo and b/curriculum/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/curriculum/locale/pl/LC_MESSAGES/django.po b/curriculum/locale/pl/LC_MESSAGES/django.po
index 3c5d709..a9cdad2 100644 (file)
--- 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"
 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"
 "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"
 "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 ""
 
 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ść"
 
 msgid "order"
 msgstr "kolejność"
 


@@ -43,59 +34,98 @@ msgstr "dział"
 msgid "sections"
 msgstr "działy"
 
 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"
 
 msgid "competence"
 msgstr "kompetencja"
 

-#: models.py:29
+#: models.py:39

 msgid "competences"
 msgstr "kompetencje"
 
 msgid "competences"
 msgstr "kompetencje"
 

-#: models.py:46
-msgid "group"
-msgstr "grupa"
-
-#: models.py:53
+#: models.py:73

 msgid "educational level"
 msgstr "poziom edukacyjny"
 
 msgid "educational level"
 msgstr "poziom edukacyjny"
 

-#: models.py:54
+#: models.py:74

 msgid "educational levels"
 msgstr "poziomy edukacyjne"
 
 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"
 
 msgid "competence on level"
 msgstr "kompetencja na poziomie"
 

-#: models.py:67
+#: models.py:92

 msgid "competences on levels"
 msgstr "kompetencje na poziomach"
 
 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"
 
 msgid "curriculum level"
 msgstr "poziom w podstawie programowej"
 

-#: models.py:82
+#: models.py:110

 msgid "curriculum levels"
 msgstr "poziomy w podstawie programowej"
 
 msgid "curriculum levels"
 msgstr "poziomy w podstawie programowej"
 

-#: models.py:93
+#: models.py:122

 msgid "curriculum course"
 msgstr "przedmiot w podstawie programowej"
 
 msgid "curriculum course"
 msgstr "przedmiot w podstawie programowej"
 

-#: models.py:94
+#: models.py:123

 msgid "curriculum courses"
 msgstr "przedmioty w podstawie programowej"
 
 msgid "curriculum courses"
 msgstr "przedmioty w podstawie programowej"
 

-#: models.py:111
+#: models.py:141

 msgid "curriculum item"
 msgstr "pozycja w podstawie programowej"
 
 msgid "curriculum item"
 msgstr "pozycja w podstawie programowej"
 

-#: models.py:112
+#: models.py:142

 msgid "curriculum items"
 msgstr "podstawa programowa"
 
 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 (executable)
--- a/curriculum/templates/curriculum/competence_list.html
+++ b/curriculum/templates/curriculum/competence_list.html
@@ -1,18 +1,21 @@
 {% extends "base_mil.html" %}
 {% load chunks %}
 {% 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 %}
 
 {% 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">
 
 <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>
 
 <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>
 {% 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 %}
 
     </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>
 {% 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 }}"
     <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>
     </li>
 {% endfor %}
 </ul>

-<button>Pokaż</button>
+<button>{% trans 'Show' %}</button>

 </form>
 </div>
 
 {% if chosen_competences %}
 
 </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>
 
 {% for section, competences in chosen_competences.items %}
     <h3>{{ section }}</h3>

diff --git a/curriculum/views.py b/curriculum/views.py
index b643ae2..25606f1 100644 (file)
--- 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.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
 
 
 from .models import Competence, Section, Level, CompetenceLevel
 
 


@@ -46,9 +48,9 @@ class CompetencesView(ListView):
 
         if not (comp_ids or sect_ids):
             if level:
 
         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:
         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(
         else:
             chosen_competences = SortedDict()
             for competence in Competence.objects.filter(