more english

diff --git a/emels/settings/locale.py b/emels/settings/locale.py
index cdaf12b..7887630 100644 (file)
--- a/emels/settings/locale.py
+++ b/emels/settings/locale.py
@@ -19,7 +19,7 @@ TIME_ZONE = None
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html

-LANGUAGE_CODE = 'pl'
+LANGUAGE_CODE = 'en'

 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.

diff --git a/emels/settings/middleware.py b/emels/settings/middleware.py
index 42c45b5..cbd5c3f 100644 (file)
--- a/emels/settings/middleware.py
+++ b/emels/settings/middleware.py
@@ -4,7 +4,7 @@ from emels.utils import process_app_deps
 MIDDLEWARE_CLASSES = process_app_deps((
     'django.middleware.cache.UpdateCacheMiddleware',
     ('django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions'),
 MIDDLEWARE_CLASSES = process_app_deps((
     'django.middleware.cache.UpdateCacheMiddleware',
     ('django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions'),

-    # 'django.middleware.locale.LocaleMiddleware',
+    'django.middleware.locale.LocaleMiddleware',

     'fnpdjango.middleware.URLLocaleMiddleware',
 
     'django.middleware.common.CommonMiddleware',
     'fnpdjango.middleware.URLLocaleMiddleware',
 
     'django.middleware.common.CommonMiddleware',

diff --git a/emels/static/img/social/bignk.png b/emels/static/img/social/bignk.png
deleted file mode 100644 (file)
index 6c373fb..0000000
Binary files a/emels/static/img/social/bignk.png and /dev/null differ

diff --git a/emels/static/img/social/nk.png b/emels/static/img/social/nk.png
deleted file mode 100644 (file)
index 0200bf5..0000000
Binary files a/emels/static/img/social/nk.png and /dev/null differ

diff --git a/emels/templates/base.html b/emels/templates/base.html
index 65129af..ba02e2d 100644 (file)
--- a/emels/templates/base.html
+++ b/emels/templates/base.html
@@ -8,10 +8,10 @@
 
 {% block top_navigation %}
     <li><a class="menu-news" href="{% url "migdal_main" %}">{% trans "News" %}</a></li>
 
 {% block top_navigation %}
     <li><a class="menu-news" href="{% url "migdal_main" %}">{% trans "News" %}</a></li>

-    <li><a class="menu-about" href="{% entry_url 'o-projekcie' %}">{% trans "About" %}</a></li>
-    <li><a class="menu-partners" href="{% entry_url 'partnerzy' %}">{% trans "Partners" %}</a></li>
+    <li><a class="menu-about" href="{% entry_url 'about' 'en' %}">{% trans "About" %}</a></li>
+    <li><a class="menu-partners" href="{% entry_url 'partners' 'en' %}">{% trans "Partners" %}</a></li>

     <li><a class="menu-publications" href="{% url 'migdal_entry_list_publications' %}">{% trans "Publications" %}</a></li>
     <li><a class="menu-publications" href="{% url 'migdal_entry_list_publications' %}">{% trans "Publications" %}</a></li>

-    <li><a class="menu-contact" href="{% entry_url 'kontakt' %}">{% trans "Contact" %}</a></li>
+    <li><a class="menu-contact" href="{% entry_url 'contact' 'en' %}">{% trans "Contact" %}</a></li>

 {% endblock %}
 
 {% block copyrights %}
 {% endblock %}
 
 {% block copyrights %}