From 22fae51c9d95114f6a8849f70af22c635efb469c Mon Sep 17 00:00:00 2001 From: Braincoke Date: Mon, 18 May 2020 20:07:02 +0200 Subject: [PATCH 1/2] Fix XML parsing error when using OPDS feeds Using the OPDS feeds with MoonReader yielded the following error: "Error parsing XML: unbound prefix". This was due to a missing namespace in the feed.xml template. See https://github.com/janeczku/calibre-web/issues/1403 for more information. --- cps/templates/feed.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml index ac9d9096..4b65b1ca 100644 --- a/cps/templates/feed.xml +++ b/cps/templates/feed.xml @@ -1,5 +1,5 @@ - + urn:uuid:2853dacf-ed79-42f5-8e8a-a7bb3d1ae6a2 {{ current_time }} Date: Fri, 22 May 2020 11:43:52 -0700 Subject: [PATCH 2/2] Fix typo "Shelfs" to "Shelves" --- cps/templates/config_view_edit.html | 2 +- cps/templates/user_edit.html | 2 +- cps/translations/cs/LC_MESSAGES/messages.po | 2 +- cps/translations/de/LC_MESSAGES/messages.po | 2 +- cps/translations/es/LC_MESSAGES/messages.po | 2 +- cps/translations/fi/LC_MESSAGES/messages.po | 2 +- cps/translations/fr/LC_MESSAGES/messages.po | 2 +- cps/translations/hu/LC_MESSAGES/messages.po | 2 +- cps/translations/it/LC_MESSAGES/messages.po | 2 +- cps/translations/ja/LC_MESSAGES/messages.po | 2 +- cps/translations/km/LC_MESSAGES/messages.po | 2 +- cps/translations/nl/LC_MESSAGES/messages.po | 2 +- cps/translations/pl/LC_MESSAGES/messages.po | 2 +- cps/translations/ru/LC_MESSAGES/messages.po | 2 +- cps/translations/sv/LC_MESSAGES/messages.po | 2 +- cps/translations/tr/LC_MESSAGES/messages.po | 2 +- cps/translations/uk/LC_MESSAGES/messages.po | 2 +- cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po | 2 +- messages.pot | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cps/templates/config_view_edit.html b/cps/templates/config_view_edit.html index 4cade736..adc846c6 100644 --- a/cps/templates/config_view_edit.html +++ b/cps/templates/config_view_edit.html @@ -113,7 +113,7 @@
- +
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html index 6adae1e7..16e6626a 100644 --- a/cps/templates/user_edit.html +++ b/cps/templates/user_edit.html @@ -119,7 +119,7 @@
- +
{% endif %} {% endif %} diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po index 75c80db4..6a996d7b 100644 --- a/cps/translations/cs/LC_MESSAGES/messages.po +++ b/cps/translations/cs/LC_MESSAGES/messages.po @@ -1859,7 +1859,7 @@ msgid "Allow Changing Password" msgstr "Povolit změnu hesla" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Povolit úpravy veřejných polic" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po index 087ec711..0fa6dbe2 100644 --- a/cps/translations/de/LC_MESSAGES/messages.po +++ b/cps/translations/de/LC_MESSAGES/messages.po @@ -1860,7 +1860,7 @@ msgid "Allow Changing Password" msgstr "Ändern des Passworts erlauben" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Editieren öffentlicher Bücherregale erlauben" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po index aa123866..5bb10c41 100644 --- a/cps/translations/es/LC_MESSAGES/messages.po +++ b/cps/translations/es/LC_MESSAGES/messages.po @@ -1862,7 +1862,7 @@ msgid "Allow Changing Password" msgstr "Permitir cambiar la contraseña" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Permitir editar estantes públicos" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po index a755b375..58729e31 100644 --- a/cps/translations/fi/LC_MESSAGES/messages.po +++ b/cps/translations/fi/LC_MESSAGES/messages.po @@ -1860,7 +1860,7 @@ msgid "Allow Changing Password" msgstr "Salli sananan vaihto" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Salli julkisten hyllyjen editointi" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po index 6dad21aa..c12e362b 100644 --- a/cps/translations/fr/LC_MESSAGES/messages.po +++ b/cps/translations/fr/LC_MESSAGES/messages.po @@ -1873,7 +1873,7 @@ msgid "Allow Changing Password" msgstr "Permettre le changement de mot de passe" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Autoriser la modification d’étagères publiques" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po index 02924b02..f4dae63d 100644 --- a/cps/translations/hu/LC_MESSAGES/messages.po +++ b/cps/translations/hu/LC_MESSAGES/messages.po @@ -1860,7 +1860,7 @@ msgid "Allow Changing Password" msgstr "Jelszó változtatásának engedélyezése" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Nyilvános polcok szerkesztésének engedélyezése" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po index cdb92ec5..5ecdb517 100644 --- a/cps/translations/it/LC_MESSAGES/messages.po +++ b/cps/translations/it/LC_MESSAGES/messages.po @@ -1859,7 +1859,7 @@ msgid "Allow Changing Password" msgstr "Permetti la modifica della password" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Permetti la modifica degli scaffali pubblici" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po index 8a49dc89..676dd4b4 100644 --- a/cps/translations/ja/LC_MESSAGES/messages.po +++ b/cps/translations/ja/LC_MESSAGES/messages.po @@ -1860,7 +1860,7 @@ msgid "Allow Changing Password" msgstr "パスワード変更を許可" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "みんなの本棚の編集を許可" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po index 4e3d80b2..d06840db 100644 --- a/cps/translations/km/LC_MESSAGES/messages.po +++ b/cps/translations/km/LC_MESSAGES/messages.po @@ -1861,7 +1861,7 @@ msgid "Allow Changing Password" msgstr "អនុញ្ញាតឲប្តូរលេខសម្ងាត់" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "អនុញ្ញាតឲកែប្រែធ្នើសាធារណៈ" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po index 1c9ea024..a782a5eb 100644 --- a/cps/translations/nl/LC_MESSAGES/messages.po +++ b/cps/translations/nl/LC_MESSAGES/messages.po @@ -1861,7 +1861,7 @@ msgid "Allow Changing Password" msgstr "Wachtwoord wijzigen toestaan" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Bewerken van openbare boekenplanken toestaan" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po index 2555eca1..0676a0f6 100644 --- a/cps/translations/pl/LC_MESSAGES/messages.po +++ b/cps/translations/pl/LC_MESSAGES/messages.po @@ -1874,7 +1874,7 @@ msgid "Allow Changing Password" msgstr "Zezwalaj na zmianę hasła" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Zezwalaj na edycję półek publicznych" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po index 9ef04a9d..20c08fe2 100644 --- a/cps/translations/ru/LC_MESSAGES/messages.po +++ b/cps/translations/ru/LC_MESSAGES/messages.po @@ -1861,7 +1861,7 @@ msgid "Allow Changing Password" msgstr "Разрешить смену пароля" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Разрешить редактирование публичных книжных полок" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po index 93a26415..2d33f4ca 100644 --- a/cps/translations/sv/LC_MESSAGES/messages.po +++ b/cps/translations/sv/LC_MESSAGES/messages.po @@ -1860,7 +1860,7 @@ msgid "Allow Changing Password" msgstr "Tillåt Ändra lösenord" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Tillåt Redigering av offentliga hyllor" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po index dde99061..a202adb1 100644 --- a/cps/translations/tr/LC_MESSAGES/messages.po +++ b/cps/translations/tr/LC_MESSAGES/messages.po @@ -1860,7 +1860,7 @@ msgid "Allow Changing Password" msgstr "Şifre değiştirmeye izin ver" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Genel Kitaplıkları düzenlemeye izin ver" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po index e499ad15..8b0b2e1a 100644 --- a/cps/translations/uk/LC_MESSAGES/messages.po +++ b/cps/translations/uk/LC_MESSAGES/messages.po @@ -1859,7 +1859,7 @@ msgid "Allow Changing Password" msgstr "Дозволити зміну пароля" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "Дозволити редагування публічних книжкових полиць" #: cps/templates/config_view_edit.html:126 diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po index 2203499b..213e6c2f 100644 --- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po +++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po @@ -1860,7 +1860,7 @@ msgid "Allow Changing Password" msgstr "允许修改密码" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "允许编辑公共书架" #: cps/templates/config_view_edit.html:126 diff --git a/messages.pot b/messages.pot index 95b6b2ec..643ab0df 100644 --- a/messages.pot +++ b/messages.pot @@ -1859,7 +1859,7 @@ msgid "Allow Changing Password" msgstr "" #: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:122 -msgid "Allow Editing Public Shelfs" +msgid "Allow Editing Public Shelves" msgstr "" #: cps/templates/config_view_edit.html:126