From 5c1a626c89722e468baa246ebac4f4b88252cd0a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Tue, 15 Oct 2013 14:11:40 +0200 Subject: [PATCH 1/1] English version wip - urls, navigation --- edumed/locale/pl/LC_MESSAGES/django.mo | Bin 722 -> 899 bytes edumed/locale/pl/LC_MESSAGES/django.po | 25 ++++++++++++++++++++++--- edumed/milurls.py | 6 ++++-- edumed/settings.d/30-locale.py | 2 +- edumed/templates/base_mil.html | 16 +++++++++++----- 5 files changed, 38 insertions(+), 11 deletions(-) diff --git a/edumed/locale/pl/LC_MESSAGES/django.mo b/edumed/locale/pl/LC_MESSAGES/django.mo index 6c2cbcf1d884c1b5003d7cc06b24e0b990f62e78..0480e2c77bbaccb489fd8df1f65795467d12098c 100644 GIT binary patch delta 324 zcmcb_+RR>mPl#nI0}yZku?!H$05LZZ&jDf(I03{wKztI2d4c#E5VHgE6CehOzX4)C zApQx&oIuRM$iScjq=kU=K_IpVVvu=^%nS@%K$;gwgY-)PX?_NV90mm-Llh`r0Hi?% zx&di@ARP>(fqKCJq=6O61`0E<0WlL0vj8#3;b7pLpIeYxlA4#CnOe-?oS#=*np2Wk zk_lvhcqNI+B@+weI1;l{6#^2AN+$L+av2)v8k#B?nphcZ7H3Rll=Fs}kd?~d4K)D5 eEJ@5RnOx1J&J&(`beBSDN>yg!(Wc1@nG6Akem7wN delta 163 zcmZo>zr3vDfpia$)(6syfHY7V448o=kPEhh!7ab2G*_WGHL)l;gCStzFaF8GjP+aw bmbwNe3Wmm3#+&CbrZP@eU{;$P%xnMv{3aJM diff --git a/edumed/locale/pl/LC_MESSAGES/django.po b/edumed/locale/pl/LC_MESSAGES/django.po index 86361c7..ceb63cc 100644 --- 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 \n" "Language-Team: LANGUAGE \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 --- 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 --- 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 --- 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 %} -
  • Konsultacje
    • -
  • Kompetencje
    • -
  • Weź udział
    • -
  • Materiały edukacyjne
    • -
  • Kontakt
    • +
  • {% trans 'Consultations' %}
    • +
  • {% trans 'Competencies' %}
    • +
  • {% trans 'Take Part' %}
    • + {% if request.LANGUAGE_CODE == 'pl' %} +
  • Materiały edukacyjne
    • + {% endif %} +
  • {% trans 'Contact' %}
    • +
  • {% lang_switcher %}
    • {% endblock %} -- 2.20.1