Fix l10n

diff --git a/requirements.txt b/requirements.txt
index 3101c0e..f51d854 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,8 @@
+-i http://pypi.nowoczesnapolska.org.pl/simple
+

 Django>=1.5,<1.6
 South
 lxml>=2.2
 django-gravatar
 
 Django>=1.5,<1.6
 South
 lxml>=2.2
 django-gravatar
 

--e git+https://github.com/gstrat/django-cas-provider.git@330bf3e9e9b5c3bff6d9258b2fb81a08b7f81e31#egg=django-cas-provider
+-e git+https://github.com/rczajka/django-cas-provider.git@bb0f7662eb12a838cbd339dd8b60476a73ec161b#egg=django-cas-provider

diff --git a/src/accounts/locale/pl_PL/LC_MESSAGES/django.mo b/src/accounts/locale/pl_PL/LC_MESSAGES/django.mo
index f568b22..63b2a7d 100644 (file)
Binary files a/src/accounts/locale/pl_PL/LC_MESSAGES/django.mo and b/src/accounts/locale/pl_PL/LC_MESSAGES/django.mo differ

diff --git a/src/accounts/locale/pl_PL/LC_MESSAGES/django.po b/src/accounts/locale/pl_PL/LC_MESSAGES/django.po
index 001893c..dbd98d8 100644 (file)
--- a/src/accounts/locale/pl_PL/LC_MESSAGES/django.po
+++ b/src/accounts/locale/pl_PL/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2013-03-20 16:32+0100\n"
-"PO-Revision-Date: 2013-03-20 16:35+0100\n"
+"POT-Creation-Date: 2013-04-15 11:11+0200\n"
+"PO-Revision-Date: 2013-04-15 11:11+0100\n"

 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"


@@ -28,6 +28,14 @@ msgstr "Powtórzone hasło"
 msgid "Passwords do not match!"
 msgstr "Hasło i powtórzenie się nie zgadzają!"
 
 msgid "Passwords do not match!"
 msgstr "Hasło i powtórzenie się nie zgadzają!"
 

+#: views.py:28
+msgid "Profile has been changed."
+msgstr "Profil został zmieniony."
+
+#: views.py:42
+msgid "Password has been changed."
+msgstr "Hasło zostało zmienione."
+

 #: templates/account/profile.html:8
 msgid "Change at Gravatar.com"
 msgstr "Zmień na Gravatar.com"
 #: templates/account/profile.html:8
 msgid "Change at Gravatar.com"
 msgstr "Zmień na Gravatar.com"

diff --git a/src/accounts/views.py b/src/accounts/views.py
index a501b97..5f153c0 100644 (file)
--- a/src/accounts/views.py
+++ b/src/accounts/views.py
@@ -3,7 +3,7 @@ from django import http
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
 from django.shortcuts import render
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
 from django.shortcuts import render

-from django.utils.translation import ugettext as __
+from django.utils.translation import ugettext as _

 from django.views.decorators.http import require_POST
 from accounts.forms import UserBasicForm, UserPasswordForm
 from .models import Service
 from django.views.decorators.http import require_POST
 from accounts.forms import UserBasicForm, UserPasswordForm
 from .models import Service


@@ -24,7 +24,7 @@ def account_change_basic_profile(request):
 
     if form.is_valid():
         form.save()
 
     if form.is_valid():
         form.save()

-        messages.add_message(request, messages.INFO, __("Profile has been changed."))
+        messages.add_message(request, messages.INFO, _("Profile has been changed."))

         return http.HttpResponseRedirect('/accounts/')
 
     return account_profile(request, basic_form=form)
         return http.HttpResponseRedirect('/accounts/')
 
     return account_profile(request, basic_form=form)


@@ -38,7 +38,7 @@ def account_change_password(request):
         request.user.set_password(form.cleaned_data['new_password'])
         request.user.save()
 
         request.user.set_password(form.cleaned_data['new_password'])
         request.user.save()
 

-        messages.add_message(request, messages.INFO, __("Password has been changed."))
+        messages.add_message(request, messages.INFO, _("Password has been changed."))

         return http.HttpResponseRedirect('/accounts/')
 
     return account_profile(request, pass_form=form)
         return http.HttpResponseRedirect('/accounts/')
 
     return account_profile(request, pass_form=form)

diff --git a/src/cas/static/css/main.css b/src/cas/static/css/main.css
index d4b74b5..4d62c01 100644 (file)
--- a/src/cas/static/css/main.css
+++ b/src/cas/static/css/main.css
@@ -22,6 +22,13 @@ a:hover {
     text-decoration: underline;
 }
 
     text-decoration: underline;
 }
 

+.errorlist {
+    color: red;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+

 
 form p {
     margin: 0;
 
 form p {
     margin: 0;

diff --git a/src/cas/templates/cas/login.html b/src/cas/templates/cas/login.html
index 21c622b..b1b9025 100644 (file)
--- a/src/cas/templates/cas/login.html
+++ b/src/cas/templates/cas/login.html
@@ -8,9 +8,13 @@
     {% csrf_token %}
     <h1>{% trans "Login" %}</h1>
 
     {% csrf_token %}
     <h1>{% trans "Login" %}</h1>
 

-       {% for error in errors %}
-           <p>{{ error }}</p>
-       {% endfor %}
+    {% if errors %}
+        <ul class="errorlist">
+        {% for error in errors %}
+            <li>{{ error }}</li>
+        {% endfor %}
+        </ul>
+    {% endif %}

 
     {{ form.as_p }}
     <input type="submit" value="{% trans 'Log me in' %}" tabindex="10" />
 
     {{ form.as_p }}
     <input type="submit" value="{% trans 'Log me in' %}" tabindex="10" />