Commit de4ad069 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Fix errors with Bookshelf in Unauthorized mode

parent f4c2fec9

opds_catalog/feeds.py

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ class SearchBooksFeed(AuthFeed): 
            if settings.AUTH:

                books = Book.objects.filter(bookshelf__user=request.user).order_by('-bookshelf__readtime')

            else:

                books={}  

                books=Book.objects.filter(id=0)  

        # Поиск дубликатов для книги            

        elif searchtype == 'd':

            book_id = int(searchterms)

opds_catalog/locale/ru/LC_MESSAGES/django.po

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ msgid "" 
msgstr ""

"Project-Id-Version: PACKAGE VERSION\n"

"Report-Msgid-Bugs-To: \n"

"POT-Creation-Date: 2016-11-21 18:03+0300\n"

"POT-Creation-Date: 2016-12-20 18:56+0300\n"

"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -258,7 +258,7 @@ msgstr "секция" 
msgid "subsection"

msgstr "подсекция"



#: .\opds_catalog\opdsdb.py:35

#: .\opds_catalog\opdsdb.py:36

msgid "Unknown genre"

msgstr "Неизвестний жанр"

sopds_web_backend/locale/ru/LC_MESSAGES/django.po

+45 −38
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ msgid "" 
msgstr ""

"Project-Id-Version: PACKAGE VERSION\n"

"Report-Msgid-Bugs-To: \n"

"POT-Creation-Date: 2016-11-21 18:03+0300\n"

"POT-Creation-Date: 2016-12-20 18:56+0300\n"

"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,7 +69,7 @@ msgstr "Авторы:" 
#: .\sopds_web_backend\templates\sopds_books.html:60

#: .\sopds_web_backend\templates\sopds_menu.html:9

#: .\sopds_web_backend\templates\sopds_menu.html:31

#: .\sopds_web_backend\views.py:474 .\sopds_web_backend\views.py:478

#: .\sopds_web_backend\views.py:480 .\sopds_web_backend\views.py:484

msgid "Genres"

msgstr "Жанры"
@@ -77,7 +77,7 @@ msgstr "Жанры" 
#: .\sopds_web_backend\templates\sopds_logo.html:29

#: .\sopds_web_backend\templates\sopds_menu.html:10

#: .\sopds_web_backend\templates\sopds_menu.html:33

#: .\sopds_web_backend\views.py:262 .\sopds_web_backend\views.py:459

#: .\sopds_web_backend\views.py:267 .\sopds_web_backend\views.py:465

msgid "Series"

msgstr "Серии"
@@ -106,34 +106,41 @@ msgid "BOOKSHELF" 
msgstr "КНИЖНАЯ ПОЛКА"



#: .\sopds_web_backend\templates\sopds_footer.html:18

msgid ""

"Bookshelf is available only SimpleOPDS Catalog mode with activated user "

"authorization."

msgstr ""

"Книжная полка доступна только в режиме работы SimpleOPDS Catalog со включенной авторизацией пользователей."



#: .\sopds_web_backend\templates\sopds_footer.html:22

msgid "STATISTICS"

msgstr "СТАТИСТИКА"



#: .\sopds_web_backend\templates\sopds_footer.html:20

#: .\sopds_web_backend\templates\sopds_footer.html:24

msgid "This сatalog contains:"

msgstr "Этот каталог содержит:"



#: .\sopds_web_backend\templates\sopds_footer.html:21

#: .\sopds_web_backend\templates\sopds_footer.html:25

msgid "books,"

msgstr "книг,"



#: .\sopds_web_backend\templates\sopds_footer.html:22

#: .\sopds_web_backend\templates\sopds_footer.html:26

msgid "authors,"

msgstr "авторов,"



#: .\sopds_web_backend\templates\sopds_footer.html:23

#: .\sopds_web_backend\templates\sopds_footer.html:27

msgid "genres and"

msgstr "жанров и"



#: .\sopds_web_backend\templates\sopds_footer.html:24

#: .\sopds_web_backend\templates\sopds_footer.html:28

msgid "series."

msgstr "серий."



#: .\sopds_web_backend\templates\sopds_footer.html:27

#: .\sopds_web_backend\templates\sopds_footer.html:31

msgid "Last collection scan date:"

msgstr "Дата последнего сканирования:"



#: .\sopds_web_backend\templates\sopds_footer.html:33

#: .\sopds_web_backend\templates\sopds_footer.html:37

msgid "RANDOM BOOK"

msgstr "СЛУЧАЙНАЯ КНИГА"
@@ -182,7 +189,7 @@ msgid "Log in" 
msgstr "Вход"



#: .\sopds_web_backend\templates\sopds_logo.html:14

#: .\sopds_web_backend\views.py:262 .\sopds_web_backend\views.py:300

#: .\sopds_web_backend\views.py:267 .\sopds_web_backend\views.py:306

msgid "Search"

msgstr "Найти"
@@ -200,43 +207,43 @@ msgstr "Автор" 


#: .\sopds_web_backend\templates\sopds_menu.html:6

#: .\sopds_web_backend\templates\sopds_menu.html:16

#: .\sopds_web_backend\views.py:356

#: .\sopds_web_backend\views.py:362

msgid "Catalogs"

msgstr "Каталоги"



#: .\sopds_web_backend\templates\sopds_menu.html:7

#: .\sopds_web_backend\templates\sopds_menu.html:17

#: .\sopds_web_backend\views.py:87 .\sopds_web_backend\views.py:93

#: .\sopds_web_backend\views.py:106 .\sopds_web_backend\views.py:118

#: .\sopds_web_backend\views.py:127 .\sopds_web_backend\views.py:130

#: .\sopds_web_backend\views.py:139 .\sopds_web_backend\views.py:143

#: .\sopds_web_backend\views.py:153 .\sopds_web_backend\views.py:165

#: .\sopds_web_backend\views.py:391

#: .\sopds_web_backend\views.py:89 .\sopds_web_backend\views.py:95

#: .\sopds_web_backend\views.py:108 .\sopds_web_backend\views.py:120

#: .\sopds_web_backend\views.py:129 .\sopds_web_backend\views.py:132

#: .\sopds_web_backend\views.py:141 .\sopds_web_backend\views.py:145

#: .\sopds_web_backend\views.py:155 .\sopds_web_backend\views.py:167

#: .\sopds_web_backend\views.py:397

msgid "Books"

msgstr "Книги"



#: .\sopds_web_backend\templates\sopds_menu.html:8

#: .\sopds_web_backend\templates\sopds_menu.html:24

#: .\sopds_web_backend\views.py:300 .\sopds_web_backend\views.py:425

#: .\sopds_web_backend\views.py:306 .\sopds_web_backend\views.py:431

msgid "Authors"

msgstr "Авторы"



#: .\sopds_web_backend\templates\sopds_selectauthor.html:15

#: .\sopds_web_backend\templates\sopds_selectauthor.html:16

#, python-format

msgid "Total: %(chars_cnt)s authors."

msgstr "Всего: %(chars_cnt)s авторов."



#: .\sopds_web_backend\templates\sopds_selectbook.html:15

#: .\sopds_web_backend\templates\sopds_selectbook.html:16

#, python-format

msgid "Total: %(chars_cnt)s books."

msgstr "Всего: %(chars_cnt)s книг."



#: .\sopds_web_backend\templates\sopds_selectgenres.html:15

#: .\sopds_web_backend\templates\sopds_selectgenres.html:16

#, python-format

msgid "Total: %(g_num_book)s books."

msgstr "Всего: %(g_num_book)s книг."



#: .\sopds_web_backend\templates\sopds_selectseries.html:15

#: .\sopds_web_backend\templates\sopds_selectseries.html:16

#, python-format

msgid "Total: %(chars_cnt)s series."

msgstr "Всего: %(chars_cnt)s серий."
@@ -247,7 +254,7 @@ msgid "Total: %(s_book_count)s books." 
msgstr "Всего: %(s_book_count)s книг."



#: .\sopds_web_backend\templates\sopds_top.html:19

#: .\sopds_web_backend\views.py:532

#: .\sopds_web_backend\views.py:540

msgid "Logout"

msgstr "Выход"
@@ -256,52 +263,52 @@ msgid "Settings" 
msgstr "Настройки"



#: .\sopds_web_backend\templates\sopds_top.html:24

#: .\sopds_web_backend\views.py:506

#: .\sopds_web_backend\views.py:512

msgid "Login"

msgstr "Вход"



#: .\sopds_web_backend\views.py:87 .\sopds_web_backend\views.py:93

#: .\sopds_web_backend\views.py:89 .\sopds_web_backend\views.py:95

msgid "Search by title"

msgstr "Поиск по наименованию"



#: .\sopds_web_backend\views.py:106

#: .\sopds_web_backend\views.py:108

msgid "Search by author"

msgstr "Поиск по автору"



#: .\sopds_web_backend\views.py:118

#: .\sopds_web_backend\views.py:120

msgid "Search by series"

msgstr "Поиск по серии"



#: .\sopds_web_backend\views.py:127 .\sopds_web_backend\views.py:130

#: .\sopds_web_backend\views.py:129 .\sopds_web_backend\views.py:132

msgid "Search by genre"

msgstr "Поиск по жанру"



#: .\sopds_web_backend\views.py:139 .\sopds_web_backend\views.py:143

#: .\sopds_web_backend\views.py:141 .\sopds_web_backend\views.py:145

msgid "Bookshelf"

msgstr "Книжная полка"



#: .\sopds_web_backend\views.py:153

#: .\sopds_web_backend\views.py:155

msgid "Doubles for book"

msgstr "Дубликаты книги"



#: .\sopds_web_backend\views.py:355

#: .\sopds_web_backend\views.py:361

msgid "ROOT"

msgstr "НАЧАЛО"



#: .\sopds_web_backend\views.py:391 .\sopds_web_backend\views.py:425

#: .\sopds_web_backend\views.py:459 .\sopds_web_backend\views.py:474

#: .\sopds_web_backend\views.py:478

#: .\sopds_web_backend\views.py:397 .\sopds_web_backend\views.py:431

#: .\sopds_web_backend\views.py:465 .\sopds_web_backend\views.py:480

#: .\sopds_web_backend\views.py:484

msgid "Select"

msgstr "Выбор"



#: .\sopds_web_backend\views.py:501

#: .\sopds_web_backend\views.py:507

msgid "HOME"

msgstr "ГЛАВНАЯ"



#: .\sopds_web_backend\views.py:522

#: .\sopds_web_backend\views.py:528

msgid "This account is not active!"

msgstr "Учетная запись не активна!"



#: .\sopds_web_backend\views.py:525

#: .\sopds_web_backend\views.py:531

msgid "User does not exist or the password is incorrect!"

msgstr "Пользователь не существует или введен неправильный пароль!"