From: Lukasz Date: Tue, 18 May 2010 08:30:32 +0000 (+0200) Subject: Merge branch 'master' of http://github.com/fnp/wolnelektury X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/735368cfb54c8954518179993dcd3bc55e3878e7?hp=--cc Merge branch 'master' of github.com/fnp/wolnelektury Conflicts: wolnelektury/settings.py wolnelektury/templates/catalogue/book_stub_detail.html wolnelektury/templates/catalogue/search_no_hits.html wolnelektury/templates/catalogue/tagged_object_list.html --- 735368cfb54c8954518179993dcd3bc55e3878e7 diff --cc apps/catalogue/views.py index 7cbba2748,b32a310b5..07fb7d349 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@@ -22,7 -23,8 +23,9 @@@ from django.contrib.auth.forms import U from django.utils import simplejson from django.utils.functional import Promise from django.utils.encoding import force_unicode + from django.utils.http import urlquote_plus from django.views.decorators import cache ++from django.utils.translation import ugettext as _ from catalogue import models from catalogue import forms diff --cc wolnelektury/static/js/catalogue.js index b356183fa,66bebcf2f..d57f74339 --- a/wolnelektury/static/js/catalogue.js +++ b/wolnelektury/static/js/catalogue.js @@@ -1,50 -1,3 +1,47 @@@ - alert(LANGUAGE_CODE); +var LOCALE_TEXTS = { + "pl": { + "DELETE_SHELF": "Czy na pewno usunąć półkę", + "HIDE_DESCRIPTION": "Zwiń opis", + "EXPAND DESCRIPTION": "Rozwiń opis", + "LOADING": "Ładowanie", + }, + "fr": { + "DELETE_SHELF": "Translate me!", + "HIDE_DESCRIPTION": "Translate me!", + "EXPAND DESCRIPTION": "Translate me!", + "LOADING": "Translate me!", + }, + "ru": { + "DELETE_SHELF": "Translate me!", + "HIDE_DESCRIPTION": "Translate me!", + "EXPAND DESCRIPTION": "Translate me!", + "LOADING": "Translate me!", + }, + "en": { + "DELETE_SHELF": "Translate me!", + "HIDE_DESCRIPTION": "Translate me!", + "EXPAND DESCRIPTION": "Translate me!", + "LOADING": "Translate me!", + }, + "ru": { + "DELETE_SHELF": "Translate me!", + "HIDE_DESCRIPTION": "Translate me!", + "EXPAND DESCRIPTION": "Translate me!", + "LOADING": "Translate me!", + }, + "es": { + "DELETE_SHELF": "Translate me!", + "HIDE_DESCRIPTION": "Translate me!", + "EXPAND DESCRIPTION": "Translate me!", + "LOADING": "Translate me!", + }, + "lt":{ + "DELETE_SHELF": "Translate me!", + "HIDE_DESCRIPTION": "Translate me!", + "EXPAND DESCRIPTION": "Translate me!", + "LOADING": "Translate me!", + } +} - - alert(LOCALE_TEXTS[LANGUAGE_CODE]['DELETE_SHELF']); var BANNER_TEXTS = [ 'Przekaż 1% żeby ukryć ten baner.', 'Jak dobrze wydać 1% swojego podatku? Poradnik dla opornych.', diff --cc wolnelektury/templates/404.html index 288e050ed,b761b4866..ebf7d155b --- a/wolnelektury/templates/404.html +++ b/wolnelektury/templates/404.html @@@ -11,10 -11,10 +11,10 @@@ - +

{% trans "Site does not exist" %}

-{% trans "We are sorry, but this site does not exist. Please check if you entered correct address or go to "%} {% trans "homepage" %}. +{% trans "We are sorry, but this site does not exist. Please check if you entered correct address or go to "%} {% trans "main page" %}.

{% compressed_js "jquery" %} {% compressed_js "all" %} {% block extrahead %} @@@ -46,20 -45,10 +46,20 @@@ {% endif %}
- - - + + +
+
+
+ {% trans "Choose your interface language: " %} + +
+
diff --cc wolnelektury/templates/catalogue/book_stub_detail.html index 9ed3a8b10,387e123e9..c03db372a --- a/wolnelektury/templates/catalogue/book_stub_detail.html +++ b/wolnelektury/templates/catalogue/book_stub_detail.html @@@ -27,9 -29,9 +27,9 @@@
-
Zamknij
+
{% trans "Close" %}
-

* {% trans "Loading" %}

-

* Ładowanie

++

* {% trans "Loading" %}

{% endblock %} diff --cc wolnelektury/templates/catalogue/search_no_hits.html index b2a71c8c0,940a1b035..f91b9c854 --- a/wolnelektury/templates/catalogue/search_no_hits.html +++ b/wolnelektury/templates/catalogue/search_no_hits.html @@@ -11,14 -10,18 +11,17 @@@ {% breadcrumbs tags %}
-

Przepraszamy! Brak wyników spełniających kryteria podane w zapytaniu.

- -

Wyszukiwarka obsługuje takie kryteria jak tytuł, autor, motyw/temat, epoka, rodzaj i gatunek utworu. - Obecnie nie obsługujemy wyszukiwania fraz w tekstach utworów.

- +

{% trans "Search of " %}{{ query }} {% trans "did not match any resources." %}

++ ++

{% transblock %}Search engine supports following criteria: title, author, theme/topic, epoch, kind and genre. ++ As for now we do not support full text search.{% endtransblock %}

{% include "info/join_us.html" %}
-
Zamknij
+
{% trans "Close" %}
-

* {% trans "Loading" %}

-

* Ładowanie

++

* {% trans "Loading" %}

{% endblock %} diff --cc wolnelektury/templates/catalogue/tagged_object_list.html index 230d8ed34,91824ed32..3f9c5ba67 --- a/wolnelektury/templates/catalogue/tagged_object_list.html +++ b/wolnelektury/templates/catalogue/tagged_object_list.html @@@ -32,13 -32,13 +32,13 @@@ @@@ -77,14 -69,22 +77,17 @@@ {% else %} {% if only_author %} {% if last_tag.alive %} -

Dzieła tego autora objęte są prawem autorskim.

-

Dowiedz się, dlaczego biblioteki internetowe - nie mogą udostępniać dzieł tego autora.

- {% else %}{% comment %} Nie żyje {% endcomment %} + {% trans "This author's works are copyrighted." %} + {% else %}{% comment %} Is dead {% endcomment %} {% if last_tag.in_pd %} - {% trans "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." %} - {% else %}{% comment %} Is dead, but not yet in public domain {% endcomment %} -

Dzieła tego autora znajdują się w domenie publicznej - i niedługo zostaną opublikowane w szkolnej bibliotece - internetowej Wolne Lektury.

- {% else %}{% comment %} Nie żyje, ale jeszcze nie w PD {% endcomment %} ++

{% trans "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." %}

++ {% else %} ++ {% comment %} Is dead, but not yet in public domain {% endcomment %}
-

Dzieła tego autora przejdą do zasobów domeny - publicznej i będą mogły być publikowane bez - żadnych ograniczeń za:

+

{% trans "This author's works will become part of public domain and will be allowed to be published without restrictions in:" %}

{% include "catalogue/pd_counter.html" %} +

Dowiedz się, dlaczego biblioteki internetowe + nie mogą udostępniać dzieł tego autora.

{% endif %} {% endif %} @@@ -128,9 -128,9 +131,9 @@@ {% endif %} {% endif %}
-
Zamknij
+
{% trans "Close" %}
-

* {% trans "Loading" %}

-

* Ładowanie

++

* {% trans "Loading" %}

{% endblock %}