shelf info + opds fix

diff --git a/apps/opds/views.py b/apps/opds/views.py
index 2a1b2f8..1367125 100644 (file)
--- a/apps/opds/views.py
+++ b/apps/opds/views.py
@@ -390,7 +390,8 @@ class SearchFeed(AcquisitionFeed):
 
             if author:
                 log.info( "narrow to author %s" % author)
 
             if author:
                 log.info( "narrow to author %s" % author)

-                hint.tags(srch.search_tags(srch.get_tokens(author, field='authors'), filt=srch.term_filter(Term('tag_category', 'author'))))
+                hint.tags(srch.search_tags(srch.get_phrase(srch.get_tokens(author, field='authors'), field='authors'),
+                                           filt=srch.term_filter(Term('tag_category', 'author'))))

 
             if translator:
                 log.info( "filter by translator %s" % translator)
 
             if translator:
                 log.info( "filter by translator %s" % translator)

diff --git a/apps/social/locale/pl/LC_MESSAGES/django.mo b/apps/social/locale/pl/LC_MESSAGES/django.mo
index 8af8c2a..6a90921 100644 (file)
Binary files a/apps/social/locale/pl/LC_MESSAGES/django.mo and b/apps/social/locale/pl/LC_MESSAGES/django.mo differ

diff --git a/apps/social/locale/pl/LC_MESSAGES/django.po b/apps/social/locale/pl/LC_MESSAGES/django.po
index 547fe7d..a99d51c 100644 (file)
--- a/apps/social/locale/pl/LC_MESSAGES/django.po
+++ b/apps/social/locale/pl/LC_MESSAGES/django.po
@@ -7,22 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-03-12 13:49+0100\n"
-"PO-Revision-Date: 2012-01-27 16:43+0100\n"
-"Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
+"POT-Creation-Date: 2012-07-16 15:11+0200\n"
+"PO-Revision-Date: 2012-07-16 15:13+0100\n"
+"Last-Translator: Marcin Koziej <marcin@lolownia.org>\n"

 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"

 
 

-#: forms.py:22
+#: forms.py:23

 msgid "Tags (comma-separated)"
 msgstr "Tagi (rozdzielone przecinkami)"
 
 msgid "Tags (comma-separated)"
 msgstr "Tagi (rozdzielone przecinkami)"
 

-#: forms.py:46
+#: forms.py:47

 msgid "Name of the new shelf"
 msgstr ""
 
 msgid "Name of the new shelf"
 msgstr ""
 


@@ -50,10 +49,16 @@ msgstr ""
 msgid "recommends"
 msgstr "poleca"
 
 msgid "recommends"
 msgstr "poleca"
 

-#: templates/social/my_shelf.html:5 templates/social/my_shelf.html.py:11
+#: templates/social/my_shelf.html:5
+#: templates/social/my_shelf.html.py:11

 msgid "My shelf"
 msgstr "Moja półka"
 
 msgid "My shelf"
 msgstr "Moja półka"
 

-#: templates/social/sets_form.html:6
+#: templates/social/my_shelf.html:16
+msgid "Add works to your shelf by clicking on the star on the page of the work. The work will then show up on My shelf page."
+msgstr "Aby dodać pozycję do swojej półki, należy zaznaczyć gwiazdkę znajdującą się na stronie utworu. Po jej zaznaczeniu publikacja pojawi się w zakładce Moja półka."
+
+#: templates/social/sets_form.html:7

 msgid "Remove from my shelf"
 msgstr "Usuń z mojej półki"
 msgid "Remove from my shelf"
 msgstr "Usuń z mojej półki"

+

diff --git a/apps/social/templates/social/my_shelf.html b/apps/social/templates/social/my_shelf.html
index c465ab9..f448ad2 100755 (executable)
--- a/apps/social/templates/social/my_shelf.html
+++ b/apps/social/templates/social/my_shelf.html
@@ -12,4 +12,8 @@
 
     {% work_list books %}
 
 
     {% work_list books %}
 

+    {% if not books %}
+    {% trans "Add works to your shelf by clicking on the star on the page of the work. The work will then show up on My shelf page." %}
+    {# trans "Aby dodać pozycję do swojej półki, należy zaznaczyć gwiazdkę znajdującą się na stronie utworu. Po jej zaznaczeniu publikacja pojawi się w zakładce Moja półka" #}
+    {% endif %}

 {% endblock %}
 {% endblock %}

diff --git a/wolnelektury/locale-contrib/de/LC_MESSAGES/django.mo b/wolnelektury/locale-contrib/de/LC_MESSAGES/django.mo
deleted file mode 100644 (file)
index 99a1300..0000000
Binary files a/wolnelektury/locale-contrib/de/LC_MESSAGES/django.mo and /dev/null differ

diff --git a/wolnelektury/locale-contrib/en/LC_MESSAGES/django.mo b/wolnelektury/locale-contrib/en/LC_MESSAGES/django.mo
deleted file mode 100644 (file)
index 9fc2bf3..0000000
Binary files a/wolnelektury/locale-contrib/en/LC_MESSAGES/django.mo and /dev/null differ

diff --git a/wolnelektury/locale-contrib/lt/LC_MESSAGES/django.mo b/wolnelektury/locale-contrib/lt/LC_MESSAGES/django.mo
deleted file mode 100644 (file)
index 12c0887..0000000
Binary files a/wolnelektury/locale-contrib/lt/LC_MESSAGES/django.mo and /dev/null differ

diff --git a/wolnelektury/locale-contrib/pl/LC_MESSAGES/django.mo b/wolnelektury/locale-contrib/pl/LC_MESSAGES/django.mo
deleted file mode 100644 (file)
index 5975a7b..0000000
Binary files a/wolnelektury/locale-contrib/pl/LC_MESSAGES/django.mo and /dev/null differ