English version wip - urls, navigation

diff --git a/edumed/locale/pl/LC_MESSAGES/django.mo b/edumed/locale/pl/LC_MESSAGES/django.mo
index 6c2cbcf..0480e2c 100644 (file)
Binary files a/edumed/locale/pl/LC_MESSAGES/django.mo and b/edumed/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/edumed/locale/pl/LC_MESSAGES/django.po b/edumed/locale/pl/LC_MESSAGES/django.po
index 86361c7..ceb63cc 100644 (file)
--- a/edumed/locale/pl/LC_MESSAGES/django.po
+++ b/edumed/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-09-04 13:32+0200\n"
+"POT-Creation-Date: 2013-10-15 14:02+0200\n"
 "PO-Revision-Date: 2012-11-19 15:58+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,14 +15,17 @@ 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"
 
 #: templates/404.html:4
 #: templates/404.html.py:8
+#: templates/404.html:4 templates/404.html.py:8 templates/404_mil.html:4
+#: templates/404_mil.html.py:8
 msgid "Page not found"
 msgstr "Strona nie znaleziona"
 
-#: templates/404.html:11
+#: templates/404.html:11 templates/404_mil.html:11
 msgid "The page you were looking for doesn't exist."
 msgstr "Strona której szukasz nie została znaleziona."
 
@@ -30,3 +33,19 @@ msgstr "Strona której szukasz nie została znaleziona."
 msgid "Forum search"
 msgstr "Szukaj na forum"
 
+#: templates/base_mil.html:8
+msgid "Consultations"
+msgstr "Konsultaje"
+
+#: templates/base_mil.html:9
+msgid "Competencies"
+msgstr "Kompetencje"
+
+#: templates/base_mil.html:10
+msgid "Take Part"
+msgstr "Weź udział"
+
+#: templates/base_mil.html:14
+msgid "Contact"
+msgstr "Kontakt"
+

diff --git a/edumed/milurls.py b/edumed/milurls.py
index 5da79e1..8f9060c 100644 (file)
--- a/edumed/milurls.py
+++ b/edumed/milurls.py
@@ -1,8 +1,10 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
+
+from fnpdjango.utils.urls import i18n_patterns
 from .views import MILHomeView
 
 
-urlpatterns = patterns('',
+urlpatterns = i18n_patterns('',
     url(r'^$', MILHomeView.as_view(), name="mil_home"),
     url(r'^kompetencje/', include('curriculum.urls')),
 )

diff --git a/edumed/settings.d/30-locale.py b/edumed/settings.d/30-locale.py
index 40f6617..ed2173a 100644 (file)
--- a/edumed/settings.d/30-locale.py
+++ b/edumed/settings.d/30-locale.py
@@ -2,7 +2,7 @@
 
 LANGUAGES = (
     ('pl', u'polski'),
-#    ('en', u'English'),
+    ('en', u'English'),
 )
 
 # Local time zone for this installation. Choices can be found here:

diff --git a/edumed/templates/base_mil.html b/edumed/templates/base_mil.html
index 7a36919..e5300e6 100644 (file)
--- a/edumed/templates/base_mil.html
+++ b/edumed/templates/base_mil.html
@@ -1,10 +1,16 @@
 {% extends "base_super.html" %}
 {% load subdomainurls %}
+{% load fnp_lang %}
+
+{% load i18n %}
 
 {% block top_navigation %}
-    <li><a class="menu-wspolpraca" href="{% url "mil_home" %}">Konsultacje</a></li>
-        <li><a class="menu-kompetencje" href="{% url "curriculum" %}">Kompetencje</a></li>
-        <li><a class="menu-wspolpraca" href="wez-udzial">Weź udział</a></li>
-        <li><a class="menu-lekcje" href="{% url 'home' subdomain=None %}">Materiały edukacyjne</a></li>
-        <li><a class="menu-kontakt" href="{% url 'info' url='kontakt/' subdomain=None %}">Kontakt</a></li>
+    <li><a class="menu-wspolpraca" href="{% url "mil_home" %}">{% trans 'Consultations' %}</a></li>
+        <li><a class="menu-kompetencje" href="{% url "curriculum" %}">{% trans 'Competencies' %}</a></li>
+        <li><a class="menu-wspolpraca" href="/wez-udzial">{% trans 'Take Part' %}</a></li>
+        {% if request.LANGUAGE_CODE == 'pl' %}
+            <li><a class="menu-lekcje" href="{% url 'home' subdomain=None %}">Materiały edukacyjne</a></li>
+        {% endif %}
+        <li><a class="menu-kontakt" href="{% url 'info' url='kontakt/' subdomain=None %}">{% trans 'Contact' %}</a></li>
+        <li>{% lang_switcher %}</li>
 {% endblock %}