diff --git a/cps/db.py b/cps/db.py index 81f46b81..70b4105b 100644 --- a/cps/db.py +++ b/cps/db.py @@ -993,7 +993,12 @@ class CalibreDB: title = title[len(prep):] + ', ' + prep return title.strip() - conn = conn or self.session.connection().connection.driver_connection + try: + # sqlalchemy <1.4.24 + conn = conn or self.session.connection().connection.driver_connection + except AttributeError: + # sqlalchemy >1.4.24 and sqlalchemy 2.0 + conn = conn or self.session.connection().connection.connection try: conn.create_function("title_sort", 1, _title_sort) except sqliteOperationalError: diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo index 0328bcf1..587b7084 100644 Binary files a/cps/translations/cs/LC_MESSAGES/messages.mo and b/cps/translations/cs/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po index 12de58d0..b9d1978b 100644 --- a/cps/translations/cs/LC_MESSAGES/messages.po +++ b/cps/translations/cs/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2020-06-09 21:11+0100\n" "Last-Translator: Lukas Heroudek \n" "Language: cs_CZ\n" diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo index 45be8a10..c08cf9fa 100644 Binary files a/cps/translations/de/LC_MESSAGES/messages.mo and b/cps/translations/de/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po index db3150b4..7111dff5 100644 --- a/cps/translations/de/LC_MESSAGES/messages.po +++ b/cps/translations/de/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2023-04-16 15:05+0200\n" "Last-Translator: Ozzie Isaacs\n" "Language: de\n" diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo index 2b1e40c0..2e191c87 100644 Binary files a/cps/translations/el/LC_MESSAGES/messages.mo and b/cps/translations/el/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po index 5bd3b836..f7340be7 100644 --- a/cps/translations/el/LC_MESSAGES/messages.po +++ b/cps/translations/el/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Depountis Georgios\n" "Language: el\n" diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo index 24df1e7d..ccf86cd8 100644 Binary files a/cps/translations/es/LC_MESSAGES/messages.mo and b/cps/translations/es/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po index d82a59d8..887012dc 100644 --- a/cps/translations/es/LC_MESSAGES/messages.po +++ b/cps/translations/es/LC_MESSAGES/messages.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2020-05-25 17:22+0200\n" "Last-Translator: minakmostoles \n" "Language: es\n" diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo index f29666c7..4b936780 100644 Binary files a/cps/translations/fi/LC_MESSAGES/messages.mo and b/cps/translations/fi/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po index 3f5e6aef..5ac854f0 100644 --- a/cps/translations/fi/LC_MESSAGES/messages.po +++ b/cps/translations/fi/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2020-01-12 13:56+0100\n" "Last-Translator: Samuli Valavuo \n" "Language: fi\n" diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo index f49488d2..ec379dc4 100644 Binary files a/cps/translations/fr/LC_MESSAGES/messages.mo and b/cps/translations/fr/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po index e88ec478..bc482e63 100644 --- a/cps/translations/fr/LC_MESSAGES/messages.po +++ b/cps/translations/fr/LC_MESSAGES/messages.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2020-06-07 06:47+0200\n" "Last-Translator: \n" "Language: fr\n" diff --git a/cps/translations/gl/LC_MESSAGES/messages.mo b/cps/translations/gl/LC_MESSAGES/messages.mo index 8526aa96..8d6e6274 100644 Binary files a/cps/translations/gl/LC_MESSAGES/messages.mo and b/cps/translations/gl/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/gl/LC_MESSAGES/messages.po b/cps/translations/gl/LC_MESSAGES/messages.po index 46b18669..9d589b12 100644 --- a/cps/translations/gl/LC_MESSAGES/messages.po +++ b/cps/translations/gl/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2022-08-11 16:46+0200\n" "Last-Translator: pollitor \n" "Language: gl\n" diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo index 8e4ae102..131bee9d 100644 Binary files a/cps/translations/hu/LC_MESSAGES/messages.mo and b/cps/translations/hu/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po index ce1b6b3f..dd09e04d 100644 --- a/cps/translations/hu/LC_MESSAGES/messages.po +++ b/cps/translations/hu/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2019-04-06 23:36+0200\n" "Last-Translator: \n" "Language: hu\n" diff --git a/cps/translations/id/LC_MESSAGES/messages.mo b/cps/translations/id/LC_MESSAGES/messages.mo index 09fb490b..687e9fd2 100644 Binary files a/cps/translations/id/LC_MESSAGES/messages.mo and b/cps/translations/id/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/id/LC_MESSAGES/messages.po b/cps/translations/id/LC_MESSAGES/messages.po index 12ec0b73..d414062d 100644 --- a/cps/translations/id/LC_MESSAGES/messages.po +++ b/cps/translations/id/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2023-01-21 10:00+0700\n" "Last-Translator: Arief Hidayat\n" "Language: id\n" diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo index 507666cc..e4afbac2 100644 Binary files a/cps/translations/it/LC_MESSAGES/messages.mo and b/cps/translations/it/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po index c7b219f3..6eff61ed 100644 --- a/cps/translations/it/LC_MESSAGES/messages.po +++ b/cps/translations/it/LC_MESSAGES/messages.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" -"PO-Revision-Date: 2023-02-04 20:25+0100\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" +"PO-Revision-Date: 2023-04-18 09:04+0200\n" "Last-Translator: Massimo Pissarello \n" "Language: it\n" "Language-Team: Italian <>\n" @@ -32,16 +32,15 @@ msgstr "Eseguo l'arresto del server, per favore chiudi la finestra" #: cps/admin.py:155 msgid "Success! Database Reconnected" -msgstr "OK! Database riconnesso" +msgstr "Tutto OK! Database riconnesso" #: cps/admin.py:158 msgid "Unknown command" msgstr "Comando sconosciuto" #: cps/admin.py:169 -#, fuzzy msgid "Success! Books queued for Metadata Backup, please check Tasks for result" -msgstr "L'e-mail di test è stato accodata con successo per essere spedita a %(email)s, per favore verifica tramite il pulsante 'Attività' il risultato" +msgstr "Tutto OK! Libri in coda per il backup dei metadati, controlla le attività per il risultato" #: cps/admin.py:202 cps/editbooks.py:577 cps/editbooks.py:579 #: cps/editbooks.py:615 cps/editbooks.py:632 cps/editbooks.py:1241 @@ -284,7 +283,7 @@ msgstr "Modifica le impostazioni del server e-mail" #: cps/admin.py:1288 msgid "Success! Gmail Account Verified." -msgstr "OK! Account Gmail verificato." +msgstr "Tutto OK! Account Gmail verificato." #: cps/admin.py:1307 cps/admin.py:1310 cps/admin.py:1692 cps/admin.py:1825 #: cps/admin.py:1923 cps/admin.py:2044 cps/editbooks.py:229 @@ -298,7 +297,7 @@ msgstr "Errore nel database: %(error)s." #: cps/admin.py:1317 #, python-format msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result" -msgstr "L'e-mail di test è stato accodata con successo per essere spedita a %(email)s, per favore verifica tramite il pulsante 'Attività' il risultato" +msgstr "L'e-mail di test è stato accodata con successo per essere spedita a %(email)s, per favore controlla le attività per il risultato" #: cps/admin.py:1320 #, python-format @@ -345,7 +344,7 @@ msgstr "Modifica l'utente %(nick)s" #: cps/admin.py:1430 #, python-format msgid "Success! Password for user %(user)s reset" -msgstr "OK! Reimpostazione della password per l'utente %(user)s" +msgstr "Tutto OK! Reimpostazione della password per l'utente %(user)s" #: cps/admin.py:1436 msgid "Oops! Please configure the SMTP mail settings." @@ -455,7 +454,7 @@ msgstr "La posizione del Certfile non è valida, per favore indica il percorso c #: cps/admin.py:1812 msgid "Password length has to be between 1 and 40" -msgstr "" +msgstr "La lunghezza della password deve essere compresa tra 1 e 40" #: cps/admin.py:1864 msgid "Database Settings updated" @@ -760,7 +759,7 @@ msgstr "Formato dell'indirizzo e-mail non valido" #: cps/helper.py:703 msgid "Password doesn't comply with password validation rules" -msgstr "" +msgstr "La password non è conforme alle regole di convalida della password" #: cps/helper.py:853 msgid "Python module 'advocate' is not installed but is needed for cover uploads" @@ -816,7 +815,7 @@ msgstr "Metti in coda tutti i libri per il backup dei metadati" #: cps/kobo_auth.py:90 msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device" -msgstr "Per favore accedi a Calibe-Web non da localhost per ottenere un api-endpoint valido per il lettore kobo" +msgstr "Per favore accedi a Calibe-Web non da localhost per ottenere un api_endpoint valido per il lettore kobo" #: cps/kobo_auth.py:116 msgid "Kobo Setup" @@ -830,7 +829,7 @@ msgstr "Registra con %(provider)s" #: cps/oauth_bb.py:138 cps/remotelogin.py:130 #, python-format msgid "Success! You are now logged in as: %(nickname)s" -msgstr "OK! Ora sei connesso come: %(nickname)s" +msgstr "Tutto OK! Ora sei connesso come: %(nickname)s" #: cps/oauth_bb.py:148 #, python-format @@ -908,7 +907,7 @@ msgstr "Il token è scaduto" #: cps/remotelogin.py:92 msgid "Success! Please return to your device" -msgstr "OK! Torna al tuo dispositivo" +msgstr "Tutto OK! Torna al tuo dispositivo" #: cps/render_template.py:42 cps/web.py:414 msgid "Books" @@ -1322,14 +1321,13 @@ msgid "File formats list" msgstr "Elenco dei formati" #: cps/web.py:1217 -#, fuzzy msgid "Please configure the SMTP mail settings first..." -msgstr "Configura prima le impostazioni del server SMTP." +msgstr "Prima configura le impostazioni del server SMTP..." #: cps/web.py:1224 #, python-format msgid "Success! Book queued for sending to %(eReadermail)s" -msgstr "OK! Libro in coda per l'invio a %(eReadermail)s" +msgstr "Tutto OK! Libro in coda per l'invio a %(eReadermail)s" #: cps/web.py:1227 #, python-format @@ -1342,7 +1340,7 @@ msgstr "Per favore aggiorna il tuo profilo con un'e-mail eReader valida." #: cps/web.py:1245 msgid "Please wait one minute to register next user" -msgstr "" +msgstr "Attendi un minuto per registrare l'utente successivo" #: cps/templates/layout.html:68 cps/templates/layout.html:102 #: cps/templates/login.html:27 cps/templates/register.html:17 cps/web.py:1246 @@ -1361,56 +1359,51 @@ msgstr "La tua e-mail non è consentita." #: cps/web.py:1286 msgid "Success! Confirmation Email has been sent." -msgstr "OK! L'e-mail di conferma è stata inviata." +msgstr "Tutto OK! L'e-mail di conferma è stata inviata." #: cps/web.py:1332 cps/web.py:1350 -#, fuzzy msgid "Cannot activate LDAP authentication" -msgstr "Non posso attivare l'autenticazione LDAP" +msgstr "Impossibile attivare l'autenticazione LDAP" #: cps/web.py:1344 msgid "Please wait one minute before next login" -msgstr "" +msgstr "Attendi un minuto prima dell'accesso successivo" #: cps/web.py:1360 -#, fuzzy, python-format +#, python-format msgid "you are now logged in as: '%(nickname)s'" -msgstr "OK! Ora sei connesso come: %(nickname)s" +msgstr "ora sei connesso come: '%(nickname)s'" #: cps/web.py:1367 -#, fuzzy, python-format +#, python-format msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known" msgstr "Accesso di riserva come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto" #: cps/web.py:1372 -#, fuzzy, python-format +#, python-format msgid "Could not login: %(message)s" -msgstr "Non posso accedere: %(message)s" +msgstr "Impossibile accedere: %(message)s" #: cps/web.py:1376 cps/web.py:1401 -#, fuzzy msgid "Wrong Username or Password" -msgstr "Nome utente o password errati." +msgstr "Nome utente o password errati" #: cps/web.py:1383 -#, fuzzy msgid "New Password was send to your email address" -msgstr "OK! La nuova password è stata inviata alla tua e-mail." +msgstr "La nuova password è stata inviata al tuo indirizzo email" #: cps/web.py:1387 -#, fuzzy msgid "An unknown error occurred. Please try again later." -msgstr "Si è verificato un errore sconosciuto: per favore riprova." +msgstr "Si è verificato un errore sconosciuto. Per favore riprova più tardi." #: cps/web.py:1389 -#, fuzzy msgid "Please enter valid username to reset password" msgstr "Inserisci un nome utente valido per reimpostare la password" #: cps/web.py:1397 -#, fuzzy, python-format +#, python-format msgid "You are now logged in as: '%(nickname)s'" -msgstr "OK! Ora sei connesso come: %(nickname)s" +msgstr "Ora sei connesso come: '%(nickname)s'" #: cps/web.py:1455 cps/web.py:1505 #, python-format @@ -1419,7 +1412,7 @@ msgstr "Profilo di %(name)s" #: cps/web.py:1471 msgid "Success! Profile Updated" -msgstr "OK! Profilo aggiornato" +msgstr "Tutto OK! Profilo aggiornato" #: cps/web.py:1475 msgid "Oops! An account already exists for this Email." @@ -1687,7 +1680,7 @@ msgstr "Ricollega il database di Calibre" #: cps/templates/admin.html:190 cps/templates/schedule_edit.html:41 msgid "Generate Metadata Backup Files" -msgstr "" +msgstr "Genera file di backup dei metadati" #: cps/templates/admin.html:197 msgid "Refresh Thumbnail Cache" @@ -2390,50 +2383,48 @@ msgid "Location of Unrar binary" msgstr "Percorso del file binario di UnRar" #: cps/templates/config_edit.html:361 -#, fuzzy msgid "Security Settings" -msgstr "Impostazioni OAuth" +msgstr "Impostazioni sicurezza" #: cps/templates/config_edit.html:369 msgid "Limit failed login attempts" -msgstr "" +msgstr "Limita i tentativi di accesso falliti" #: cps/templates/config_edit.html:372 msgid "Session protection" -msgstr "" +msgstr "Protezione sessione" #: cps/templates/config_edit.html:374 msgid "Basic" -msgstr "" +msgstr "Di base" #: cps/templates/config_edit.html:375 msgid "Strong" -msgstr "" +msgstr "Forte" #: cps/templates/config_edit.html:380 -#, fuzzy msgid "User Password policy" -msgstr "Reimposta la password dell'utente" +msgstr "Politica password utente" #: cps/templates/config_edit.html:384 msgid "Minimum password length" -msgstr "" +msgstr "Lunghezza minima password" #: cps/templates/config_edit.html:389 msgid "Enforce number" -msgstr "" +msgstr "Obbliga numero" #: cps/templates/config_edit.html:393 msgid "Enforce lowercase characters" -msgstr "" +msgstr "Obbliga caratteri minuscoli" #: cps/templates/config_edit.html:397 msgid "Enforce uppercase characters" -msgstr "" +msgstr "Obbliga caratteri maiuscoli" #: cps/templates/config_edit.html:401 msgid "Enforce special characters" -msgstr "" +msgstr "Obbliga caratteri speciali" #: cps/templates/config_view_edit.html:17 msgid "View Configuration" @@ -3009,11 +3000,11 @@ msgstr "Pagina successiva" #: cps/templates/readcbr.html:96 msgid "Single Page Display" -msgstr "" +msgstr "Visualizzazione a pagina singola" #: cps/templates/readcbr.html:97 msgid "Long Strip Display" -msgstr "" +msgstr "Visualizzazione a striscia lunga" #: cps/templates/readcbr.html:98 msgid "Scale to Best" @@ -3045,16 +3036,15 @@ msgstr "Capovolgi immagine" #: cps/templates/readcbr.html:126 msgid "Display" -msgstr "" +msgstr "Visualizzazione" #: cps/templates/readcbr.html:129 -#, fuzzy msgid "Single Page" -msgstr "Pagina di amministrazione" +msgstr "Pagina singola" #: cps/templates/readcbr.html:130 msgid "Long Strip" -msgstr "" +msgstr "Striscia lunga" #: cps/templates/readcbr.html:135 msgid "Scale" @@ -3446,7 +3436,7 @@ msgstr "Modifica gli scaffali pubblici" #: cps/templates/user_table.html:152 msgid "Sync selected Shelves with Kobo" -msgstr "Sincronizza con Kobo gli scaffali selezionati" +msgstr "Sincronizza gli scaffali selezionati con Kobo" #: cps/templates/user_table.html:156 msgid "Show Read/Unread Section" diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo index 5ba744a8..5459a654 100644 Binary files a/cps/translations/ja/LC_MESSAGES/messages.mo and b/cps/translations/ja/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po index a3b43060..9211e535 100644 --- a/cps/translations/ja/LC_MESSAGES/messages.po +++ b/cps/translations/ja/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2018-02-07 02:20-0500\n" "Last-Translator: subdiox \n" "Language: ja\n" diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo index 985f0374..1e9c9598 100644 Binary files a/cps/translations/km/LC_MESSAGES/messages.mo and b/cps/translations/km/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po index 129515c8..bd6aafc9 100644 --- a/cps/translations/km/LC_MESSAGES/messages.po +++ b/cps/translations/km/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2018-08-27 17:06+0700\n" "Last-Translator: \n" "Language: km_KH\n" diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo index 4f0c1cbc..fee86161 100644 Binary files a/cps/translations/ko/LC_MESSAGES/messages.mo and b/cps/translations/ko/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po index 756aec28..8aba42d6 100644 --- a/cps/translations/ko/LC_MESSAGES/messages.po +++ b/cps/translations/ko/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2022-01-10 11:30+0900\n" "Last-Translator: 내맘대로의 EPUBGUIDE.NET \n" "Language: ko\n" diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo index 48eef7f6..f23bd1d9 100644 Binary files a/cps/translations/nl/LC_MESSAGES/messages.mo and b/cps/translations/nl/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po index 014dc222..359c8244 100644 --- a/cps/translations/nl/LC_MESSAGES/messages.po +++ b/cps/translations/nl/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web (GPLV3)\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2020-12-12 08:20+0100\n" "Last-Translator: Marcel Maas \n" "Language: nl\n" diff --git a/cps/translations/no/LC_MESSAGES/messages.mo b/cps/translations/no/LC_MESSAGES/messages.mo index 5be68b32..d645b3f3 100644 Binary files a/cps/translations/no/LC_MESSAGES/messages.mo and b/cps/translations/no/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/no/LC_MESSAGES/messages.po b/cps/translations/no/LC_MESSAGES/messages.po index 3a21bb5b..b44f61be 100644 --- a/cps/translations/no/LC_MESSAGES/messages.po +++ b/cps/translations/no/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2023-01-06 11:00+0000\n" "Last-Translator: Vegard Fladby \n" "Language: no\n" diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo index fce7dd06..ab18550e 100644 Binary files a/cps/translations/pl/LC_MESSAGES/messages.mo and b/cps/translations/pl/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po index fc2fba91..0f520f72 100644 --- a/cps/translations/pl/LC_MESSAGES/messages.po +++ b/cps/translations/pl/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre Web - polski (POT: 2021-06-12 08:52)\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2021-06-12 15:35+0200\n" "Last-Translator: Radosław Kierznowski \n" "Language: pl\n" diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo index d86f5ad7..d8f32fd0 100644 Binary files a/cps/translations/pt_BR/LC_MESSAGES/messages.mo and b/cps/translations/pt_BR/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po index ef1a3c6e..c580ccd1 100644 --- a/cps/translations/pt_BR/LC_MESSAGES/messages.po +++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: br\n" diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo index b097af3b..cd4a9f8a 100644 Binary files a/cps/translations/ru/LC_MESSAGES/messages.mo and b/cps/translations/ru/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po index a9e60ac5..7283766f 100644 --- a/cps/translations/ru/LC_MESSAGES/messages.po +++ b/cps/translations/ru/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2020-04-29 01:20+0400\n" "Last-Translator: ZIZA\n" "Language: ru\n" diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo index 0976ca3d..6e6684db 100644 Binary files a/cps/translations/sv/LC_MESSAGES/messages.mo and b/cps/translations/sv/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po index 41e9e167..7789e919 100644 --- a/cps/translations/sv/LC_MESSAGES/messages.po +++ b/cps/translations/sv/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2021-05-13 11:00+0000\n" "Last-Translator: Jonatan Nyberg \n" "Language: sv\n" diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo index f64d6e42..95d6b107 100644 Binary files a/cps/translations/tr/LC_MESSAGES/messages.mo and b/cps/translations/tr/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po index 2fb74a84..f79a70fe 100644 --- a/cps/translations/tr/LC_MESSAGES/messages.po +++ b/cps/translations/tr/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2020-04-23 22:47+0300\n" "Last-Translator: iz \n" "Language: tr\n" diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo index 981b255b..4a1db333 100644 Binary files a/cps/translations/uk/LC_MESSAGES/messages.mo and b/cps/translations/uk/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po index bf72365e..93a20211 100644 --- a/cps/translations/uk/LC_MESSAGES/messages.po +++ b/cps/translations/uk/LC_MESSAGES/messages.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2017-04-30 00:47+0300\n" "Last-Translator: ABIS Team \n" "Language: uk\n" diff --git a/cps/translations/vi/LC_MESSAGES/messages.mo b/cps/translations/vi/LC_MESSAGES/messages.mo index 57ef1015..d13f05b1 100644 Binary files a/cps/translations/vi/LC_MESSAGES/messages.mo and b/cps/translations/vi/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/vi/LC_MESSAGES/messages.po b/cps/translations/vi/LC_MESSAGES/messages.po index 22972ef8..f4e52833 100644 --- a/cps/translations/vi/LC_MESSAGES/messages.po +++ b/cps/translations/vi/LC_MESSAGES/messages.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2022-09-20 21:36+0700\n" "Last-Translator: Ha Link \n" "Language: vi\n" diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo index 2d96bded..ec94229f 100644 Binary files a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo and b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po index 31793fc4..fd197395 100644 --- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po +++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2020-09-27 22:18+0800\n" "Last-Translator: xlivevil \n" "Language: zh_CN\n" diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo index c3b37a2f..190c0f84 100644 Binary files a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo and b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo differ diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po index 044bb999..8154c96f 100644 --- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po +++ b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: 2020-09-27 22:18+0800\n" "Last-Translator: xlivevil \n" "Language: zh_TW\n" diff --git a/cps/web.py b/cps/web.py index ad825f02..789edd3d 100755 --- a/cps/web.py +++ b/cps/web.py @@ -484,7 +484,8 @@ def render_downloaded_books(page, order, user_id): user_id = int(user_id) else: user_id = current_user.id - if current_user.check_visibility(constants.SIDEBAR_DOWNLOAD): + user = ub.session.query(ub.User).filter(ub.User.id == user_id).first() + if current_user.check_visibility(constants.SIDEBAR_DOWNLOAD) and user: entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, @@ -499,7 +500,6 @@ def render_downloaded_books(page, order, user_id): if not (calibre_db.session.query(db.Books).filter(calibre_db.common_filters()) .filter(db.Books.id == book.Books.id).first()): ub.delete_download(book.Books.id) - user = ub.session.query(ub.User).filter(ub.User.id == user_id).first() return render_title_template('index.html', random=random, entries=entries, @@ -618,21 +618,19 @@ def render_ratings_books(page, book_id, order): db.Series, db.books_ratings_link, db.Ratings) title = _("Rating: None") - rating = -1 else: name = calibre_db.session.query(db.Ratings).filter(db.Ratings.id == book_id).first() - entries, random, pagination = calibre_db.fill_indexpage(page, 0, - db.Books, - db.Books.ratings.any(db.Ratings.id == book_id), - [order[0][0]], - True, config.config_read_column) - title = _("Rating: %(rating)s stars", rating=int(name.rating / 2)) - rating = name.rating - if title and rating <= 10: - return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id, - title=title, page="ratings", order=order[1]) - else: - abort(404) + if name: + entries, random, pagination = calibre_db.fill_indexpage(page, 0, + db.Books, + db.Books.ratings.any(db.Ratings.id == book_id), + [order[0][0]], + True, config.config_read_column) + title = _("Rating: %(rating)s stars", rating=int(name.rating / 2)) + else: + abort(404) + return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id, + title=title, page="ratings", order=order[1]) def render_formats_books(page, book_id, order): @@ -688,6 +686,8 @@ def render_language_books(page, name, order): try: if name.lower() != "none": lang_name = isoLanguages.get_language_name(get_locale(), name) + if lang_name == "Unknown": + abort(404) else: lang_name = _("None") except KeyError: @@ -1036,7 +1036,8 @@ def ratings_list(): .filter(or_(db.Ratings.rating == None, db.Ratings.rating == 0)) .filter(calibre_db.common_filters()) .count()) - entries.append([db.Category(_("None"), "-1", -1), no_rating_count]) + if no_rating_count: + entries.append([db.Category(_("None"), "-1", -1), no_rating_count]) entries = sorted(entries, key=lambda x: x[0].rating, reverse=not order_no) return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(), title=_("Ratings list"), page="ratingslist", data="ratings", order=order_no) diff --git a/messages.pot b/messages.pot index a32fca58..859b3b9c 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-04-16 15:05+0200\n" +"POT-Creation-Date: 2023-04-18 20:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"