From: Marcin Koziej Date: Thu, 15 Mar 2012 12:31:48 +0000 (+0100) Subject: Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/f551c7053c91818b3ac0dfccc2e699dc6517fae1?hp=32738366b8aee16f4bb8767b383fbbbdf79e7ed8 Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty --- diff --git a/apps/ajaxable/templatetags/__init__.py b/apps/ajaxable/templatetags/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/apps/ajaxable/templatetags/ajaxable_tags.py b/apps/ajaxable/templatetags/ajaxable_tags.py new file mode 100644 index 000000000..229047891 --- /dev/null +++ b/apps/ajaxable/templatetags/ajaxable_tags.py @@ -0,0 +1,13 @@ +from django import template +from ajaxable.utils import placeholdized +register = template.Library() + + +@register.filter +def placeholdize(form): + return placeholdized(form) + + +@register.filter +def placeholdized_ul(form): + return placeholdized(form).as_ul() diff --git a/babel.cfg b/babel.cfg new file mode 100644 index 000000000..d7e179da9 --- /dev/null +++ b/babel.cfg @@ -0,0 +1,5 @@ +[extractors] +django = babeldjango.extract:extract_django + +[django: **/templates/**.*] +[python: **.py] diff --git a/locale-contrib/django.pot b/locale-contrib/django.pot new file mode 100644 index 000000000..1bb323827 --- /dev/null +++ b/locale-contrib/django.pot @@ -0,0 +1,539 @@ +# Translations template for PROJECT. +# Copyright (C) 2012 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2012. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2012-03-13 15:12+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:36 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:167 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:341 +msgid "Password" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:40 +msgid "Remember Me" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:52 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:113 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:284 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:363 +msgid "E-mail" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:57 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:104 +msgid "Username" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:85 +msgid "This account is currently inactive." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:88 +msgid "The e-mail address and/or password you specified are not correct." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:90 +msgid "The username and/or password you specified are not correct." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:116 +msgid "E-mail (optional)" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:127 +msgid "Usernames can only contain letters, numbers and underscores." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:133 +msgid "This username is already taken. Please choose another." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:141 +msgid "A user is registered with this e-mail address." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:171 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:345 +msgid "Password (again)" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:198 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:330 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:352 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:428 +msgid "You must type the same password each time." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:234 +msgid "Your e-mail address has already been verified" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:244 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/utils.py:93 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:101 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:117 +#, python-format +msgid "Confirmation e-mail sent to %(email)s" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:292 +msgid "This e-mail address already associated with this account." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:293 +msgid "This e-mail address already associated with another account." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:310 +msgid "Current Password" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:314 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:411 +msgid "New Password" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:318 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:415 +msgid "New Password (again)" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:324 +msgid "Please type your current password." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:373 +msgid "The e-mail address is not assigned to any user account" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:393 +msgid "Password Reset E-mail" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/utils.py:72 +#, python-format +msgid "Successfully signed in as %(user)s." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:133 +#, python-format +msgid "Removed e-mail address %(email)s" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:147 +msgid "Primary e-mail address set" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:168 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:241 +msgid "Password successfully changed." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:191 +msgid "Password successfully set." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:255 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/logout.html:10 +msgid "You have signed out." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/openid/forms.py:6 +msgid "OpenID" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/forms.py:32 +msgid "Your local account has no password setup." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/forms.py:36 +msgid "Your local account has no verified e-mail address." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/helpers.py:112 +msgid "The social account has been connected to your existing account" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:89 +#, python-format +msgid "Invalid response while obtaining request token from \"%s\"." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:111 +#, python-format +msgid "Invalid response while obtaining access token from \"%s\"." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:124 +#, python-format +msgid "No request token saved for \"%s\"." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:172 +#, python-format +msgid "No access token saved for \"%s\"." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:192 +#, python-format +msgid "No access to private resources at \"%s\"." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/views.py:68 +msgid "The social account has been disconnected" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:6 +msgid "Account" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:9 +msgid "E-mail Addresses" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:12 +msgid "The following e-mail addresses are associated to your account:" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:26 +msgid "Verified" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:28 +msgid "Unverified" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:30 +msgid "Primary" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:36 +msgid "Make Primary" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:37 +msgid "Re-send Verification" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:38 +msgid "Remove" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:45 +msgid "Warning:" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:45 +msgid "" +"You currently do not have any e-mail address set up. You should really " +"add an e-mail address so you can receive notifications, reset your " +"password, etc." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:50 +msgid "Add E-mail Address" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:57 +msgid "Add E-mail" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:69 +msgid "Do you really want to remove the selected e-mail address?" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:6 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:9 +msgid "Language" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:11 +msgid "Pinax can be used in your preferred language." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:18 +msgid "Change my language" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:7 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:12 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:47 +msgid "Sign In" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:20 +#, python-format +msgid "" +"Please sign in with one\n" +"of your existing third party accounts. Or, sign up for a %(site_name)s account and sign " +"in\n" +"below:" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:28 +msgid "or" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:45 +msgid "Forgot Password?" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/logout.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/logout.html:8 +msgid "Signed Out" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_change.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_change.html:8 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_change.html:15 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:8 +msgid "Change Password" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:8 +msgid "Delete Password" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:9 +msgid "" +"You may delete your password since you are currently logged in using " +"OpenID." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:12 +msgid "delete my password" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete_done.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete_done.html:8 +msgid "Password Deleted" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete_done.html:9 +msgid "Your password has been deleted." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:7 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:11 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_done.html:6 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_done.html:9 +msgid "Password Reset" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:16 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll send " +"you an e-mail allowing you to reset it." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:23 +msgid "Reset My Password" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:28 +#, python-format +msgid "" +"If you have any trouble resetting your password, contact us at %(CONTACT_EMAIL)s." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_done.html:15 +#, python-format +msgid "" +"We have sent you an e-mail. If you do not receive it within a few " +"minutes, contact us at %(CONTACT_EMAIL)s." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:8 +msgid "Bad Token" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:12 +#, python-format +msgid "" +"The password reset link was invalid, possibly because it has already been" +" used. Please request a new password " +"reset." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:20 +msgid "change password" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:25 +msgid "Your password is now changed." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_key_message.txt:9 +#, python-format +msgid "" +"You're receiving this e-mail because you or someone else has requested a " +"password for your user account at %(site_domain)s.\n" +"It can be safely ignored if you did not request a password reset. Click " +"the link below to reset your password.\n" +"\n" +"%(password_reset_url)s\n" +"\n" +"In case you forgot, your username is %(username)s.\n" +"\n" +"Thanks for using our site!\n" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_set.html:6 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_set.html:9 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_set.html:16 +msgid "Set Password" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:6 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:6 +msgid "Signup" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:9 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:24 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:9 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:22 +msgid "Sign Up" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:14 +msgid "Already have an account?" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:14 +msgid "Sign in" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:6 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:9 +msgid "Timezone" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:11 +msgid "" +"Pinax can localize all times into your preferred timezone. Change your " +"timezone below." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:18 +msgid "Change my timezone" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/verification_sent.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/verification_sent.html:8 +msgid "Verify Your E-mail Address" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/verification_sent.html:10 +#, python-format +msgid "" +"We have sent you an e-mail to %(email)s for verification. Follow " +"the link provided to finalize the signup process. If you do not receive " +"it within a few minutes, contact us at %(CONTACT_EMAIL)s." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/snippets/already_logged_in.html:5 +msgid "Note" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/snippets/already_logged_in.html:5 +#, python-format +msgid "you are already logged in as %(user_display)s." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:8 +msgid "E-mail Address Confirmation" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:11 +#, python-format +msgid "" +"You have confirmed that %(email)s is an " +"e-mail address for user '%(user)s'." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:13 +msgid "Invalid confirmation key." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/openid/login.html:10 +msgid "OpenID Sign In" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/account_inactive.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/account_inactive.html:8 +msgid "Account Inactive" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/account_inactive.html:10 +msgid "This account is inactive." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/authentication_error.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/authentication_error.html:8 +msgid "Social Network Login Failure" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/authentication_error.html:10 +msgid "" +"An error occured while attempting to login via your social network " +"account." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:8 +msgid "Account Connections" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:11 +msgid "" +"You can sign in to your account using any of the following third party " +"accounts:" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:46 +msgid "Add a 3rd Party Account" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/login_cancelled.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/login_cancelled.html:9 +msgid "Login Cancelled" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/login_cancelled.html:13 +#, python-format +msgid "" +"You decided to cancel logging in to our site using one of your exisiting " +"accounts. If this was a mistake, please proceed to sign in." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:12 +#, python-format +msgid "" +"You are about to use your %(provider_name)s account to login to \n" +"%(site_name)s. As a final step, please complete the following form:" +msgstr "" + diff --git a/locale-contrib/pl/LC_MESSAGES/django.mo b/locale-contrib/pl/LC_MESSAGES/django.mo new file mode 100644 index 000000000..ffc92c398 Binary files /dev/null and b/locale-contrib/pl/LC_MESSAGES/django.mo differ diff --git a/locale-contrib/pl/LC_MESSAGES/django.po b/locale-contrib/pl/LC_MESSAGES/django.po new file mode 100644 index 000000000..071599ce9 --- /dev/null +++ b/locale-contrib/pl/LC_MESSAGES/django.po @@ -0,0 +1,518 @@ +# Polish translations for PROJECT. +# Copyright (C) 2012 ORGANIZATION +# This file is distributed under the same license as the PROJECT project. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: PROJECT VERSION\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2012-03-13 15:12+0100\n" +"PO-Revision-Date: 2012-03-13 15:39+0100\n" +"Last-Translator: Radek Czajka \n" +"Language-Team: pl \n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:36 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:167 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:341 +msgid "Password" +msgstr "Hasło" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:40 +msgid "Remember Me" +msgstr "Zapamiętaj mnie" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:52 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:113 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:284 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:363 +msgid "E-mail" +msgstr "E-mail" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:57 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:104 +msgid "Username" +msgstr "Login" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:85 +msgid "This account is currently inactive." +msgstr "Konto jest nieaktywne." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:88 +msgid "The e-mail address and/or password you specified are not correct." +msgstr "Podany e-mail i/lub hasło są niepoprawne." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:90 +msgid "The username and/or password you specified are not correct." +msgstr "Podany login i/lub hasło są niepoprawne." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:116 +msgid "E-mail (optional)" +msgstr "E-mail (opcjonalnie)" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:127 +msgid "Usernames can only contain letters, numbers and underscores." +msgstr "Login może zawierać tylko litery, cyfry i znaki podkreślenia." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:133 +msgid "This username is already taken. Please choose another." +msgstr "Ten login jest zajęty. Proszę wybrać inny." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:141 +msgid "A user is registered with this e-mail address." +msgstr "Istnieje użytkownik o tym adresie e-mail." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:171 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:345 +msgid "Password (again)" +msgstr "Hasło (ponownie)" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:198 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:330 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:352 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:428 +msgid "You must type the same password each time." +msgstr "Proszę wpisać dwa razy to samo hasło." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:234 +msgid "Your e-mail address has already been verified" +msgstr "Adres e-mail jest już zweryfikowany." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:244 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/utils.py:93 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:101 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:117 +#, python-format +msgid "Confirmation e-mail sent to %(email)s" +msgstr "E-mail potwierdzający wysłany do %(email)s" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:292 +msgid "This e-mail address already associated with this account." +msgstr "Ten adres e-mail jest już używany przez to konto." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:293 +msgid "This e-mail address already associated with another account." +msgstr "Ten adres e-mail jest już używany przez inne konto." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:310 +msgid "Current Password" +msgstr "Aktualne hasło" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:314 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:411 +msgid "New Password" +msgstr "Nowe hasło" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:318 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:415 +msgid "New Password (again)" +msgstr "Nowe hasło (ponownie)" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:324 +msgid "Please type your current password." +msgstr "Proszę wpisać swoje aktualne hasło." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:373 +msgid "The e-mail address is not assigned to any user account" +msgstr "Ten adres e-mail nie jest używany przez żadne konto." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/forms.py:393 +msgid "Password Reset E-mail" +msgstr "E-mail resetujący hasło" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/utils.py:72 +#, python-format +msgid "Successfully signed in as %(user)s." +msgstr "Zalogowano jako %(user)s." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:133 +#, python-format +msgid "Removed e-mail address %(email)s" +msgstr "Usunięto adres e-mail %(email)s" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:147 +msgid "Primary e-mail address set" +msgstr "Ustawiono główny adres e-mail" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:168 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:241 +msgid "Password successfully changed." +msgstr "Hasło zostało zmienione." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:191 +msgid "Password successfully set." +msgstr "Hasło zostało ustawione." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/account/views.py:255 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/logout.html:10 +msgid "You have signed out." +msgstr "Wylogowano." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/openid/forms.py:6 +msgid "OpenID" +msgstr "OpenID" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/forms.py:32 +msgid "Your local account has no password setup." +msgstr "Twoje konto nie ma ustawionego hasła." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/forms.py:36 +msgid "Your local account has no verified e-mail address." +msgstr "Twoje konto nie ma potwierdzonego adresu e-mail." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/helpers.py:112 +msgid "The social account has been connected to your existing account" +msgstr "Konto społecznościowe zostało podłączone do Twojego konta." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:89 +#, python-format +msgid "Invalid response while obtaining request token from \"%s\"." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:111 +#, python-format +msgid "Invalid response while obtaining access token from \"%s\"." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:124 +#, python-format +msgid "No request token saved for \"%s\"." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:172 +#, python-format +msgid "No access token saved for \"%s\"." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/oauth.py:192 +#, python-format +msgid "No access to private resources at \"%s\"." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/socialaccount/views.py:68 +msgid "The social account has been disconnected" +msgstr "Konto społecznościowe zostało odłączone." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:6 +msgid "Account" +msgstr "Konto" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:9 +msgid "E-mail Addresses" +msgstr "Adresy e-mail" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:12 +msgid "The following e-mail addresses are associated to your account:" +msgstr "Z Twoim kontem są związane następujące adresy e-mail:" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:26 +msgid "Verified" +msgstr "Potwierdzony" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:28 +msgid "Unverified" +msgstr "Nie potwierdzony" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:30 +msgid "Primary" +msgstr "Główny" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:36 +msgid "Make Primary" +msgstr "Ustaw główny" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:37 +msgid "Re-send Verification" +msgstr "Ponownie prześlij link potwierdzający" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:38 +msgid "Remove" +msgstr "Usuń" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:45 +msgid "Warning:" +msgstr "Uwaga:" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:45 +msgid "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." +msgstr "Nie masz ustawionego żadnego adresu e-mail. Dodanie adresu e-mail umożliwi odzyskanie konta w przypadku utraty hasła." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:50 +msgid "Add E-mail Address" +msgstr "Dodaj adres e-mail" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:57 +msgid "Add E-mail" +msgstr "Dodaj e-mail" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/email.html:69 +msgid "Do you really want to remove the selected e-mail address?" +msgstr "Czy na pewno usunąć wybrany adres e-mail?" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:6 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:9 +msgid "Language" +msgstr "Język" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:11 +msgid "Pinax can be used in your preferred language." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/language_change.html:18 +msgid "Change my language" +msgstr "Zmień język" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:7 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:12 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:47 +msgid "Sign In" +msgstr "Zaloguj" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:20 +#, python-format +msgid "" +"Please sign in with one\n" +"of your existing third party accounts. Or, sign up for a %(site_name)s account and sign in\n" +"below:" +msgstr "" +"Zaloguj za pomocą konta zewnętrznego, albo zarejestruj się w serwisie %(site_name)s i zaloguj poniżej:" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:28 +msgid "or" +msgstr "lub" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/login.html:45 +msgid "Forgot Password?" +msgstr "Nie pamiętasz hasła?" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/logout.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/logout.html:8 +msgid "Signed Out" +msgstr "Wylogowano" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_change.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_change.html:8 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_change.html:15 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:8 +msgid "Change Password" +msgstr "Zmień hasło" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:8 +msgid "Delete Password" +msgstr "Usuń hasło" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:9 +msgid "You may delete your password since you are currently logged in using OpenID." +msgstr "Możesz usunąć hasło, ponieważ jesteś zalogowany/-a za pomocą OpenID." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete.html:12 +msgid "delete my password" +msgstr "usuń moje hasło" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete_done.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete_done.html:8 +msgid "Password Deleted" +msgstr "Hasło usunięte" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_delete_done.html:9 +msgid "Your password has been deleted." +msgstr "Twoje hasło zostało usunięte." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:7 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:11 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_done.html:6 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_done.html:9 +msgid "Password Reset" +msgstr "Odzyskiwanie hasła" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:16 +msgid "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." +msgstr "Nie pamiętasz swojego hasła? Wpisz adres e-mail, a wyślemy Ci e-mail umożliwiający zresetowanie go." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:23 +msgid "Reset My Password" +msgstr "Odzyskaj hasło" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset.html:28 +#, python-format +msgid "If you have any trouble resetting your password, contact us at %(CONTACT_EMAIL)s." +msgstr "Jeśli masz problem z odzyskaniem hasła, napisz do nas pod %(CONTACT_EMAIL)s." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_done.html:15 +#, python-format +msgid "We have sent you an e-mail. If you do not receive it within a few minutes, contact us at %(CONTACT_EMAIL)s." +msgstr "E-mail został wysłany. Jeśli nie otrzymasz go w ciągu kilku minut, napisz do nas pod %(CONTACT_EMAIL)s." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:8 +msgid "Bad Token" +msgstr "Błędny klucz" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:12 +#, python-format +msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." +msgstr "Link resetujący hasło jest nieprawidłowy, być może ponieważ został już wcześniej użyty. Spróbuj zresetować hasło ponownie." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:20 +msgid "change password" +msgstr "zmień hasło" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_from_key.html:25 +msgid "Your password is now changed." +msgstr "Hasło zostało zmienione." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_reset_key_message.txt:9 +#, python-format +msgid "" +"You're receiving this e-mail because you or someone else has requested a password for your user account at %(site_domain)s.\n" +"It can be safely ignored if you did not request a password reset. Click the link below to reset your password.\n" +"\n" +"%(password_reset_url)s\n" +"\n" +"In case you forgot, your username is %(username)s.\n" +"\n" +"Thanks for using our site!\n" +msgstr "" +"Otrzymujesz tego e-maila, ponieważ zostaliśmy poproszeni o zresetowanie hasła dla konta w serwisie %(site_domain)s.\n" +"Możesz go zignorować, jeśli prośba nie pochodzi od Ciebie. Wejdź pod poniższy link, aby zresetować swoje hasło.\n" +"\n" +"%(password_reset_url)s\n" +"\n" +"W razie czego, Twój login to: %(username)s.\n" +"\n" +"Miłego czytania!\n" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_set.html:6 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_set.html:9 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/password_set.html:16 +msgid "Set Password" +msgstr "Ustaw hasło" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:6 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:6 +msgid "Signup" +msgstr "Rejestracja" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:9 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:24 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:9 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:22 +msgid "Sign Up" +msgstr "Zarejestruj się" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:14 +msgid "Already have an account?" +msgstr "Masz już konto?" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/signup.html:14 +msgid "Sign in" +msgstr "Zaloguj się" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:6 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:9 +msgid "Timezone" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:11 +msgid "Pinax can localize all times into your preferred timezone. Change your timezone below." +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/timezone_change.html:18 +msgid "Change my timezone" +msgstr "" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/verification_sent.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/verification_sent.html:8 +msgid "Verify Your E-mail Address" +msgstr "Potwierdź swój adres e-mail" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/verification_sent.html:10 +#, python-format +msgid "We have sent you an e-mail to %(email)s for verification. Follow the link provided to finalize the signup process. If you do not receive it within a few minutes, contact us at %(CONTACT_EMAIL)s." +msgstr "Na adres %(email)s został wysłany e-mail w celu potwierdzenia konta. W treści e-maila znajduje się link, pod który trzeba przejść w celu dokończenia rejestracji. Jeśli nie dostaniesz go w ciągu kilku minut, napisz do nas pod %(CONTACT_EMAIL)s." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/snippets/already_logged_in.html:5 +msgid "Note" +msgstr "Zwróć uwagę" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/account/snippets/already_logged_in.html:5 +#, python-format +msgid "you are already logged in as %(user_display)s." +msgstr "jesteś już zalogowany/-a jako %(user_display)s." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:8 +msgid "E-mail Address Confirmation" +msgstr "Potwierdzenie adresu e-mail" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:11 +#, python-format +msgid "You have confirmed that %(email)s is an e-mail address for user '%(user)s'." +msgstr "Adres %(email)s został właśnie powierdzony jako e-mail dla użytkownika '%(user)s'." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/emailconfirmation/confirm_email.html:13 +msgid "Invalid confirmation key." +msgstr "Niepoprawny klucz potwierdzający." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/openid/login.html:10 +msgid "OpenID Sign In" +msgstr "Logowanie przy użyciu OpenID" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/account_inactive.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/account_inactive.html:8 +msgid "Account Inactive" +msgstr "Konto nieaktywne" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/account_inactive.html:10 +msgid "This account is inactive." +msgstr "To konto jest nieaktywne." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/authentication_error.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/authentication_error.html:8 +msgid "Social Network Login Failure" +msgstr "Błąd podczas logowania przy użyciu sieci społecznościowej." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/authentication_error.html:10 +msgid "An error occured while attempting to login via your social network account." +msgstr "Podczas próby zalogowania za pośrednictwej konta w sieci społecznościowej wystąpił błąd." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:8 +msgid "Account Connections" +msgstr "Powiązania konta" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:11 +msgid "You can sign in to your account using any of the following third party accounts:" +msgstr "Możesz zalogować się na swoje konto używając następujących kont zewnętrznych:" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/connections.html:46 +msgid "Add a 3rd Party Account" +msgstr "Dodaj konto zewnętrzne" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/login_cancelled.html:5 +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/login_cancelled.html:9 +msgid "Login Cancelled" +msgstr "Logowanie anulowane" + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/login_cancelled.html:13 +#, python-format +msgid "You decided to cancel logging in to our site using one of your exisiting accounts. If this was a mistake, please proceed to sign in." +msgstr "Logowanie do serwisu za pomocą istniejącego konta zostało anulowane. Jeśli był to błąd, przejdź do strony logowania." + +#: /home/rczajka/workspace/virtualenv/wolnelektury-2.6/lib/python2.6/site-packages/allauth/templates/socialaccount/signup.html:12 +#, python-format +msgid "" +"You are about to use your %(provider_name)s account to login to \n" +"%(site_name)s. As a final step, please complete the following form:" +msgstr "" +"Za chwilę użyjesz konta w serwisie %(provider_name)s aby zalogować się \n" +"do serwisu %(site_name)s. Zanim to nastąpi, wypełnij proszę ten krótki formularz:" + diff --git a/requirements.txt b/requirements.txt index ecb07cca2..bf8bb438a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,6 +12,7 @@ django-allauth python-memcached piwik +python-fb # Feedparser Feedparser>=4.1 diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index e4cb32bb8..3f842e7a9 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -108,6 +108,7 @@ MIDDLEWARE_CLASSES = [ 'maintenancemode.middleware.MaintenanceModeMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.cache.FetchFromCacheMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', ] ROOT_URLCONF = 'wolnelektury.urls' @@ -122,7 +123,7 @@ AUTHENTICATION_BACKENDS = [ 'allauth.account.auth_backends.AuthenticationBackend', ] EMAIL_CONFIRMATION_DAYS = 2 -LOGIN_URL = '/uzytkownicy/zaloguj/' +LOGIN_URL = '/uzytkownik/login/' LOGIN_REDIRECT_URL = '/' @@ -219,6 +220,7 @@ COMPRESS_CSS = { 'css/catalogue.css', 'css/sponsors.css', 'css/logo.css', + 'css/auth.css', 'css/social/shelf_tags.css', 'css/ui-lightness/jquery-ui-1.8.16.custom.css', @@ -341,6 +343,10 @@ BROKER_VHOST = "/" CELERY_EAGER_PROPAGATES_EXCEPTIONS = True +LOCALE_PATHS = [ + path.join(PROJECT_DIR, '../locale-contrib') +] + # Load localsettings, if they exist try: from localsettings import * diff --git a/wolnelektury/static/css/auth.css b/wolnelektury/static/css/auth.css new file mode 100644 index 000000000..756c8d8e0 --- /dev/null +++ b/wolnelektury/static/css/auth.css @@ -0,0 +1,67 @@ +#auth-page p { + font-size: 1.2em; +} +#auth-page h2 { + font-size: 2em; + margin-top: 1em; +} + +.uniForm { + font-size: 1.2em; +} +.uniForm fieldset { + border: none; + margin: .5em 0; +} +.uniForm .ctrlHolder { + margin: .5em 0; +} + +.inlineLabels label { + width: 8em; + display: inline-block; +} +.inlineLabels .buttonHolder, .inlineLabels .formHint { + margin-left: 8em; +} + + + +.email_list .verified { + display: inline-block; + margin-left: 2em; + font-style: italic; +} +.email_list .unverified { + display: inline-block; + margin-left: 2em; + color: #717171; + font-style: italic; +} +.email_list .primary { + display: inline-block; + margin-left: 2em; + font-weight: bold; +} +.socialaccount_provider { + display: inline-block; + background-repeat: no-repeat; + color: transparent; + height: 40px; + width: 40px; + vertical-align: middle; +} +.socialaccount_provider.google { + background-image: url(/static/img/auth/google.png); +} + + +.socialaccount_providers { + margin: 1em 0; + padding: 0; +} +.socialaccount_providers li { + display: inline; + list-style: none; + margin-right: 1em; +} \ No newline at end of file diff --git a/wolnelektury/static/css/base.css b/wolnelektury/static/css/base.css index 3160611e5..54675a51e 100755 --- a/wolnelektury/static/css/base.css +++ b/wolnelektury/static/css/base.css @@ -143,6 +143,7 @@ h2 { } .hidden-box { position: absolute; + left: 0; display: none; border: 1px solid #ddd; padding: 1em 1em .5em 1em; diff --git a/wolnelektury/static/css/dialogs.css b/wolnelektury/static/css/dialogs.css index 803c14d39..d83116ba6 100755 --- a/wolnelektury/static/css/dialogs.css +++ b/wolnelektury/static/css/dialogs.css @@ -115,14 +115,3 @@ #custom-pdf-window label { display: inline; } - - -.socialauth { - margin: 1em 0; - padding: 0; -} -.socialauth li { - display: inline; - list-style: none; - margin-right: 1em; -} diff --git a/wolnelektury/static/css/header.css b/wolnelektury/static/css/header.css index 39d4160c5..5a196769b 100755 --- a/wolnelektury/static/css/header.css +++ b/wolnelektury/static/css/header.css @@ -234,3 +234,15 @@ a.menu span { line-height: 1.636em; } + + + +#user-menu { + left: 0; + top: 2em; + width: 15em; + line-height:1.6em; +} +#user-menu a { + color: #0D7E85; +} diff --git a/wolnelektury/static/img/auth/facebook.png b/wolnelektury/static/img/auth/facebook.png new file mode 100644 index 000000000..f9b6e7149 Binary files /dev/null and b/wolnelektury/static/img/auth/facebook.png differ diff --git a/wolnelektury/static/img/auth/google-icon.png b/wolnelektury/static/img/auth/google-icon.png deleted file mode 100644 index d16d5313e..000000000 Binary files a/wolnelektury/static/img/auth/google-icon.png and /dev/null differ diff --git a/wolnelektury/static/img/auth/openid-large.png?1237615666 b/wolnelektury/static/img/auth/openid-large.png?1237615666 deleted file mode 100644 index 6094fffec..000000000 Binary files a/wolnelektury/static/img/auth/openid-large.png?1237615666 and /dev/null differ diff --git a/wolnelektury/static/img/auth/twitter.png b/wolnelektury/static/img/auth/twitter.png new file mode 100644 index 000000000..d2a55029d Binary files /dev/null and b/wolnelektury/static/img/auth/twitter.png differ diff --git a/wolnelektury/static/js/dialogs.js b/wolnelektury/static/js/dialogs.js index 086a47d3d..d44dab32e 100755 --- a/wolnelektury/static/js/dialogs.js +++ b/wolnelektury/static/js/dialogs.js @@ -58,7 +58,7 @@ $('body').append($window); $window.jqm({ - ajax: '/uzytkownicy/zaloguj-utworz/', + ajax: '/uzytkownik/zaloguj-utworz/?next=' + escape(window.location), ajaxText: '

* ' + gettext("Loading") + '

', target: $('.target', $window)[0], overlay: 60, diff --git a/wolnelektury/templates/500.html b/wolnelektury/templates/500.html index e0b2bbb27..d73fea3df 100644 --- a/wolnelektury/templates/500.html +++ b/wolnelektury/templates/500.html @@ -1,64 +1,24 @@ {% load i18n %} - - - -500 - {% trans "Server error" %} WolneLektury.pl - - - - - - - - - -

{% trans "Server error" %}

{% trans "

The Wolnelektury.pl site is currently unavailable. Meanwhile, visit our blog.

Inform our administrators about the error.

" %} - - - + + + \ No newline at end of file diff --git a/wolnelektury/templates/503.html b/wolnelektury/templates/503.html index 3b9ebe1bf..971ac3043 100644 --- a/wolnelektury/templates/503.html +++ b/wolnelektury/templates/503.html @@ -1,66 +1,24 @@ {% load i18n %} - - - -503 - {% trans "Service unavailable" %} WolneLektury.pl - - - - - - - - - -

{% trans "Service unavailable" %}

+ + + + + Wolne Lektury :: 503 - {% trans "Service unavailable" %} + + +
+
+ +
+
+ +
+
+

{% trans "Service unavailable" %}

{% trans "The Wolnelektury.pl site is currently unavailable due to maintainance." %}

- - - - - \ No newline at end of file +
+
+ + diff --git a/wolnelektury/templates/auth/login.html b/wolnelektury/templates/auth/login.html index 553e873a0..caa0aea2c 100644 --- a/wolnelektury/templates/auth/login.html +++ b/wolnelektury/templates/auth/login.html @@ -1,14 +1,20 @@ -{% extends "ajaxable/form.html" %} {% load i18n %} +

{{ title }}

-{% block extra %} +
+
    +
    + {{ form.as_ul }} +
  1. {% trans "Forgot Password?" %}
    2. +
    3. +
+
-

{% trans "or join accounts:" %}

+

{% trans "Sign in using:" %}

-
    +
      {% include "socialaccount/snippets/provider_list.html" %}
    -{% endblock %} - - +{% include "socialaccount/snippets/login_extra.html" %} diff --git a/wolnelektury/templates/auth/login_register.html b/wolnelektury/templates/auth/login_register.html index 394902a2b..f879d4674 100755 --- a/wolnelektury/templates/auth/login_register.html +++ b/wolnelektury/templates/auth/login_register.html @@ -1,14 +1,9 @@ -{% extends "ajaxable/form.html" %} +{% extends "auth/login.html" %} {% load i18n %} {% block extra %} -

    {% trans "or join accounts:" %}

    - -
      -{% include "socialaccount/snippets/provider_list.html" %} -
    - +{{ block.super }}

    {% trans "or register" %}:

    diff --git a/wolnelektury/templates/openid/login.html b/wolnelektury/templates/openid/login.html new file mode 100644 index 000000000..05037a369 --- /dev/null +++ b/wolnelektury/templates/openid/login.html @@ -0,0 +1,32 @@ +{% extends "site_base.html" %} + +{% load i18n %} +{% load uni_form_tags %} + +{% block head_title %}{% trans "OpenID Sign In" %}{% endblock %} + +{% block body %} + +

    {% trans 'OpenID Sign In' %}

    + + + + +{% endblock %} diff --git a/wolnelektury/templates/piston/authorize_token.html b/wolnelektury/templates/piston/authorize_token.html index e2444de87..4e4520734 100755 --- a/wolnelektury/templates/piston/authorize_token.html +++ b/wolnelektury/templates/piston/authorize_token.html @@ -1,15 +1,17 @@ -{% extends "simple_base.html" %} +{% extends "base.html" %} {% load i18n %} -{% block "title" %}{% trans "Authorize access to Wolne Lektury" %}{% endblock %} +{% block titleextra %}{% trans "Authorize access to Wolne Lektury" %}{% endblock %} -{% block "body" %} +{% block body %}

    {% trans "Authorize access to Wolne Lektury" %}

    +

    {% blocktrans %}Confirm to authorize access to Wolne Lektury as user {{ user}}.{% endblocktrans %}

    {{ form.as_p }}
    +
    {% endblock %} diff --git a/wolnelektury/templates/registration/login.html b/wolnelektury/templates/registration/login.html deleted file mode 100755 index 5fbe3af42..000000000 --- a/wolnelektury/templates/registration/login.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "simple_base.html" %} -{% load i18n %} - -{% block "title" %}{% trans "Login to Wolne Lektury" %}{% endblock %} - -{% block "body" %} -

    {% trans "Login to Wolne Lektury" %}

    - -
    - {% csrf_token %} - - {{ form.as_table }} - -
    - -
    -
    - -{% endblock %} diff --git a/wolnelektury/templates/simple_base.html b/wolnelektury/templates/simple_base.html deleted file mode 100755 index 17814adc0..000000000 --- a/wolnelektury/templates/simple_base.html +++ /dev/null @@ -1,24 +0,0 @@ - -{% load compressed %} - - - {% block "title" %}{% endblock %} - - - - - {% compressed_css "simple" %} - - - - - - -
    - -{% block "body" %}{% endblock %} - -
    - - - diff --git a/wolnelektury/templates/site_base.html b/wolnelektury/templates/site_base.html new file mode 100644 index 000000000..b0c2ca524 --- /dev/null +++ b/wolnelektury/templates/site_base.html @@ -0,0 +1,5 @@ +{% extends "base.html" %} +{# This is for allauth templates. #} + +{% block bodyid %}auth-page{% endblock %} +{% block titleextra %}{% block head_title %}{% endblock %}{% endblock %} diff --git a/wolnelektury/templates/socialaccount/connections.html b/wolnelektury/templates/socialaccount/connections.html new file mode 100644 index 000000000..0446fd921 --- /dev/null +++ b/wolnelektury/templates/socialaccount/connections.html @@ -0,0 +1,56 @@ +{% extends "site_base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Account Connections" %}{% endblock %} + +{% block body %} +

    {% trans "Account Connections" %}

    + +{% if form.accounts %} +

    {% blocktrans %}You can sign in to your account using any of the following third party accounts:{% endblocktrans %}

    + + +
    +{% csrf_token %} + +
    +{% if form.non_field_errors %} +
    {{form.non_field_errors}}
    +{% endif %} + +{% for base_account in form.accounts %} +{% with base_account.get_provider_account as account %} +
    + +
    +{% endwith %} +{% endfor %} + +
    + +
    + +
    + +
    + +{% else %} +

    {% trans "You currently have no social network accounts connected to this account." %}

    +{% endif %} + +

    {% trans 'Add a 3rd Party Account' %}

    + +
      +{% include "socialaccount/snippets/provider_list.html" %} +
    + +{% include "socialaccount/snippets/login_extra.html" %} + +{% endblock %} + + diff --git a/wolnelektury/templates/socialaccount/login_cancelled.html b/wolnelektury/templates/socialaccount/login_cancelled.html new file mode 100644 index 000000000..ef5db102c --- /dev/null +++ b/wolnelektury/templates/socialaccount/login_cancelled.html @@ -0,0 +1,17 @@ +{% extends "base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Login Cancelled" %}{% endblock %} + +{% block body %} + +

    {% trans "Login Cancelled" %}

    + +{% url socialaccount_login as login_url %} +{{ login_url }} + +

    {% blocktrans %}You decided to cancel logging in to our site using one of your exisiting accounts. If this was a mistake, please proceed to sign in.{% endblocktrans %}

    + +{% endblock %} + diff --git a/wolnelektury/templates/socialaccount/snippets/provider_list.html b/wolnelektury/templates/socialaccount/snippets/provider_list.html index 99e30a5c1..85bf0bcc0 100644 --- a/wolnelektury/templates/socialaccount/snippets/provider_list.html +++ b/wolnelektury/templates/socialaccount/snippets/provider_list.html @@ -1,21 +1,24 @@ {% load allauth_tags %} +{% load catalogue_tags %} {% if allauth.openid_enabled %}
  • Google
    • {% endif %} +{% if allauth.facebook_enabled %} +
    • +{% endif %} {% if allauth.twitter_enabled %}
    • {% endif %} -{% if allauth.facebook_enabled %} -
    • -{% endif %} {% if allauth.openid_enabled %} + - +
  • + OpenID
    • {% endif %} diff --git a/wolnelektury/templates/superbase.html b/wolnelektury/templates/superbase.html index 5813a2b7f..fade57b9e 100644 --- a/wolnelektury/templates/superbase.html +++ b/wolnelektury/templates/superbase.html @@ -60,7 +60,17 @@

    {% if user.is_authenticated %} - {% trans "Welcome" %}, {{ user.username }} + {% trans "Welcome" %}, + + + {{ user.username }} + + + {% trans "Password" %}
    + {% trans "E-mail" %}
    + {% trans "Social accounts" %}
    +     +     | {% trans "My shelf" %} {% if user.is_staff %} | {% trans "Administration" %} @@ -197,5 +207,8 @@ var pageTracker = _gat._getTracker("UA-2576694-1"); pageTracker._trackPageview(); --> + + {% block extrabody %} + {% endblock %} diff --git a/wolnelektury/templates/user.html b/wolnelektury/templates/user.html new file mode 100644 index 000000000..1d1503386 --- /dev/null +++ b/wolnelektury/templates/user.html @@ -0,0 +1,17 @@ +{% extends "base.html" %} +{% load i18n %} + + +{% block titleextra %}{% trans "User" %}{% endblock %} + +{% block body %} + +

    {% trans "User" %}

    + +
    +

    {% trans "Password" %}

    +

    {% trans "E-mail" %}

    +

    {% trans "Social accounts" %}

    +
    + +{% endblock %} diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py index 36959904c..3806b73ce 100644 --- a/wolnelektury/urls.py +++ b/wolnelektury/urls.py @@ -16,10 +16,11 @@ urlpatterns = patterns('wolnelektury.views', url(r'^zegar/$', 'clock', name='clock'), # Authentication - url(r'^uzytkownicy/zaloguj/$', views.LoginFormView(), name='login'), - url(r'^uzytkownicy/utworz/$', views.RegisterFormView(), name='register'), - url(r'^uzytkownicy/wyloguj/$', 'logout_then_redirect', name='logout'), - url(r'^uzytkownicy/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'), + url(r'^uzytkownik/$', 'user_settings', name='user_settings'), + url(r'^uzytkownik/login/$', views.LoginFormView(), name='login'), + url(r'^uzytkownik/signup/$', views.RegisterFormView(), name='register'), + url(r'^uzytkownik/logout/$', 'logout_then_redirect', name='logout'), + url(r'^uzytkownik/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'), ) urlpatterns += patterns('', @@ -32,7 +33,7 @@ urlpatterns += patterns('', url(r'^raporty/', include('reporting.urls')), url(r'^info/', include('infopages.urls')), url(r'^ludzie/', include('social.urls')), - url(r'^uzytkownicy/', include('allauth.urls')), + url(r'^uzytkownik/', include('allauth.urls')), # Admin panel url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'), diff --git a/wolnelektury/views.py b/wolnelektury/views.py index bcead0317..cb1d2af96 100755 --- a/wolnelektury/views.py +++ b/wolnelektury/views.py @@ -2,6 +2,7 @@ from datetime import datetime import feedparser from django.contrib import auth +from django.contrib.auth.decorators import login_required from django.contrib.auth.forms import UserCreationForm, AuthenticationForm from django.core.cache import cache from django.http import HttpResponse, HttpResponseRedirect @@ -108,3 +109,9 @@ def publish_plan(request): return render_to_response("publish_plan.html", {'plan': plan}, context_instance=RequestContext(request)) + + +@login_required +def user_settings(request): + return render_to_response("user.html", + context_instance=RequestContext(request))