Merge branch 'master' of git+ssh://github.com/fnp/wolnelektury

diff --git a/wolnelektury/static/js/jquery.countdown.js b/wolnelektury/static/js/jquery.countdown.js
index 11d5506..06f6125 100644 (file)
--- a/wolnelektury/static/js/jquery.countdown.js
+++ b/wolnelektury/static/js/jquery.countdown.js
@@ -6,7 +6,7 @@
    Please attribute the author if you use it. */
 
 /* Modified by Radek Czajka, Fundacja Nowoczesna Polska (radoslaw.czajka(at)nowoczesnapolska.org.pl) */
-w
+
 /* Display a countdown timer.
    Attach it with options like:
    $('div selector').countdown(

diff --git a/wolnelektury/templates/base.html b/wolnelektury/templates/base.html
index 64d1081..fdd375c 100644 (file)
--- a/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@ -33,7 +33,7 @@
             <div id="user-info" style="display:none">
                 {% if user.is_authenticated %}
                     <p>
-                        {% trans "Welcome" %},<strong>{{ user.username }}</strong>
+                        {% trans "Welcome" %}, <strong>{{ user.username }}</strong>
                         | <a href="{% url user_shelves %}" id="user-shelves-link">{% trans "Your shelves" %}</a>
                         {% if user.is_staff %}
                         | <a href="/admin/">{% trans "Administration" %}</a>