Further i18n implementation.

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index b760ecc..59011fd 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -138,7 +138,7 @@ class Book(models.Model):
 
             formats = []
             if self.html_file:
 
             formats = []
             if self.html_file:

-                formats.append(u'<a href="%s">Czytaj online</a>' % reverse('book_text', kwargs={'slug': self.slug}))
+                formats.append(u'<a href="%s">%s</a>' % (reverse('book_text', kwargs={'slug': self.slug}), _('Read online')))

             if self.pdf_file:
                 formats.append(u'<a href="%s">PDF</a>' % self.pdf_file.url)
             if self.odt_file:
             if self.pdf_file:
                 formats.append(u'<a href="%s">PDF</a>' % self.pdf_file.url)
             if self.odt_file:


@@ -218,7 +218,7 @@ class Book(models.Model):
             book_shelves = []
         else:
             if not overwrite:
             book_shelves = []
         else:
             if not overwrite:

-                raise Book.AlreadyExists('Book %s already exists' % book_slug)
+                raise Book.AlreadyExists(_('Book %s already exists') % book_slug)

             # Save shelves for this book
             book_shelves = list(book.tags.filter(category='set'))
         
             # Save shelves for this book
             book_shelves = list(book.tags.filter(category='set'))
         


@@ -261,7 +261,7 @@ class Book(models.Model):
                     child_book.parent_number = n
                     child_book.save()
                 except Book.DoesNotExist, e:
                     child_book.parent_number = n
                     child_book.save()
                 except Book.DoesNotExist, e:

-                    raise Book.DoesNotExist(u'Book with slug = "%s" does not exist.' % slug)
+                    raise Book.DoesNotExist(_('Book with slug = "%s" does not exist.') % slug)

         
         book_descendants = list(book.children.all())
         while len(book_descendants) > 0:
         
         book_descendants = list(book.children.all())
         while len(book_descendants) > 0:


@@ -383,5 +383,4 @@ class BookStub(models.Model):
     class Meta:
         ordering = ('title',)
         verbose_name = _('book stub')
     class Meta:
         ordering = ('title',)
         verbose_name = _('book stub')

-        verbose_name_plural = _('book stubs')
-
+        verbose_name_plural = _('book stubs')
\ No newline at end of file

diff --git a/wolnelektury/static/js/jquery.countdown-pl.js b/wolnelektury/static/js/jquery.countdown-pl.js
index 4d6d1d4..10f84d4 100644 (file)
--- a/wolnelektury/static/js/jquery.countdown-pl.js
+++ b/wolnelektury/static/js/jquery.countdown-pl.js
@@ -19,4 +19,4 @@
                }\r
        };\r
        $.countdown.setDefaults($.countdown.regional['pl']);\r
                }\r
        };\r
        $.countdown.setDefaults($.countdown.regional['pl']);\r

-})(jQuery);\r
+})(jQuery);
\ No newline at end of file

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

-w
+

 /* Display a countdown timer.
    Attach it with options like:
    $('div selector').countdown(
 /* Display a countdown timer.
    Attach it with options like:
    $('div selector').countdown(

diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html
index 03b46bc..6b36c95 100644 (file)
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@ -2,14 +2,14 @@
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 
 {% load i18n %}
 {% load catalogue_tags pagination_tags %}
 

-{% block title %}{{ book.title }} w WolneLektury.pl{% endblock %}
+{% block title %}{{ book.title }} {% trans "on WolneLektury.pl" %}{% endblock %}

 
 {% block bodyid %}book-detail{% endblock %}
 
 {% block body %}
     <h1>{{ book.title }}, {{ categories.author|join:", " }}</h1>
     <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
 
 {% block bodyid %}book-detail{% endblock %}
 
 {% block body %}
     <h1>{{ book.title }}, {{ categories.author|join:", " }}</h1>
     <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">

-        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to homepage" %}</a></p>
+        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to main page" %}</a></p>

     </form>
     
     <div id="books-list">
     </form>
     
     <div id="books-list">

diff --git a/wolnelektury/templates/catalogue/book_stub_detail.html b/wolnelektury/templates/catalogue/book_stub_detail.html
index 5037ecb..9ed3a8b 100644 (file)
--- a/wolnelektury/templates/catalogue/book_stub_detail.html
+++ b/wolnelektury/templates/catalogue/book_stub_detail.html
@@ -1,37 +1,35 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

+{% load i18n %}

 {% load catalogue_tags pagination_tags %}
 
 {% load catalogue_tags pagination_tags %}
 

-{% block title %}Lektura {{ book.title }} w WolneLektury.pl{% endblock %}
+{% block title %}{{ book.title }} w WolneLektury.pl{% endblock %}

 
 {% block bodyid %}book-stub-detail{% endblock %}
 
 {% block body %}
     <h1>{{ book.title }}, {{ book.author }}</h1>
     <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">
 
 {% block bodyid %}book-stub-detail{% endblock %}
 
 {% block body %}
     <h1>{{ book.title }}, {{ book.author }}</h1>
     <form action="{% url search %}" method="get" accept-charset="utf-8" id="search-form">

-        <p>{{ form.q }} <input type="submit" value="Szukaj" /> <strong>lub</strong> <a href="{% url main_page %}">wróć do strony głównej</a></p>
+        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url main_page %}">{% trans "return to main page" %}</a></p>

     </form>
     
     <div id="books-list">
     {% if book.in_pd %}
     </form>
     
     <div id="books-list">
     {% if book.in_pd %}

-       To dzieło znajduje się w domenie publicznej i niedługo zostanie
-       opublikowane w szkolnej bibliotece internetowej Wolne Lektury. 
+               {% trans "This author's works are in public domain and will be published on Internet school library of Wolne Lektury soon." %} 

        {% else %}
            {% if book.pd %}
        {% else %}
            {% if book.pd %}

-                   To dzieło przejdzie
-                       do zasobów domeny publicznej i będzie mogło 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" %}
                {% else %}
                    {% include "catalogue/pd_counter.html" %}
                {% else %}

-                   To dzieło objęte jest prawem autorskim. 
+                   {% trans "This author's works are copyrighted." %}

                {% endif %}
        {% endif %}
     {% include "info/join_us.html" %}
     </div>
 
     <div id="set-window">
                {% endif %}
        {% endif %}
     {% include "info/join_us.html" %}
     </div>
 
     <div id="set-window">

-        <div class="header"><a href="#" class="jqmClose">Zamknij</a></div>
+        <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>

         <div class="target">
         <div class="target">

-            <p><img src="/static/img/indicator.gif" alt="*"/> Ładowanie</p>
+            <p><img src="/static/img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>

         </div>
     </div>
 {% endblock %}
\ No newline at end of file
         </div>
     </div>
 {% endblock %}
\ No newline at end of file

diff --git a/wolnelektury/templates/catalogue/book_text.html b/wolnelektury/templates/catalogue/book_text.html
index 55eef8e..39934f8 100644 (file)
--- a/wolnelektury/templates/catalogue/book_text.html
+++ b/wolnelektury/templates/catalogue/book_text.html
@@ -14,7 +14,7 @@
     <body>
         <div id="menu">
             <ul>
     <body>
         <div id="menu">
             <ul>

-                <li><a href="#toc">{% trans "Table of content" %}</a></li>
+                <li><a href="#toc">{% trans "Table of contents" %}</a></li>

                 <li><a href="#themes">{% trans "Themes" %}</a></li>
             </ul>
         </div>
                 <li><a href="#themes">{% trans "Themes" %}</a></li>
             </ul>
         </div>

diff --git a/wolnelektury/templates/catalogue/search_no_hits.html b/wolnelektury/templates/catalogue/search_no_hits.html
index 8e4e788..b2a71c8 100644 (file)
--- a/wolnelektury/templates/catalogue/search_no_hits.html
+++ b/wolnelektury/templates/catalogue/search_no_hits.html
@@ -1,7 +1,8 @@
 {% extends "base.html" %}
 {% extends "base.html" %}

+{% load i18n %}

 {% load catalogue_tags pagination_tags %}
 
 {% load catalogue_tags pagination_tags %}
 

-{% block title %}Wyszukiwanie w WolneLektury.pl{% endblock %}
+{% block title %}{% trans "Search in WolneLektury.pl" %}{% endblock %}

 
 {% block bodyid %}tagged-object-list{% endblock %}
 
 
 {% block bodyid %}tagged-object-list{% endblock %}
 


@@ -10,14 +11,14 @@
     {% breadcrumbs tags %}
     
     <div id="books-list">
     {% breadcrumbs tags %}
     
     <div id="books-list">

-        <p>Wyszukiwanie <i>{{ query }}</i> nie dało rezultatu.</p>
+        <p>{% trans "Search of " %}<i>{{ query }}</i> {% trans "did not match any resources." %}</p>

         {% include "info/join_us.html" %}
     </div>
 
     <div id="set-window">
         {% include "info/join_us.html" %}
     </div>
 
     <div id="set-window">

-        <div class="header"><a href="#" class="jqmClose">Zamknij</a></div>
+        <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>

         <div class="target">
         <div class="target">

-            <p><img src="/static/img/indicator.gif" alt="*"/> Ładowanie</p>
+            <p><img src="/static/img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>

         </div>
     </div>
 {% endblock %}
\ No newline at end of file
         </div>
     </div>
 {% endblock %}
\ No newline at end of file

diff --git a/wolnelektury/templates/catalogue/tagged_object_list.html b/wolnelektury/templates/catalogue/tagged_object_list.html
index b8d091a..230d8ed 100644 (file)
--- a/wolnelektury/templates/catalogue/tagged_object_list.html
+++ b/wolnelektury/templates/catalogue/tagged_object_list.html
@@ -13,7 +13,7 @@
     {% if shelf_is_set and not object_list %}
     <div id="books-list">
         <h2>{% trans "Your shelf is empty" %}</h2>
     {% if shelf_is_set and not object_list %}
     <div id="books-list">
         <h2>{% trans "Your shelf is empty" %}</h2>

-        <p>{% trans "You can put a book on a shelf by entering page of the reading and clicking \"Put on the shelf\". %}</p>
+        <p>{% trans "You can put a book on a shelf by entering page of the reading and clicking 'Put on the shelf'." %}</p>

     </div>
     {% else %}
     {% autopaginate object_list 10 %}
     </div>
     {% else %}
     {% autopaginate object_list 10 %}


@@ -113,7 +113,7 @@
                 {% tag_list categories.genre tags %}
             {% endif %}
             {% if categories.epoch %}
                 {% tag_list categories.genre tags %}
             {% endif %}
             {% if categories.epoch %}

-                <h2>{% trans "Epochs" %}Epoki</h2>
+                <h2>{% trans "Epochs" %}</h2>

                 {% tag_list categories.epoch tags %}
             {% endif %}        
         </div>
                 {% tag_list categories.epoch tags %}
             {% endif %}        
         </div>

diff --git a/wolnelektury/templates/lessons/document_detail.html b/wolnelektury/templates/lessons/document_detail.html
index 7c6406c..afc3d69 100644 (file)
--- a/wolnelektury/templates/lessons/document_detail.html
+++ b/wolnelektury/templates/lessons/document_detail.html
@@ -6,7 +6,7 @@
 {% block body %}
     <h1>{{ object.title }}</h1>
     <form action="{% url search %}" method="GET" accept-charset="utf-8" id="search-form">
 {% block body %}
     <h1>{{ object.title }}</h1>
     <form action="{% url search %}" method="GET" accept-charset="utf-8" id="search-form">

-        <p>{{ form.q }} <input type="submit" value="{% trans "Szukaj" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url lessons_document_list %}">{% trans "return to list of materials" %}</a></p>
+        <p>{{ form.q }} <input type="submit" value="{% trans "Search" %}" /> <strong>{% trans "or" %}</strong> <a href="{% url lessons_document_list %}">{% trans "return to list of materials" %}</a></p>

     </form>
     
     <div id="document-detail">
     </form>
     
     <div id="document-detail">