From: Lukasz Date: Tue, 11 May 2010 07:33:43 +0000 (+0200) Subject: Merge branch 'master' of http://github.com/fnp/wolnelektury X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/3ac9cb26acd9b7c5ba421dac123ba8f75b782bd2?hp=e432f8579852df4ffc3010bc54bbabe452591956 Merge branch 'master' of github.com/fnp/wolnelektury --- diff --git a/wolnelektury/locale/pl/LC_MESSAGES/django.mo b/wolnelektury/locale/pl/LC_MESSAGES/django.mo deleted file mode 100644 index d0ea820cd..000000000 Binary files a/wolnelektury/locale/pl/LC_MESSAGES/django.mo and /dev/null differ diff --git a/wolnelektury/locale/pl/LC_MESSAGES/django.po b/wolnelektury/locale/pl/LC_MESSAGES/django.po index 493474566..018768517 100644 --- a/wolnelektury/locale/pl/LC_MESSAGES/django.po +++ b/wolnelektury/locale/pl/LC_MESSAGES/django.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-04 06:17-0500\n" +"POT-Creation-Date: 2010-05-04 14:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,140 +16,45 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: catalogue/models.py:15 -msgid "author" -msgstr "autor" - -#: catalogue/models.py:16 -msgid "epoch" -msgstr "epoka" - -#: catalogue/models.py:17 -msgid "kind" -msgstr "rodzaj" - -#: catalogue/models.py:18 -msgid "genre" -msgstr "gatunek" - -#: catalogue/models.py:19 -msgid "theme" -msgstr "motyw" - -#: catalogue/models.py:20 -msgid "set" -msgstr "zestaw" - -#: catalogue/models.py:34 -msgid "name" -msgstr "nazwa" - -#: catalogue/models.py:35 catalogue/models.py:71 -msgid "slug" -msgstr "slug" - -#: catalogue/models.py:36 -msgid "sort key" -msgstr "klucz sortowania" - -#: catalogue/models.py:37 -msgid "category" -msgstr "kategoria" - -#: catalogue/models.py:45 catalogue/models.py:72 catalogue/models.py:86 -#: chunks/models.py:11 -msgid "description" -msgstr "opis" - -#: catalogue/models.py:54 newtagging/models.py:470 -msgid "tag" -msgstr "tag" - -#: catalogue/models.py:55 newtagging/admin.py:38 -msgid "tags" -msgstr "tagi" - -#: catalogue/models.py:70 -msgid "title" -msgstr "tytuł" - -#: catalogue/models.py:73 -msgid "creation date" -msgstr "data utworzenia" - -#: catalogue/models.py:76 -msgid "XML file" -msgstr "plik XML" - -#: catalogue/models.py:77 -msgid "PDF file" -msgstr "plik PDF" - -#: catalogue/models.py:78 -msgid "ODT file" -msgstr "plik ODT" - -#: catalogue/models.py:79 -msgid "HTML file" -msgstr "plik HTML" - -#: catalogue/models.py:162 -msgid "book" -msgstr "książka" - -#: catalogue/models.py:163 -msgid "books" -msgstr "książki" - -#: catalogue/models.py:180 -msgid "fragment" -msgstr "fragment" - -#: catalogue/models.py:181 -msgid "fragments" -msgstr "fragmenty" - -#: chunks/models.py:10 -msgid "key" -msgstr "klucz" - -#: chunks/models.py:10 -msgid "A unique name for this chunk of content" -msgstr "Unikalna nazwa dla tego kawałka treści" +#: templates/base.html:19 +msgid "" +"Internet Explorer cannot display this site properly. Click here to read " +"more..." +msgstr "" -#: chunks/models.py:12 -msgid "content" -msgstr "zawartość" +#: templates/base.html:27 +msgid "See more" +msgstr "" -#: chunks/models.py:16 -msgid "chunk" -msgstr "kawałek" +#: templates/base.html:36 +msgid "Welcome" +msgstr "" -#: chunks/models.py:17 -msgid "chunks" -msgstr "kawałki" +#: templates/base.html:37 +msgid "Your shelf" +msgstr "" -#: newtagging/models.py:471 -msgid "content type" -msgstr "typ zawartości" +#: templates/base.html:39 +msgid "Administration" +msgstr "" -#: newtagging/models.py:472 -msgid "object id" -msgstr "id obiektu" +#: templates/base.html:41 +msgid "Logout" +msgstr "" -#: newtagging/views.py:29 -msgid "tagged_object_list must be called with a queryset or a model." +#: templates/base.html:44 templates/base.html.py:76 templates/base.html:80 +#: templates/base.html.py:84 +msgid "Sign in" msgstr "" -#: newtagging/views.py:31 -msgid "tagged_object_list must be called with a tag model." +#: templates/base.html:73 templates/base.html.py:94 +msgid "Close" msgstr "" -#: newtagging/views.py:33 -msgid "tagged_object_list must be called with a tag." +#: templates/base.html:76 templates/base.html.py:84 templates/base.html:88 +msgid "Register" msgstr "" -#: newtagging/views.py:37 -#, python-format -msgid "No tags found matching \"%s\"." -msgstr "Nie znaleziono tagów zgodnych z \"%s\"." +#: templates/base.html:96 +msgid "Loading" +msgstr "" diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py index eb6b88e35..62a2c9e23 100644 --- a/wolnelektury/settings.py +++ b/wolnelektury/settings.py @@ -3,7 +3,7 @@ from os import path PROJECT_DIR = path.abspath(path.dirname(__file__)) -DEBUG = False +DEBUG = True TEMPLATE_DEBUG = DEBUG ADMINS = [ @@ -75,6 +75,7 @@ MIDDLEWARE_CLASSES = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.middleware.doc.XViewMiddleware', 'pagination.middleware.PaginationMiddleware', + 'django.middleware.locale.LocaleMiddleware', ] ROOT_URLCONF = 'wolnelektury.urls' diff --git a/wolnelektury/templates/1percent.html b/wolnelektury/templates/1percent.html index 7ecb7a235..2e4c5576b 100644 --- a/wolnelektury/templates/1percent.html +++ b/wolnelektury/templates/1percent.html @@ -1,3 +1,4 @@ +{% load i18n %} {% extends 'base.html' %} {% block title %}1% podatku na WolneLektury.pl{% endblock title %} diff --git a/wolnelektury/templates/404.html b/wolnelektury/templates/404.html index e51ec8216..b4968a248 100644 --- a/wolnelektury/templates/404.html +++ b/wolnelektury/templates/404.html @@ -1,8 +1,9 @@ +{% load i18n %} -404 - Zagubiona strona w WolneLektury.pl +404 - {% trans "Site does not exist" %} - WolneLektury.pl @@ -11,9 +12,9 @@ -

Podana strona nie istnieje

+

{% trans "Site does not exist" %}

-Przepraszamy, ale ta strona nie istnieje. Sprawdź czy podałeś dobry adres, lub przejdź do strony głównej. +{% trans "We are sorry, but this site does not exist. Please check if you entered correct address or go to "%} {% trans "homepage" %}.

{% endblock extrahead %} {% block body %} -

Materiały pomocnicze dla nauczycieli

+

{% trans "Hand-outs for teachers" %}

-

{{ form.q }} lub wróć do strony głównej

+

{{ form.q }} {% trans "or" %} {% trans "return to homepage" %}

diff --git a/wolnelektury/templates/pagination/pagination.html b/wolnelektury/templates/pagination/pagination.html index 36c297bc1..7489d4a55 100644 --- a/wolnelektury/templates/pagination/pagination.html +++ b/wolnelektury/templates/pagination/pagination.html @@ -1,9 +1,10 @@ +{% load i18n %} {% if is_paginated %} {% endif %}