From: Jan Szejko <janek37@gmail.com>
Date: Wed, 5 Apr 2017 12:14:48 +0000 (+0200)
Subject: english, erasmus
X-Git-Url: https://git.mdrn.pl/emels.git/commitdiff_plain/32c7b2b974c4e7adee16cf5affcb759e1fade5a0?ds=sidebyside

english, erasmus
---

diff --git a/emels/settings/locale.py b/emels/settings/locale.py
index 7887630..cdaf12b 100644
--- 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 = 'en'
+LANGUAGE_CODE = 'pl'
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
diff --git a/emels/static/css/base.css b/emels/static/css/base.css
index b437e36..5253e7b 100644
--- a/emels/static/css/base.css
+++ b/emels/static/css/base.css
@@ -137,14 +137,15 @@ footer.main {
     float: left;
     margin-right: 1.25em;
     width: 13.75em; }
+  footer.main .sponsors-page {
+    float: left;
+    margin-right: 6em; }
   footer.main .sponsors-column {
     float: left;
     margin-left: 1.25em;
     width: 6.25em; }
     footer.main .sponsors-column p {
       font-size: .75em; }
-  footer.main .footer-extra p {
-    margin-top: 0; }
 
 #search {
   font-size: .8em; }
diff --git a/emels/static/css/base.scss b/emels/static/css/base.scss
index 9f3ca99..bc3ec6d 100644
--- a/emels/static/css/base.scss
+++ b/emels/static/css/base.scss
@@ -157,6 +157,10 @@ footer.main {
         margin-right: 20 * $px;
         width: 220 * $px;
     }
+    .sponsors-page {
+        float: left;
+        margin-right: 6em;
+    }
     .sponsors-column {
         float: left;
         margin-left: 20 * $px;
@@ -165,9 +169,6 @@ footer.main {
             font-size: .75em;
         }
     }
-    .footer-extra p {
-        margin-top: 0;
-    }
 }
 
 
diff --git a/emels/static/img/erasmus.jpg b/emels/static/img/erasmus.jpg
new file mode 100644
index 0000000..973744f
Binary files /dev/null and b/emels/static/img/erasmus.jpg differ
diff --git a/emels/templates/base.html b/emels/templates/base.html
index a2afdf5..65129af 100644
--- a/emels/templates/base.html
+++ b/emels/templates/base.html
@@ -3,6 +3,7 @@
 {% load i18n %}
 {% load sponsor_tags %}
 {% load migdal_tags %}
+{% load static %}
 
 
 {% block top_navigation %}
diff --git a/emels/templates/base_super.html b/emels/templates/base_super.html
index 9765598..99f2fbd 100644
--- a/emels/templates/base_super.html
+++ b/emels/templates/base_super.html
@@ -27,13 +27,13 @@
         <div id="header-wrapper">
         <header class="main {% block header_class %}{% endblock %}" style="position:relative;">
             {% if request.user.is_authenticated %}
-                <a href="{% url 'logout' %}" style="position: absolute; top:5px; right: 10px; font-size: 12px;">Wyloguj</a>
+                <a href="{% url 'logout' %}" style="position: absolute; top:5px; right: 10px; font-size: 12px;">{% trans "Log out" %}</a>
             {% endif %}
             <div id="header-top">
             <a id="logo" href="/">{% block logo %}<img src="{% static "img/logo.png" %}" alt="Emels"/>{% endblock %}</a>
             <div id="organizer">
                 {% block organizer %}
-                Projekt prowadzi:<br/>
+                {% trans "Project by:" %}<br/>
                 <a href="http://nowoczesnapolska.org.pl">
                     <img src="{% static "img/logo_fnp.png" %}" alt="Fundacja Nowoczesna Polska" />
                 </a>
@@ -83,16 +83,27 @@
                 <p>
                 Webdesign Ortografika<br/>
                 <br/>
-                Jeśli nie oznaczono inaczej, wszystkie materiały na stronie są objęte wolną licencją
-                <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.pl">Creative Commons Uznanie autorstwa
-                – Na tych samych warunkach 3.0</a>.
+                {% trans "Unless stated otherwise, all materials on this site are available under" %}
+                <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.pl">{% trans "Creative Commons Attribution-ShareAlike 3.0" %}</a>.
                 {% block copyrights %}{% endblock %}
                 </p>
             </div>
             {% block sponsors %}
             {% endblock %}
+            <div class="footer-item" style="margin-right:0">
+                <p>
+                    <img src="{% static 'img/erasmus.jpg' %}" style="height:50px"/>
+                </p>
+                <p>
+                    This project has been funded with support from the European Commission.
+                </p>
+                <p>
+                    This webpage  reflects the views only of the author,
+                    and the Commission cannot be held responsible for any use which may be made of
+                    the information contained therein.
+                </p>
+            </div>
             <div class="clr"></div>
-            <div class="footer-extra">{% block footer_extra %}{% endblock %}</div>
         </footer>
 
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>