diff --git a/cps/static/css/style.css b/cps/static/css/style.css index 7ccbd5c6..16c3cb36 100644 --- a/cps/static/css/style.css +++ b/cps/static/css/style.css @@ -94,8 +94,8 @@ input.pill:not(:checked) + label .glyphicon { .upload-format-input-text {display: initial;} #btn-upload-format {display: none;} -.upload-format-input-text {display: initial;} -#btn-upload-format {display: none;} +.upload-cover-input-text {display: initial;} +#btn-upload-cover {display: none;} .panel-title > a { text-decoration: none;} diff --git a/cps/static/js/edit_books.js b/cps/static/js/edit_books.js index 599a875a..e86c78e9 100644 --- a/cps/static/js/edit_books.js +++ b/cps/static/js/edit_books.js @@ -246,3 +246,11 @@ $("#btn-upload-format").on("change", function () { } // Remove c:\fake at beginning from localhost chrome $("#upload-format").html(filename); }); + +$("#btn-upload-cover").on("change", function () { + var filename = $(this).val(); + if (filename.substring(3, 11) === "fakepath") { + filename = filename.substring(12); + } // Remove c:\fake at beginning from localhost chrome + $("#upload-cover").html(filename); +}); diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html index 75d1ed0c..259e7127 100644 --- a/cps/templates/book_edit.html +++ b/cps/templates/book_edit.html @@ -60,7 +60,11 @@ - +
+ +
+ +
@@ -70,7 +74,7 @@
- +
{% if cc|length > 0 %} diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo index 7cfd0d23..a41c1168 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 fe459af0..b0b3a348 100644 --- a/cps/translations/de/LC_MESSAGES/messages.po +++ b/cps/translations/de/LC_MESSAGES/messages.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2018-08-28 10:22+0200\n" +"POT-Creation-Date: 2018-08-28 14:05+0200\n" "PO-Revision-Date: 2016-07-12 19:54+0200\n" "Last-Translator: Ozzie Isaacs\n" "Language: de\n" @@ -556,26 +556,26 @@ msgstr "Benutzer %(nick)s bearbeiten" msgid "Password for user %s reset" msgstr "Password für Benutzer %s wurde zurückgesetzt" -#: cps/web.py:3170 +#: cps/web.py:3169 msgid "Error opening eBook. File does not exist or file is not accessible" msgstr "" "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht " "zugänglich" -#: cps/web.py:3185 cps/web.py:3419 cps/web.py:3424 cps/web.py:3579 +#: cps/web.py:3184 cps/web.py:3445 cps/web.py:3450 cps/web.py:3605 msgid "edit metadata" msgstr "Metadaten editieren" -#: cps/web.py:3198 cps/web.py:3449 +#: cps/web.py:3197 cps/web.py:3475 #, python-format msgid "File extension \"%s\" is not allowed to be uploaded to this server" msgstr "Die Dateiendung \"%s\" kann nicht auf diesen Server hochgeladen werden" -#: cps/web.py:3201 cps/web.py:3453 +#: cps/web.py:3201 cps/web.py:3479 msgid "File to be uploaded must have an extension" msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden" -#: cps/web.py:3213 cps/web.py:3473 +#: cps/web.py:3213 cps/web.py:3499 #, python-format msgid "Failed to create path %s (Permission denied)." msgstr "Fehler beim Erzeugen des Pfads %s (Zugriff verweigert)" @@ -590,29 +590,43 @@ msgstr "Fehler beim speichern der Datei %s." msgid "File format %s added to %s" msgstr "Dateiformat %s zu %s hinzugefügt" -#: cps/web.py:3249 cps/web.py:3253 +#: cps/web.py:3252 +#, python-format +msgid "Failed to create path for cover %s (Permission denied)." +msgstr "" + +#: cps/web.py:3259 +#, python-format +msgid "Failed to store cover-file %s." +msgstr "" + +#: cps/web.py:3262 +msgid "Cover-file is not a valid image file" +msgstr "" + +#: cps/web.py:3275 cps/web.py:3279 msgid "unknown" msgstr "Unbekannt" -#: cps/web.py:3275 +#: cps/web.py:3301 msgid "Cover is not a jpg file, can't save" msgstr "Cover ist keine JPG Datei, konnte nicht gespeichert werden" -#: cps/web.py:3428 +#: cps/web.py:3454 msgid "Error editing book, please check logfile for details" msgstr "Fehler beim Editieren des Buchs, Details im Logfile" -#: cps/web.py:3478 +#: cps/web.py:3504 #, python-format msgid "Failed to store file %s (Permission denied)." msgstr "Fehler beim speichern der Datei %s (Zugriff verweigert)" -#: cps/web.py:3483 +#: cps/web.py:3509 #, python-format msgid "Failed to delete file %s (Permission denied)." msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)" -#: cps/web.py:3565 +#: cps/web.py:3591 #, python-format msgid "File %s uploaded" msgstr "DAtei %s hochgeladen" @@ -796,7 +810,7 @@ msgid "Ok" msgstr "Ok" #: cps/templates/admin.html:112 cps/templates/admin.html:126 -#: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166 +#: cps/templates/book_edit.html:148 cps/templates/book_edit.html:170 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19 @@ -832,7 +846,7 @@ msgstr "Buch löschen" msgid "Delete formats:" msgstr "Lösche Formate:" -#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165 +#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:169 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74 msgid "Delete" msgstr "Löschen" @@ -841,13 +855,13 @@ msgstr "Löschen" msgid "Book Title" msgstr "Buchtitel" -#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:225 -#: cps/templates/book_edit.html:243 cps/templates/search_form.html:10 +#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:229 +#: cps/templates/book_edit.html:247 cps/templates/search_form.html:10 msgid "Author" msgstr "Autor" -#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:230 -#: cps/templates/book_edit.html:245 cps/templates/search_form.html:106 +#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:234 +#: cps/templates/book_edit.html:249 cps/templates/search_form.html:106 msgid "Description" msgstr "Beschreibung" @@ -876,91 +890,95 @@ msgstr "" "Cover URL (jpg, Cover wird heruntergeladen und in der Datenbank " "gespeichert, Feld erscheint anschließend wieder leer)" -#: cps/templates/book_edit.html:65 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:64 +msgid "Upload Cover from local drive" +msgstr "Cover von lokalem Laufwerk hinzufügen" + +#: cps/templates/book_edit.html:69 cps/templates/detail.html:131 msgid "Publishing date" msgstr "Herausgabedatum" -#: cps/templates/book_edit.html:72 cps/templates/user_edit.html:33 +#: cps/templates/book_edit.html:76 cps/templates/user_edit.html:33 msgid "Language" msgstr "Sprache" -#: cps/templates/book_edit.html:83 cps/templates/search_form.html:117 +#: cps/templates/book_edit.html:87 cps/templates/search_form.html:117 msgid "Yes" msgstr "Ja" -#: cps/templates/book_edit.html:84 cps/templates/search_form.html:118 +#: cps/templates/book_edit.html:88 cps/templates/search_form.html:118 msgid "No" msgstr "Nein" -#: cps/templates/book_edit.html:130 +#: cps/templates/book_edit.html:134 msgid "Upload format" msgstr "Format hochladen" -#: cps/templates/book_edit.html:139 +#: cps/templates/book_edit.html:143 msgid "view book after edit" msgstr "Buch nach Bearbeitung ansehen" -#: cps/templates/book_edit.html:142 cps/templates/book_edit.html:178 +#: cps/templates/book_edit.html:146 cps/templates/book_edit.html:182 msgid "Get metadata" msgstr "Metadaten laden" -#: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204 +#: cps/templates/book_edit.html:147 cps/templates/config_edit.html:204 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17 #: cps/templates/user_edit.html:151 msgid "Submit" msgstr "Abschicken" -#: cps/templates/book_edit.html:157 +#: cps/templates/book_edit.html:161 msgid "Are you really sure?" msgstr "Sicher?" -#: cps/templates/book_edit.html:160 +#: cps/templates/book_edit.html:164 msgid "Book will be deleted from Calibre database" msgstr "Das Buch wird aus der Calibre Datenbank" -#: cps/templates/book_edit.html:161 +#: cps/templates/book_edit.html:165 msgid "and from hard disk" msgstr "und von der Festplatte gelöscht" -#: cps/templates/book_edit.html:181 +#: cps/templates/book_edit.html:185 msgid "Keyword" msgstr "Suchbegriff" -#: cps/templates/book_edit.html:182 +#: cps/templates/book_edit.html:186 msgid " Search keyword " msgstr "Suchbegriff" -#: cps/templates/book_edit.html:184 cps/templates/layout.html:46 +#: cps/templates/book_edit.html:188 cps/templates/layout.html:46 msgid "Go!" msgstr "Los!" -#: cps/templates/book_edit.html:188 +#: cps/templates/book_edit.html:192 msgid "Click the cover to load metadata to the form" msgstr "Klicke auf das Bild um die Metadaten zu übertragen" -#: cps/templates/book_edit.html:200 cps/templates/book_edit.html:240 +#: cps/templates/book_edit.html:204 cps/templates/book_edit.html:244 msgid "Loading..." msgstr "Lade..." -#: cps/templates/book_edit.html:205 cps/templates/layout.html:221 +#: cps/templates/book_edit.html:209 cps/templates/layout.html:221 msgid "Close" msgstr "Schließen" -#: cps/templates/book_edit.html:227 cps/templates/book_edit.html:244 +#: cps/templates/book_edit.html:231 cps/templates/book_edit.html:248 #: cps/templates/detail.html:126 cps/templates/search_form.html:14 msgid "Publisher" msgstr "Herausgeber" -#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:246 +#: cps/templates/book_edit.html:236 cps/templates/book_edit.html:250 msgid "Source" msgstr "Quelle" -#: cps/templates/book_edit.html:241 +#: cps/templates/book_edit.html:245 msgid "Search error!" msgstr "Fehler bei Suche!" -#: cps/templates/book_edit.html:242 +#: cps/templates/book_edit.html:246 msgid "No Result(s) found! Please try aonther keyword." msgstr "Keine Ergebnisse gefunden! Bitte ein anderes Schlüsselwort benutzen" diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po index 481a9502..9c56c7c8 100644 --- a/cps/translations/es/LC_MESSAGES/messages.po +++ b/cps/translations/es/LC_MESSAGES/messages.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2018-08-28 10:22+0200\n" +"POT-Creation-Date: 2018-08-28 14:05+0200\n" "PO-Revision-Date: 2017-04-04 15:09+0200\n" "Last-Translator: Juan F. Villa \n" "Language: es\n" @@ -539,24 +539,24 @@ msgstr "Editar Usuario %(nick)s" msgid "Password for user %s reset" msgstr "" -#: cps/web.py:3170 +#: cps/web.py:3169 msgid "Error opening eBook. File does not exist or file is not accessible" msgstr "" -#: cps/web.py:3185 cps/web.py:3419 cps/web.py:3424 cps/web.py:3579 +#: cps/web.py:3184 cps/web.py:3445 cps/web.py:3450 cps/web.py:3605 msgid "edit metadata" msgstr "editar metainformación" -#: cps/web.py:3198 cps/web.py:3449 +#: cps/web.py:3197 cps/web.py:3475 #, python-format msgid "File extension \"%s\" is not allowed to be uploaded to this server" msgstr "No se permite subir archivos con la extensión \"%s\" a este servidor" -#: cps/web.py:3201 cps/web.py:3453 +#: cps/web.py:3201 cps/web.py:3479 msgid "File to be uploaded must have an extension" msgstr "El archivo a subir debe tener una extensión" -#: cps/web.py:3213 cps/web.py:3473 +#: cps/web.py:3213 cps/web.py:3499 #, python-format msgid "Failed to create path %s (Permission denied)." msgstr "Fallo al crear la ruta %s (permiso negado)" @@ -571,29 +571,43 @@ msgstr "" msgid "File format %s added to %s" msgstr "" -#: cps/web.py:3249 cps/web.py:3253 +#: cps/web.py:3252 +#, python-format +msgid "Failed to create path for cover %s (Permission denied)." +msgstr "" + +#: cps/web.py:3259 +#, python-format +msgid "Failed to store cover-file %s." +msgstr "" + +#: cps/web.py:3262 +msgid "Cover-file is not a valid image file" +msgstr "" + +#: cps/web.py:3275 cps/web.py:3279 msgid "unknown" msgstr "" -#: cps/web.py:3275 +#: cps/web.py:3301 msgid "Cover is not a jpg file, can't save" msgstr "" -#: cps/web.py:3428 +#: cps/web.py:3454 msgid "Error editing book, please check logfile for details" msgstr "" -#: cps/web.py:3478 +#: cps/web.py:3504 #, python-format msgid "Failed to store file %s (Permission denied)." msgstr "Fallo al almacenar el archivo %s (permiso negado)" -#: cps/web.py:3483 +#: cps/web.py:3509 #, python-format msgid "Failed to delete file %s (Permission denied)." msgstr "Fallo al borrar el archivo %s (permiso negado)" -#: cps/web.py:3565 +#: cps/web.py:3591 #, python-format msgid "File %s uploaded" msgstr "" @@ -777,7 +791,7 @@ msgid "Ok" msgstr "Ok" #: cps/templates/admin.html:112 cps/templates/admin.html:126 -#: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166 +#: cps/templates/book_edit.html:148 cps/templates/book_edit.html:170 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19 @@ -813,7 +827,7 @@ msgstr "" msgid "Delete formats:" msgstr "" -#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165 +#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:169 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74 msgid "Delete" msgstr "" @@ -822,13 +836,13 @@ msgstr "" msgid "Book Title" msgstr "Titulo del Libro" -#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:225 -#: cps/templates/book_edit.html:243 cps/templates/search_form.html:10 +#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:229 +#: cps/templates/book_edit.html:247 cps/templates/search_form.html:10 msgid "Author" msgstr "Autor" -#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:230 -#: cps/templates/book_edit.html:245 cps/templates/search_form.html:106 +#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:234 +#: cps/templates/book_edit.html:249 cps/templates/search_form.html:106 msgid "Description" msgstr "Descripcion" @@ -855,91 +869,95 @@ msgid "" "afterwards empty again)" msgstr "" -#: cps/templates/book_edit.html:65 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:64 +msgid "Upload Cover from local drive" +msgstr "" + +#: cps/templates/book_edit.html:69 cps/templates/detail.html:131 msgid "Publishing date" msgstr "Fecha de publicación" -#: cps/templates/book_edit.html:72 cps/templates/user_edit.html:33 +#: cps/templates/book_edit.html:76 cps/templates/user_edit.html:33 msgid "Language" msgstr "Lenguaje" -#: cps/templates/book_edit.html:83 cps/templates/search_form.html:117 +#: cps/templates/book_edit.html:87 cps/templates/search_form.html:117 msgid "Yes" msgstr "Si" -#: cps/templates/book_edit.html:84 cps/templates/search_form.html:118 +#: cps/templates/book_edit.html:88 cps/templates/search_form.html:118 msgid "No" msgstr "No" -#: cps/templates/book_edit.html:130 +#: cps/templates/book_edit.html:134 msgid "Upload format" msgstr "Subir formato" -#: cps/templates/book_edit.html:139 +#: cps/templates/book_edit.html:143 msgid "view book after edit" msgstr "Ver libro tras la edicion" -#: cps/templates/book_edit.html:142 cps/templates/book_edit.html:178 +#: cps/templates/book_edit.html:146 cps/templates/book_edit.html:182 msgid "Get metadata" msgstr "Obtener metainformación" -#: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204 +#: cps/templates/book_edit.html:147 cps/templates/config_edit.html:204 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17 #: cps/templates/user_edit.html:151 msgid "Submit" msgstr "Enviar" -#: cps/templates/book_edit.html:157 +#: cps/templates/book_edit.html:161 msgid "Are you really sure?" msgstr "" -#: cps/templates/book_edit.html:160 +#: cps/templates/book_edit.html:164 msgid "Book will be deleted from Calibre database" msgstr "" -#: cps/templates/book_edit.html:161 +#: cps/templates/book_edit.html:165 msgid "and from hard disk" msgstr "" -#: cps/templates/book_edit.html:181 +#: cps/templates/book_edit.html:185 msgid "Keyword" msgstr "Palabra clave" -#: cps/templates/book_edit.html:182 +#: cps/templates/book_edit.html:186 msgid " Search keyword " msgstr "Buscar palabras clave" -#: cps/templates/book_edit.html:184 cps/templates/layout.html:46 +#: cps/templates/book_edit.html:188 cps/templates/layout.html:46 msgid "Go!" msgstr "¡Vamos!" -#: cps/templates/book_edit.html:188 +#: cps/templates/book_edit.html:192 msgid "Click the cover to load metadata to the form" msgstr "Haga clic en la portada para cargar la metainformación en el formulario" -#: cps/templates/book_edit.html:200 cps/templates/book_edit.html:240 +#: cps/templates/book_edit.html:204 cps/templates/book_edit.html:244 msgid "Loading..." msgstr "Cargando..." -#: cps/templates/book_edit.html:205 cps/templates/layout.html:221 +#: cps/templates/book_edit.html:209 cps/templates/layout.html:221 msgid "Close" msgstr "Cerrar" -#: cps/templates/book_edit.html:227 cps/templates/book_edit.html:244 +#: cps/templates/book_edit.html:231 cps/templates/book_edit.html:248 #: cps/templates/detail.html:126 cps/templates/search_form.html:14 msgid "Publisher" msgstr "Editor" -#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:246 +#: cps/templates/book_edit.html:236 cps/templates/book_edit.html:250 msgid "Source" msgstr "Origen" -#: cps/templates/book_edit.html:241 +#: cps/templates/book_edit.html:245 msgid "Search error!" msgstr "¡Error en la búsqueda!" -#: cps/templates/book_edit.html:242 +#: cps/templates/book_edit.html:246 msgid "No Result(s) found! Please try aonther keyword." msgstr "" diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po index 476df291..3920914a 100644 --- a/cps/translations/fr/LC_MESSAGES/messages.po +++ b/cps/translations/fr/LC_MESSAGES/messages.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2018-08-28 10:22+0200\n" +"POT-Creation-Date: 2018-08-28 14:05+0200\n" "PO-Revision-Date: 2017-10-26 22:42+0200\n" "Last-Translator: Nicolas Roudninski \n" "Language: fr\n" @@ -547,26 +547,26 @@ msgstr "Éditer l'utilisateur %(nick)s" msgid "Password for user %s reset" msgstr "" -#: cps/web.py:3170 +#: cps/web.py:3169 msgid "Error opening eBook. File does not exist or file is not accessible" msgstr "" "Erreur à l’ouverture du livre. Le fichier n’existe pas ou n’est pas " "accessible" -#: cps/web.py:3185 cps/web.py:3419 cps/web.py:3424 cps/web.py:3579 +#: cps/web.py:3184 cps/web.py:3445 cps/web.py:3450 cps/web.py:3605 msgid "edit metadata" msgstr "modifier les métadonnées" -#: cps/web.py:3198 cps/web.py:3449 +#: cps/web.py:3197 cps/web.py:3475 #, python-format msgid "File extension \"%s\" is not allowed to be uploaded to this server" msgstr "" -#: cps/web.py:3201 cps/web.py:3453 +#: cps/web.py:3201 cps/web.py:3479 msgid "File to be uploaded must have an extension" msgstr "Pour être téléverser le fichier doit avoir une extension" -#: cps/web.py:3213 cps/web.py:3473 +#: cps/web.py:3213 cps/web.py:3499 #, python-format msgid "Failed to create path %s (Permission denied)." msgstr "Impossible de créer le chemin %s (permission refusée)" @@ -581,29 +581,43 @@ msgstr "" msgid "File format %s added to %s" msgstr "" -#: cps/web.py:3249 cps/web.py:3253 +#: cps/web.py:3252 +#, python-format +msgid "Failed to create path for cover %s (Permission denied)." +msgstr "" + +#: cps/web.py:3259 +#, python-format +msgid "Failed to store cover-file %s." +msgstr "" + +#: cps/web.py:3262 +msgid "Cover-file is not a valid image file" +msgstr "" + +#: cps/web.py:3275 cps/web.py:3279 msgid "unknown" msgstr "inconnu" -#: cps/web.py:3275 +#: cps/web.py:3301 msgid "Cover is not a jpg file, can't save" msgstr "" -#: cps/web.py:3428 +#: cps/web.py:3454 msgid "Error editing book, please check logfile for details" msgstr "" -#: cps/web.py:3478 +#: cps/web.py:3504 #, python-format msgid "Failed to store file %s (Permission denied)." msgstr "Impossible d'enregistrer le fichier %s (permission refusée)" -#: cps/web.py:3483 +#: cps/web.py:3509 #, python-format msgid "Failed to delete file %s (Permission denied)." msgstr "Impossible de supprimer le fichier %s (permission refusée)" -#: cps/web.py:3565 +#: cps/web.py:3591 #, python-format msgid "File %s uploaded" msgstr "" @@ -787,7 +801,7 @@ msgid "Ok" msgstr "D’accord" #: cps/templates/admin.html:112 cps/templates/admin.html:126 -#: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166 +#: cps/templates/book_edit.html:148 cps/templates/book_edit.html:170 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19 @@ -823,7 +837,7 @@ msgstr "Effacer le livre" msgid "Delete formats:" msgstr "" -#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165 +#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:169 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74 msgid "Delete" msgstr "Supprimer" @@ -832,13 +846,13 @@ msgstr "Supprimer" msgid "Book Title" msgstr "Titre du livre" -#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:225 -#: cps/templates/book_edit.html:243 cps/templates/search_form.html:10 +#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:229 +#: cps/templates/book_edit.html:247 cps/templates/search_form.html:10 msgid "Author" msgstr "Auteur" -#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:230 -#: cps/templates/book_edit.html:245 cps/templates/search_form.html:106 +#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:234 +#: cps/templates/book_edit.html:249 cps/templates/search_form.html:106 msgid "Description" msgstr "Description" @@ -865,91 +879,95 @@ msgid "" "afterwards empty again)" msgstr "" -#: cps/templates/book_edit.html:65 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:64 +msgid "Upload Cover from local drive" +msgstr "" + +#: cps/templates/book_edit.html:69 cps/templates/detail.html:131 msgid "Publishing date" msgstr "Date de publication" -#: cps/templates/book_edit.html:72 cps/templates/user_edit.html:33 +#: cps/templates/book_edit.html:76 cps/templates/user_edit.html:33 msgid "Language" msgstr "Langue" -#: cps/templates/book_edit.html:83 cps/templates/search_form.html:117 +#: cps/templates/book_edit.html:87 cps/templates/search_form.html:117 msgid "Yes" msgstr "Oui" -#: cps/templates/book_edit.html:84 cps/templates/search_form.html:118 +#: cps/templates/book_edit.html:88 cps/templates/search_form.html:118 msgid "No" msgstr "Non" -#: cps/templates/book_edit.html:130 +#: cps/templates/book_edit.html:134 msgid "Upload format" msgstr "" -#: cps/templates/book_edit.html:139 +#: cps/templates/book_edit.html:143 msgid "view book after edit" msgstr "voir le livre après l'édition" -#: cps/templates/book_edit.html:142 cps/templates/book_edit.html:178 +#: cps/templates/book_edit.html:146 cps/templates/book_edit.html:182 msgid "Get metadata" msgstr "Obtenir les métadonnées" -#: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204 +#: cps/templates/book_edit.html:147 cps/templates/config_edit.html:204 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17 #: cps/templates/user_edit.html:151 msgid "Submit" msgstr "Soumettre" -#: cps/templates/book_edit.html:157 +#: cps/templates/book_edit.html:161 msgid "Are you really sure?" msgstr "Etes-vous vraiment sur?" -#: cps/templates/book_edit.html:160 +#: cps/templates/book_edit.html:164 msgid "Book will be deleted from Calibre database" msgstr "Le livre va être supprimé de la base de données de Calibre" -#: cps/templates/book_edit.html:161 +#: cps/templates/book_edit.html:165 msgid "and from hard disk" msgstr "et du disque dur" -#: cps/templates/book_edit.html:181 +#: cps/templates/book_edit.html:185 msgid "Keyword" msgstr "Mot-clé" -#: cps/templates/book_edit.html:182 +#: cps/templates/book_edit.html:186 msgid " Search keyword " msgstr " Rechercher le mot-clé " -#: cps/templates/book_edit.html:184 cps/templates/layout.html:46 +#: cps/templates/book_edit.html:188 cps/templates/layout.html:46 msgid "Go!" msgstr "Allez !" -#: cps/templates/book_edit.html:188 +#: cps/templates/book_edit.html:192 msgid "Click the cover to load metadata to the form" msgstr "" -#: cps/templates/book_edit.html:200 cps/templates/book_edit.html:240 +#: cps/templates/book_edit.html:204 cps/templates/book_edit.html:244 msgid "Loading..." msgstr "Chargement…" -#: cps/templates/book_edit.html:205 cps/templates/layout.html:221 +#: cps/templates/book_edit.html:209 cps/templates/layout.html:221 msgid "Close" msgstr "Fermer" -#: cps/templates/book_edit.html:227 cps/templates/book_edit.html:244 +#: cps/templates/book_edit.html:231 cps/templates/book_edit.html:248 #: cps/templates/detail.html:126 cps/templates/search_form.html:14 msgid "Publisher" msgstr "Editeur" -#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:246 +#: cps/templates/book_edit.html:236 cps/templates/book_edit.html:250 msgid "Source" msgstr "Source" -#: cps/templates/book_edit.html:241 +#: cps/templates/book_edit.html:245 msgid "Search error!" msgstr "Rechercher les erreur!" -#: cps/templates/book_edit.html:242 +#: cps/templates/book_edit.html:246 msgid "No Result(s) found! Please try aonther keyword." msgstr "" diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po index ae62abe2..259d1b6f 100644 --- a/cps/translations/it/LC_MESSAGES/messages.po +++ b/cps/translations/it/LC_MESSAGES/messages.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2018-08-28 10:22+0200\n" +"POT-Creation-Date: 2018-08-28 14:05+0200\n" "PO-Revision-Date: 2017-04-04 15:09+0200\n" "Last-Translator: Marco Picone \n" "Language: it\n" @@ -543,26 +543,26 @@ msgstr "Modifica utente %(nick)s" msgid "Password for user %s reset" msgstr "" -#: cps/web.py:3170 +#: cps/web.py:3169 msgid "Error opening eBook. File does not exist or file is not accessible" msgstr "" "Errore durante l'apertura di eBook. Il file non esiste o il file non è " "accessibile" -#: cps/web.py:3185 cps/web.py:3419 cps/web.py:3424 cps/web.py:3579 +#: cps/web.py:3184 cps/web.py:3445 cps/web.py:3450 cps/web.py:3605 msgid "edit metadata" msgstr "modificare la metainformazione" -#: cps/web.py:3198 cps/web.py:3449 +#: cps/web.py:3197 cps/web.py:3475 #, python-format msgid "File extension \"%s\" is not allowed to be uploaded to this server" msgstr "Non è consentito caricare i file con l'estensione \"%s\" a questo server" -#: cps/web.py:3201 cps/web.py:3453 +#: cps/web.py:3201 cps/web.py:3479 msgid "File to be uploaded must have an extension" msgstr "Il file da caricare deve avere un'estensione" -#: cps/web.py:3213 cps/web.py:3473 +#: cps/web.py:3213 cps/web.py:3499 #, python-format msgid "Failed to create path %s (Permission denied)." msgstr "Impossibile creare il percorso %s (autorizzazione negata)" @@ -577,29 +577,43 @@ msgstr "" msgid "File format %s added to %s" msgstr "" -#: cps/web.py:3249 cps/web.py:3253 +#: cps/web.py:3252 +#, python-format +msgid "Failed to create path for cover %s (Permission denied)." +msgstr "" + +#: cps/web.py:3259 +#, python-format +msgid "Failed to store cover-file %s." +msgstr "" + +#: cps/web.py:3262 +msgid "Cover-file is not a valid image file" +msgstr "" + +#: cps/web.py:3275 cps/web.py:3279 msgid "unknown" msgstr "Sconosciuto" -#: cps/web.py:3275 +#: cps/web.py:3301 msgid "Cover is not a jpg file, can't save" msgstr "" -#: cps/web.py:3428 +#: cps/web.py:3454 msgid "Error editing book, please check logfile for details" msgstr "" -#: cps/web.py:3478 +#: cps/web.py:3504 #, python-format msgid "Failed to store file %s (Permission denied)." msgstr "Impossibile archiviare il file %s (autorizzazione negata)" -#: cps/web.py:3483 +#: cps/web.py:3509 #, python-format msgid "Failed to delete file %s (Permission denied)." msgstr "Impossibile eliminare il file %s (autorizzazione negata)" -#: cps/web.py:3565 +#: cps/web.py:3591 #, python-format msgid "File %s uploaded" msgstr "" @@ -783,7 +797,7 @@ msgid "Ok" msgstr "Ok" #: cps/templates/admin.html:112 cps/templates/admin.html:126 -#: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166 +#: cps/templates/book_edit.html:148 cps/templates/book_edit.html:170 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19 @@ -819,7 +833,7 @@ msgstr "Elimina libro" msgid "Delete formats:" msgstr "" -#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165 +#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:169 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74 msgid "Delete" msgstr "Elimina" @@ -828,13 +842,13 @@ msgstr "Elimina" msgid "Book Title" msgstr "Titolo del libro" -#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:225 -#: cps/templates/book_edit.html:243 cps/templates/search_form.html:10 +#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:229 +#: cps/templates/book_edit.html:247 cps/templates/search_form.html:10 msgid "Author" msgstr "Autore" -#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:230 -#: cps/templates/book_edit.html:245 cps/templates/search_form.html:106 +#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:234 +#: cps/templates/book_edit.html:249 cps/templates/search_form.html:106 msgid "Description" msgstr "Descrizione" @@ -861,91 +875,95 @@ msgid "" "afterwards empty again)" msgstr "" -#: cps/templates/book_edit.html:65 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:64 +msgid "Upload Cover from local drive" +msgstr "" + +#: cps/templates/book_edit.html:69 cps/templates/detail.html:131 msgid "Publishing date" msgstr "Data di pubblicazione" -#: cps/templates/book_edit.html:72 cps/templates/user_edit.html:33 +#: cps/templates/book_edit.html:76 cps/templates/user_edit.html:33 msgid "Language" msgstr "Lingua" -#: cps/templates/book_edit.html:83 cps/templates/search_form.html:117 +#: cps/templates/book_edit.html:87 cps/templates/search_form.html:117 msgid "Yes" msgstr "Si" -#: cps/templates/book_edit.html:84 cps/templates/search_form.html:118 +#: cps/templates/book_edit.html:88 cps/templates/search_form.html:118 msgid "No" msgstr "No" -#: cps/templates/book_edit.html:130 +#: cps/templates/book_edit.html:134 msgid "Upload format" msgstr "" -#: cps/templates/book_edit.html:139 +#: cps/templates/book_edit.html:143 msgid "view book after edit" msgstr "visualizzare il libro dopo la modifica" -#: cps/templates/book_edit.html:142 cps/templates/book_edit.html:178 +#: cps/templates/book_edit.html:146 cps/templates/book_edit.html:182 msgid "Get metadata" msgstr "Ottieni metadati" -#: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204 +#: cps/templates/book_edit.html:147 cps/templates/config_edit.html:204 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17 #: cps/templates/user_edit.html:151 msgid "Submit" msgstr "Sottoscrivi" -#: cps/templates/book_edit.html:157 +#: cps/templates/book_edit.html:161 msgid "Are you really sure?" msgstr "Sei davvero sicuro?" -#: cps/templates/book_edit.html:160 +#: cps/templates/book_edit.html:164 msgid "Book will be deleted from Calibre database" msgstr "l libro verrà cancellato dal database Calibre\"" -#: cps/templates/book_edit.html:161 +#: cps/templates/book_edit.html:165 msgid "and from hard disk" msgstr "e dal disco rigido" -#: cps/templates/book_edit.html:181 +#: cps/templates/book_edit.html:185 msgid "Keyword" msgstr "Parola chiave" -#: cps/templates/book_edit.html:182 +#: cps/templates/book_edit.html:186 msgid " Search keyword " msgstr "Cerca parola chiave" -#: cps/templates/book_edit.html:184 cps/templates/layout.html:46 +#: cps/templates/book_edit.html:188 cps/templates/layout.html:46 msgid "Go!" msgstr "Partire" -#: cps/templates/book_edit.html:188 +#: cps/templates/book_edit.html:192 msgid "Click the cover to load metadata to the form" msgstr "Fai clic sul coperchio per caricare i metadati nel modulo" -#: cps/templates/book_edit.html:200 cps/templates/book_edit.html:240 +#: cps/templates/book_edit.html:204 cps/templates/book_edit.html:244 msgid "Loading..." msgstr "Caricamento in corso..." -#: cps/templates/book_edit.html:205 cps/templates/layout.html:221 +#: cps/templates/book_edit.html:209 cps/templates/layout.html:221 msgid "Close" msgstr "Chiuso" -#: cps/templates/book_edit.html:227 cps/templates/book_edit.html:244 +#: cps/templates/book_edit.html:231 cps/templates/book_edit.html:248 #: cps/templates/detail.html:126 cps/templates/search_form.html:14 msgid "Publisher" msgstr "Editore" -#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:246 +#: cps/templates/book_edit.html:236 cps/templates/book_edit.html:250 msgid "Source" msgstr "fonte" -#: cps/templates/book_edit.html:241 +#: cps/templates/book_edit.html:245 msgid "Search error!" msgstr "Errore di ricerca!" -#: cps/templates/book_edit.html:242 +#: cps/templates/book_edit.html:246 msgid "No Result(s) found! Please try aonther keyword." msgstr "" diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po index 58a3822c..d38958f6 100644 --- a/cps/translations/ja/LC_MESSAGES/messages.po +++ b/cps/translations/ja/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: 2018-08-28 10:22+0200\n" +"POT-Creation-Date: 2018-08-28 14:05+0200\n" "PO-Revision-Date: 2018-02-07 02:20-0500\n" "Last-Translator: white \n" "Language: ja\n" @@ -534,24 +534,24 @@ msgstr "ユーザ編集 %(nick)s" msgid "Password for user %s reset" msgstr "" -#: cps/web.py:3170 +#: cps/web.py:3169 msgid "Error opening eBook. File does not exist or file is not accessible" msgstr "電子本を開けません。ファイルは存在しないまたはアクセスできません" -#: cps/web.py:3185 cps/web.py:3419 cps/web.py:3424 cps/web.py:3579 +#: cps/web.py:3184 cps/web.py:3445 cps/web.py:3450 cps/web.py:3605 msgid "edit metadata" msgstr "メタデータを編集します" -#: cps/web.py:3198 cps/web.py:3449 +#: cps/web.py:3197 cps/web.py:3475 #, python-format msgid "File extension \"%s\" is not allowed to be uploaded to this server" msgstr "ファイル拡張子 \"%s\" をこのサーバにアップロードする許可はありません" -#: cps/web.py:3201 cps/web.py:3453 +#: cps/web.py:3201 cps/web.py:3479 msgid "File to be uploaded must have an extension" msgstr "ファイルをアップロードするために拡張子が必要です" -#: cps/web.py:3213 cps/web.py:3473 +#: cps/web.py:3213 cps/web.py:3499 #, python-format msgid "Failed to create path %s (Permission denied)." msgstr "場所 %s の作成を失敗しました (許可拒否)" @@ -566,29 +566,43 @@ msgstr "フアイル %s の保存を失敗しました" msgid "File format %s added to %s" msgstr "" -#: cps/web.py:3249 cps/web.py:3253 +#: cps/web.py:3252 +#, python-format +msgid "Failed to create path for cover %s (Permission denied)." +msgstr "" + +#: cps/web.py:3259 +#, python-format +msgid "Failed to store cover-file %s." +msgstr "" + +#: cps/web.py:3262 +msgid "Cover-file is not a valid image file" +msgstr "" + +#: cps/web.py:3275 cps/web.py:3279 msgid "unknown" msgstr "不明" -#: cps/web.py:3275 +#: cps/web.py:3301 msgid "Cover is not a jpg file, can't save" msgstr "" -#: cps/web.py:3428 +#: cps/web.py:3454 msgid "Error editing book, please check logfile for details" msgstr "" -#: cps/web.py:3478 +#: cps/web.py:3504 #, python-format msgid "Failed to store file %s (Permission denied)." msgstr "ファイル %s の保存を失敗しました (許可拒否)" -#: cps/web.py:3483 +#: cps/web.py:3509 #, python-format msgid "Failed to delete file %s (Permission denied)." msgstr "ファイル %s の削除を失敗しました (許可拒否)" -#: cps/web.py:3565 +#: cps/web.py:3591 #, python-format msgid "File %s uploaded" msgstr "" @@ -772,7 +786,7 @@ msgid "Ok" msgstr "はい" #: cps/templates/admin.html:112 cps/templates/admin.html:126 -#: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166 +#: cps/templates/book_edit.html:148 cps/templates/book_edit.html:170 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19 @@ -808,7 +822,7 @@ msgstr "本を削除" msgid "Delete formats:" msgstr "" -#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165 +#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:169 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74 msgid "Delete" msgstr "削除" @@ -817,13 +831,13 @@ msgstr "削除" msgid "Book Title" msgstr "本のタイトル" -#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:225 -#: cps/templates/book_edit.html:243 cps/templates/search_form.html:10 +#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:229 +#: cps/templates/book_edit.html:247 cps/templates/search_form.html:10 msgid "Author" msgstr "著者" -#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:230 -#: cps/templates/book_edit.html:245 cps/templates/search_form.html:106 +#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:234 +#: cps/templates/book_edit.html:249 cps/templates/search_form.html:106 msgid "Description" msgstr "詳細" @@ -850,91 +864,95 @@ msgid "" "afterwards empty again)" msgstr "" -#: cps/templates/book_edit.html:65 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:64 +msgid "Upload Cover from local drive" +msgstr "" + +#: cps/templates/book_edit.html:69 cps/templates/detail.html:131 msgid "Publishing date" msgstr "発行日" -#: cps/templates/book_edit.html:72 cps/templates/user_edit.html:33 +#: cps/templates/book_edit.html:76 cps/templates/user_edit.html:33 msgid "Language" msgstr "言語" -#: cps/templates/book_edit.html:83 cps/templates/search_form.html:117 +#: cps/templates/book_edit.html:87 cps/templates/search_form.html:117 msgid "Yes" msgstr "はい" -#: cps/templates/book_edit.html:84 cps/templates/search_form.html:118 +#: cps/templates/book_edit.html:88 cps/templates/search_form.html:118 msgid "No" msgstr "いいえ" -#: cps/templates/book_edit.html:130 +#: cps/templates/book_edit.html:134 msgid "Upload format" msgstr "アップロード拡張子" -#: cps/templates/book_edit.html:139 +#: cps/templates/book_edit.html:143 msgid "view book after edit" msgstr "編集してから本を表示します" -#: cps/templates/book_edit.html:142 cps/templates/book_edit.html:178 +#: cps/templates/book_edit.html:146 cps/templates/book_edit.html:182 msgid "Get metadata" msgstr "メタデータを取得します" -#: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204 +#: cps/templates/book_edit.html:147 cps/templates/config_edit.html:204 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17 #: cps/templates/user_edit.html:151 msgid "Submit" msgstr "提出" -#: cps/templates/book_edit.html:157 +#: cps/templates/book_edit.html:161 msgid "Are you really sure?" msgstr "宜しいですか?" -#: cps/templates/book_edit.html:160 +#: cps/templates/book_edit.html:164 msgid "Book will be deleted from Calibre database" msgstr "この本はCalibreデータベースから削除されます" -#: cps/templates/book_edit.html:161 +#: cps/templates/book_edit.html:165 msgid "and from hard disk" msgstr "とハードディクスから" -#: cps/templates/book_edit.html:181 +#: cps/templates/book_edit.html:185 msgid "Keyword" msgstr "キーワード" -#: cps/templates/book_edit.html:182 +#: cps/templates/book_edit.html:186 msgid " Search keyword " msgstr "キーワードを検索します" -#: cps/templates/book_edit.html:184 cps/templates/layout.html:46 +#: cps/templates/book_edit.html:188 cps/templates/layout.html:46 msgid "Go!" msgstr "行く" -#: cps/templates/book_edit.html:188 +#: cps/templates/book_edit.html:192 msgid "Click the cover to load metadata to the form" msgstr "メタデータをフォームに読み込むためにカバーをクリックしてください" -#: cps/templates/book_edit.html:200 cps/templates/book_edit.html:240 +#: cps/templates/book_edit.html:204 cps/templates/book_edit.html:244 msgid "Loading..." msgstr "読み込み中..." -#: cps/templates/book_edit.html:205 cps/templates/layout.html:221 +#: cps/templates/book_edit.html:209 cps/templates/layout.html:221 msgid "Close" msgstr "閉じる" -#: cps/templates/book_edit.html:227 cps/templates/book_edit.html:244 +#: cps/templates/book_edit.html:231 cps/templates/book_edit.html:248 #: cps/templates/detail.html:126 cps/templates/search_form.html:14 msgid "Publisher" msgstr "出版社" -#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:246 +#: cps/templates/book_edit.html:236 cps/templates/book_edit.html:250 msgid "Source" msgstr "ソース" -#: cps/templates/book_edit.html:241 +#: cps/templates/book_edit.html:245 msgid "Search error!" msgstr "検索エーラ!" -#: cps/templates/book_edit.html:242 +#: cps/templates/book_edit.html:246 msgid "No Result(s) found! Please try aonther keyword." msgstr "" diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po index d87f57c0..e0fac864 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: 2018-08-28 10:22+0200\n" +"POT-Creation-Date: 2018-08-28 14:05+0200\n" "PO-Revision-Date: 2018-08-27 17:06+0700\n" "Last-Translator: \n" "Language: km_KH\n" @@ -535,24 +535,24 @@ msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s" msgid "Password for user %s reset" msgstr "" -#: cps/web.py:3170 +#: cps/web.py:3169 msgid "Error opening eBook. File does not exist or file is not accessible" msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ ពុំមានឯកសារ ឬឯកសារនេះមិនអាចបើកបាន" -#: cps/web.py:3185 cps/web.py:3419 cps/web.py:3424 cps/web.py:3579 +#: cps/web.py:3184 cps/web.py:3445 cps/web.py:3450 cps/web.py:3605 msgid "edit metadata" msgstr "កែប្រែទិន្នន័យមេតា" -#: cps/web.py:3198 cps/web.py:3449 +#: cps/web.py:3197 cps/web.py:3475 #, python-format msgid "File extension \"%s\" is not allowed to be uploaded to this server" msgstr "ឯកសារប្រភេទ “%s” មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ" -#: cps/web.py:3201 cps/web.py:3453 +#: cps/web.py:3201 cps/web.py:3479 msgid "File to be uploaded must have an extension" msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ" -#: cps/web.py:3213 cps/web.py:3473 +#: cps/web.py:3213 cps/web.py:3499 #, python-format msgid "Failed to create path %s (Permission denied)." msgstr "មិនអាចបង្កើតទីតាំង %s (ពុំមានសិទ្ធិ)។" @@ -567,29 +567,43 @@ msgstr "មិនអាចរក្សាទុកឯកសារ %s ។" msgid "File format %s added to %s" msgstr "ឯកសារទម្រង់ %s ត្រូវបានបន្ថែមទៅ %s" -#: cps/web.py:3249 cps/web.py:3253 +#: cps/web.py:3252 +#, python-format +msgid "Failed to create path for cover %s (Permission denied)." +msgstr "" + +#: cps/web.py:3259 +#, python-format +msgid "Failed to store cover-file %s." +msgstr "" + +#: cps/web.py:3262 +msgid "Cover-file is not a valid image file" +msgstr "" + +#: cps/web.py:3275 cps/web.py:3279 msgid "unknown" msgstr "មិនដឹង" -#: cps/web.py:3275 +#: cps/web.py:3301 msgid "Cover is not a jpg file, can't save" msgstr "គម្របមិនមែនជាឯកសារ JPG មិនអាចរក្សាទុក" -#: cps/web.py:3428 +#: cps/web.py:3454 msgid "Error editing book, please check logfile for details" msgstr "មានបញ្ហាពេលកែប្រែសៀវភៅ សូមពិនិត្យមើល logfile សម្រាប់ព័ត៌មានបន្ថែម" -#: cps/web.py:3478 +#: cps/web.py:3504 #, python-format msgid "Failed to store file %s (Permission denied)." msgstr "មិនអាចរក្សាទុកឯកសារ %s (មិនមានសិទ្ធិ)។" -#: cps/web.py:3483 +#: cps/web.py:3509 #, python-format msgid "Failed to delete file %s (Permission denied)." msgstr "មិនអាចលុបឯកសារ %s (មិនមានសិទ្ធិ)។" -#: cps/web.py:3565 +#: cps/web.py:3591 #, python-format msgid "File %s uploaded" msgstr "ឯកសារ %s ត្រូវបានអាប់ឡូដ" @@ -773,7 +787,7 @@ msgid "Ok" msgstr "បាទ/ចាស" #: cps/templates/admin.html:112 cps/templates/admin.html:126 -#: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166 +#: cps/templates/book_edit.html:148 cps/templates/book_edit.html:170 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19 @@ -809,7 +823,7 @@ msgstr "លុបសៀវភៅ" msgid "Delete formats:" msgstr "លុបឯកសារទម្រង់៖" -#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165 +#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:169 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74 msgid "Delete" msgstr "លុប" @@ -818,13 +832,13 @@ msgstr "លុប" msgid "Book Title" msgstr "ចំណងជើងសៀវភៅ" -#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:225 -#: cps/templates/book_edit.html:243 cps/templates/search_form.html:10 +#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:229 +#: cps/templates/book_edit.html:247 cps/templates/search_form.html:10 msgid "Author" msgstr "អ្នកនិពន្ធ" -#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:230 -#: cps/templates/book_edit.html:245 cps/templates/search_form.html:106 +#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:234 +#: cps/templates/book_edit.html:249 cps/templates/search_form.html:106 msgid "Description" msgstr "ពិពណ៌នា" @@ -853,91 +867,95 @@ msgstr "" "URL របស់ក្របមុខ (ឯកសារ JPG ក្របមុខត្រូវបានទាញយក និងរក្សាទុកក្នុង database" " ក្រោយមកចន្លោះនេះទទេម្តងទៀត)" -#: cps/templates/book_edit.html:65 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:64 +msgid "Upload Cover from local drive" +msgstr "" + +#: cps/templates/book_edit.html:69 cps/templates/detail.html:131 msgid "Publishing date" msgstr "ថ្ងៃបោះពុម្ភ" -#: cps/templates/book_edit.html:72 cps/templates/user_edit.html:33 +#: cps/templates/book_edit.html:76 cps/templates/user_edit.html:33 msgid "Language" msgstr "ភាសា" -#: cps/templates/book_edit.html:83 cps/templates/search_form.html:117 +#: cps/templates/book_edit.html:87 cps/templates/search_form.html:117 msgid "Yes" msgstr "បាទ/ចាស" -#: cps/templates/book_edit.html:84 cps/templates/search_form.html:118 +#: cps/templates/book_edit.html:88 cps/templates/search_form.html:118 msgid "No" msgstr "ទេ" -#: cps/templates/book_edit.html:130 +#: cps/templates/book_edit.html:134 msgid "Upload format" msgstr "ទម្រង់អាប់ឡូដ" -#: cps/templates/book_edit.html:139 +#: cps/templates/book_edit.html:143 msgid "view book after edit" msgstr "មើលសៀវភៅក្រោយពីកែប្រែ" -#: cps/templates/book_edit.html:142 cps/templates/book_edit.html:178 +#: cps/templates/book_edit.html:146 cps/templates/book_edit.html:182 msgid "Get metadata" msgstr "មើលទិន្នន័យមេតា" -#: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204 +#: cps/templates/book_edit.html:147 cps/templates/config_edit.html:204 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17 #: cps/templates/user_edit.html:151 msgid "Submit" msgstr "បញ្ចូល" -#: cps/templates/book_edit.html:157 +#: cps/templates/book_edit.html:161 msgid "Are you really sure?" msgstr "" -#: cps/templates/book_edit.html:160 +#: cps/templates/book_edit.html:164 msgid "Book will be deleted from Calibre database" msgstr "សៀវភៅនឹងត្រូវលុបចេញពី database របស់ Calibre" -#: cps/templates/book_edit.html:161 +#: cps/templates/book_edit.html:165 msgid "and from hard disk" msgstr "និងពីថាសរឹង" -#: cps/templates/book_edit.html:181 +#: cps/templates/book_edit.html:185 msgid "Keyword" msgstr "ពាក្យគន្លឹះ" -#: cps/templates/book_edit.html:182 +#: cps/templates/book_edit.html:186 msgid " Search keyword " msgstr "ស្វែងរកពាក្យគន្លឹះ" -#: cps/templates/book_edit.html:184 cps/templates/layout.html:46 +#: cps/templates/book_edit.html:188 cps/templates/layout.html:46 msgid "Go!" msgstr "ទៅ!" -#: cps/templates/book_edit.html:188 +#: cps/templates/book_edit.html:192 msgid "Click the cover to load metadata to the form" msgstr "ចុចលើគម្របដើម្បីបញ្ចូលទិន្នន័យមេតាទៅក្នុង form" -#: cps/templates/book_edit.html:200 cps/templates/book_edit.html:240 +#: cps/templates/book_edit.html:204 cps/templates/book_edit.html:244 msgid "Loading..." msgstr "កំពុងដំណើរការ..." -#: cps/templates/book_edit.html:205 cps/templates/layout.html:221 +#: cps/templates/book_edit.html:209 cps/templates/layout.html:221 msgid "Close" msgstr "បិទ" -#: cps/templates/book_edit.html:227 cps/templates/book_edit.html:244 +#: cps/templates/book_edit.html:231 cps/templates/book_edit.html:248 #: cps/templates/detail.html:126 cps/templates/search_form.html:14 msgid "Publisher" msgstr "អ្នកបោះពុម្ភ" -#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:246 +#: cps/templates/book_edit.html:236 cps/templates/book_edit.html:250 msgid "Source" msgstr "ប្រភព" -#: cps/templates/book_edit.html:241 +#: cps/templates/book_edit.html:245 msgid "Search error!" msgstr "ការស្វែងរកមានកំហុស!" -#: cps/templates/book_edit.html:242 +#: cps/templates/book_edit.html:246 msgid "No Result(s) found! Please try aonther keyword." msgstr "" diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po index 2d517554..3447d9e6 100644 --- a/cps/translations/nl/LC_MESSAGES/messages.po +++ b/cps/translations/nl/LC_MESSAGES/messages.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web dutch translation by Ed Driesen (GPL V3)\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-08-28 10:22+0200\n" +"POT-Creation-Date: 2018-08-28 14:05+0200\n" "PO-Revision-Date: 2017-06-21 20:15+0200\n" "Last-Translator: \n" "Language: nl\n" @@ -551,24 +551,24 @@ msgstr "Bewerk gebruiker '%(nick)s'" msgid "Password for user %s reset" msgstr "" -#: cps/web.py:3170 +#: cps/web.py:3169 msgid "Error opening eBook. File does not exist or file is not accessible" msgstr "Fout bij openen eBook. Het bestand bestaat niet of is niet toegankelijk" -#: cps/web.py:3185 cps/web.py:3419 cps/web.py:3424 cps/web.py:3579 +#: cps/web.py:3184 cps/web.py:3445 cps/web.py:3450 cps/web.py:3605 msgid "edit metadata" msgstr "Bewerk metadata" -#: cps/web.py:3198 cps/web.py:3449 +#: cps/web.py:3197 cps/web.py:3475 #, python-format msgid "File extension \"%s\" is not allowed to be uploaded to this server" msgstr "Het uploaden van bestandsextensie \"%s\" is niet toegestaan op deze server" -#: cps/web.py:3201 cps/web.py:3453 +#: cps/web.py:3201 cps/web.py:3479 msgid "File to be uploaded must have an extension" msgstr "Up te loaden bestanden dienen een extensie te hebben" -#: cps/web.py:3213 cps/web.py:3473 +#: cps/web.py:3213 cps/web.py:3499 #, python-format msgid "Failed to create path %s (Permission denied)." msgstr "Het pad %s aanmaken mislukt (Geen toestemming)." @@ -583,29 +583,43 @@ msgstr "Bestand opslaan niet gelukt voor %s." msgid "File format %s added to %s" msgstr "" -#: cps/web.py:3249 cps/web.py:3253 +#: cps/web.py:3252 +#, python-format +msgid "Failed to create path for cover %s (Permission denied)." +msgstr "" + +#: cps/web.py:3259 +#, python-format +msgid "Failed to store cover-file %s." +msgstr "" + +#: cps/web.py:3262 +msgid "Cover-file is not a valid image file" +msgstr "" + +#: cps/web.py:3275 cps/web.py:3279 msgid "unknown" msgstr "onbekend" -#: cps/web.py:3275 +#: cps/web.py:3301 msgid "Cover is not a jpg file, can't save" msgstr "" -#: cps/web.py:3428 +#: cps/web.py:3454 msgid "Error editing book, please check logfile for details" msgstr "" -#: cps/web.py:3478 +#: cps/web.py:3504 #, python-format msgid "Failed to store file %s (Permission denied)." msgstr "Bestand %s opslaan mislukt (Geen toestemming)." -#: cps/web.py:3483 +#: cps/web.py:3509 #, python-format msgid "Failed to delete file %s (Permission denied)." msgstr "Bestand %s wissen mislukt (Geen toestemming)." -#: cps/web.py:3565 +#: cps/web.py:3591 #, python-format msgid "File %s uploaded" msgstr "" @@ -789,7 +803,7 @@ msgid "Ok" msgstr "Ok" #: cps/templates/admin.html:112 cps/templates/admin.html:126 -#: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166 +#: cps/templates/book_edit.html:148 cps/templates/book_edit.html:170 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19 @@ -825,7 +839,7 @@ msgstr "Wis boek" msgid "Delete formats:" msgstr "" -#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165 +#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:169 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74 msgid "Delete" msgstr "Wis" @@ -834,13 +848,13 @@ msgstr "Wis" msgid "Book Title" msgstr "Boek titel" -#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:225 -#: cps/templates/book_edit.html:243 cps/templates/search_form.html:10 +#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:229 +#: cps/templates/book_edit.html:247 cps/templates/search_form.html:10 msgid "Author" msgstr "Auteur" -#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:230 -#: cps/templates/book_edit.html:245 cps/templates/search_form.html:106 +#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:234 +#: cps/templates/book_edit.html:249 cps/templates/search_form.html:106 msgid "Description" msgstr "Omschrijving" @@ -867,91 +881,95 @@ msgid "" "afterwards empty again)" msgstr "" -#: cps/templates/book_edit.html:65 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:64 +msgid "Upload Cover from local drive" +msgstr "" + +#: cps/templates/book_edit.html:69 cps/templates/detail.html:131 msgid "Publishing date" msgstr "Publicatie datum" -#: cps/templates/book_edit.html:72 cps/templates/user_edit.html:33 +#: cps/templates/book_edit.html:76 cps/templates/user_edit.html:33 msgid "Language" msgstr "Taal" -#: cps/templates/book_edit.html:83 cps/templates/search_form.html:117 +#: cps/templates/book_edit.html:87 cps/templates/search_form.html:117 msgid "Yes" msgstr "Ja" -#: cps/templates/book_edit.html:84 cps/templates/search_form.html:118 +#: cps/templates/book_edit.html:88 cps/templates/search_form.html:118 msgid "No" msgstr "Nee" -#: cps/templates/book_edit.html:130 +#: cps/templates/book_edit.html:134 msgid "Upload format" msgstr "Upload type" -#: cps/templates/book_edit.html:139 +#: cps/templates/book_edit.html:143 msgid "view book after edit" msgstr "bekijk boek na bewerking" -#: cps/templates/book_edit.html:142 cps/templates/book_edit.html:178 +#: cps/templates/book_edit.html:146 cps/templates/book_edit.html:182 msgid "Get metadata" msgstr "Verkrijg metadata" -#: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204 +#: cps/templates/book_edit.html:147 cps/templates/config_edit.html:204 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17 #: cps/templates/user_edit.html:151 msgid "Submit" msgstr "Opslaan" -#: cps/templates/book_edit.html:157 +#: cps/templates/book_edit.html:161 msgid "Are you really sure?" msgstr "Ben je zeker?" -#: cps/templates/book_edit.html:160 +#: cps/templates/book_edit.html:164 msgid "Book will be deleted from Calibre database" msgstr "Boek wordt nu gewist uit de Calibre database" -#: cps/templates/book_edit.html:161 +#: cps/templates/book_edit.html:165 msgid "and from hard disk" msgstr "en van de harde schijf" -#: cps/templates/book_edit.html:181 +#: cps/templates/book_edit.html:185 msgid "Keyword" msgstr "Zoekwoord" -#: cps/templates/book_edit.html:182 +#: cps/templates/book_edit.html:186 msgid " Search keyword " msgstr "Zoek voor zoekwoord" -#: cps/templates/book_edit.html:184 cps/templates/layout.html:46 +#: cps/templates/book_edit.html:188 cps/templates/layout.html:46 msgid "Go!" msgstr "Start!" -#: cps/templates/book_edit.html:188 +#: cps/templates/book_edit.html:192 msgid "Click the cover to load metadata to the form" msgstr "Klik op de omslag om de metatadata in het formulier te laden" -#: cps/templates/book_edit.html:200 cps/templates/book_edit.html:240 +#: cps/templates/book_edit.html:204 cps/templates/book_edit.html:244 msgid "Loading..." msgstr "Aan het laden..." -#: cps/templates/book_edit.html:205 cps/templates/layout.html:221 +#: cps/templates/book_edit.html:209 cps/templates/layout.html:221 msgid "Close" msgstr "Sluit" -#: cps/templates/book_edit.html:227 cps/templates/book_edit.html:244 +#: cps/templates/book_edit.html:231 cps/templates/book_edit.html:248 #: cps/templates/detail.html:126 cps/templates/search_form.html:14 msgid "Publisher" msgstr "Uitgever" -#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:246 +#: cps/templates/book_edit.html:236 cps/templates/book_edit.html:250 msgid "Source" msgstr "Bron" -#: cps/templates/book_edit.html:241 +#: cps/templates/book_edit.html:245 msgid "Search error!" msgstr "Zoek fout!" -#: cps/templates/book_edit.html:242 +#: cps/templates/book_edit.html:246 msgid "No Result(s) found! Please try aonther keyword." msgstr "" diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po index c1148621..c093f3bd 100644 --- a/cps/translations/pl/LC_MESSAGES/messages.po +++ b/cps/translations/pl/LC_MESSAGES/messages.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre Web - polski (POT: 2017-04-11 22:51)\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2018-08-28 10:22+0200\n" +"POT-Creation-Date: 2018-08-28 14:05+0200\n" "PO-Revision-Date: 2017-04-11 22:51+0200\n" "Last-Translator: Radosław Kierznowski \n" "Language: pl\n" @@ -538,24 +538,24 @@ msgstr "Edytuj użytkownika %(nick)s" msgid "Password for user %s reset" msgstr "" -#: cps/web.py:3170 +#: cps/web.py:3169 msgid "Error opening eBook. File does not exist or file is not accessible" msgstr "" -#: cps/web.py:3185 cps/web.py:3419 cps/web.py:3424 cps/web.py:3579 +#: cps/web.py:3184 cps/web.py:3445 cps/web.py:3450 cps/web.py:3605 msgid "edit metadata" msgstr "edytuj metadane" -#: cps/web.py:3198 cps/web.py:3449 +#: cps/web.py:3197 cps/web.py:3475 #, python-format msgid "File extension \"%s\" is not allowed to be uploaded to this server" msgstr "Rozszerzenie pliku \"%s\" nie jest dozwolone do przesłania na ten serwer" -#: cps/web.py:3201 cps/web.py:3453 +#: cps/web.py:3201 cps/web.py:3479 msgid "File to be uploaded must have an extension" msgstr "Plik do przesłania musi mieć rozszerzenie" -#: cps/web.py:3213 cps/web.py:3473 +#: cps/web.py:3213 cps/web.py:3499 #, python-format msgid "Failed to create path %s (Permission denied)." msgstr "Nie udało się utworzyć łącza %s (Odmowa dostępu)." @@ -570,29 +570,43 @@ msgstr "" msgid "File format %s added to %s" msgstr "" -#: cps/web.py:3249 cps/web.py:3253 +#: cps/web.py:3252 +#, python-format +msgid "Failed to create path for cover %s (Permission denied)." +msgstr "" + +#: cps/web.py:3259 +#, python-format +msgid "Failed to store cover-file %s." +msgstr "" + +#: cps/web.py:3262 +msgid "Cover-file is not a valid image file" +msgstr "" + +#: cps/web.py:3275 cps/web.py:3279 msgid "unknown" msgstr "" -#: cps/web.py:3275 +#: cps/web.py:3301 msgid "Cover is not a jpg file, can't save" msgstr "" -#: cps/web.py:3428 +#: cps/web.py:3454 msgid "Error editing book, please check logfile for details" msgstr "" -#: cps/web.py:3478 +#: cps/web.py:3504 #, python-format msgid "Failed to store file %s (Permission denied)." msgstr "Nie można przechowywać pliku %s (Odmowa dostępu)." -#: cps/web.py:3483 +#: cps/web.py:3509 #, python-format msgid "Failed to delete file %s (Permission denied)." msgstr "Nie udało się usunąć pliku %s (Odmowa dostępu)." -#: cps/web.py:3565 +#: cps/web.py:3591 #, python-format msgid "File %s uploaded" msgstr "" @@ -776,7 +790,7 @@ msgid "Ok" msgstr "OK" #: cps/templates/admin.html:112 cps/templates/admin.html:126 -#: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166 +#: cps/templates/book_edit.html:148 cps/templates/book_edit.html:170 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19 @@ -812,7 +826,7 @@ msgstr "" msgid "Delete formats:" msgstr "" -#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165 +#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:169 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74 msgid "Delete" msgstr "" @@ -821,13 +835,13 @@ msgstr "" msgid "Book Title" msgstr "Tytuł książki" -#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:225 -#: cps/templates/book_edit.html:243 cps/templates/search_form.html:10 +#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:229 +#: cps/templates/book_edit.html:247 cps/templates/search_form.html:10 msgid "Author" msgstr "Autor" -#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:230 -#: cps/templates/book_edit.html:245 cps/templates/search_form.html:106 +#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:234 +#: cps/templates/book_edit.html:249 cps/templates/search_form.html:106 msgid "Description" msgstr "Opis" @@ -854,91 +868,95 @@ msgid "" "afterwards empty again)" msgstr "" -#: cps/templates/book_edit.html:65 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:64 +msgid "Upload Cover from local drive" +msgstr "" + +#: cps/templates/book_edit.html:69 cps/templates/detail.html:131 msgid "Publishing date" msgstr "Data publikacji" -#: cps/templates/book_edit.html:72 cps/templates/user_edit.html:33 +#: cps/templates/book_edit.html:76 cps/templates/user_edit.html:33 msgid "Language" msgstr "Język" -#: cps/templates/book_edit.html:83 cps/templates/search_form.html:117 +#: cps/templates/book_edit.html:87 cps/templates/search_form.html:117 msgid "Yes" msgstr "Tak" -#: cps/templates/book_edit.html:84 cps/templates/search_form.html:118 +#: cps/templates/book_edit.html:88 cps/templates/search_form.html:118 msgid "No" msgstr "Nie" -#: cps/templates/book_edit.html:130 +#: cps/templates/book_edit.html:134 msgid "Upload format" msgstr "" -#: cps/templates/book_edit.html:139 +#: cps/templates/book_edit.html:143 msgid "view book after edit" msgstr "wyświetl książkę po edycji" -#: cps/templates/book_edit.html:142 cps/templates/book_edit.html:178 +#: cps/templates/book_edit.html:146 cps/templates/book_edit.html:182 msgid "Get metadata" msgstr "Uzyskaj metadane" -#: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204 +#: cps/templates/book_edit.html:147 cps/templates/config_edit.html:204 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17 #: cps/templates/user_edit.html:151 msgid "Submit" msgstr "Wyślij" -#: cps/templates/book_edit.html:157 +#: cps/templates/book_edit.html:161 msgid "Are you really sure?" msgstr "" -#: cps/templates/book_edit.html:160 +#: cps/templates/book_edit.html:164 msgid "Book will be deleted from Calibre database" msgstr "" -#: cps/templates/book_edit.html:161 +#: cps/templates/book_edit.html:165 msgid "and from hard disk" msgstr "" -#: cps/templates/book_edit.html:181 +#: cps/templates/book_edit.html:185 msgid "Keyword" msgstr "Słowo kluczowe" -#: cps/templates/book_edit.html:182 +#: cps/templates/book_edit.html:186 msgid " Search keyword " msgstr " Szukaj słowa kluczowego " -#: cps/templates/book_edit.html:184 cps/templates/layout.html:46 +#: cps/templates/book_edit.html:188 cps/templates/layout.html:46 msgid "Go!" msgstr "Idź!" -#: cps/templates/book_edit.html:188 +#: cps/templates/book_edit.html:192 msgid "Click the cover to load metadata to the form" msgstr "Kliknij okładkę, aby załadować metadane do formularza" -#: cps/templates/book_edit.html:200 cps/templates/book_edit.html:240 +#: cps/templates/book_edit.html:204 cps/templates/book_edit.html:244 msgid "Loading..." msgstr "Ładowanie..." -#: cps/templates/book_edit.html:205 cps/templates/layout.html:221 +#: cps/templates/book_edit.html:209 cps/templates/layout.html:221 msgid "Close" msgstr "Zamknij" -#: cps/templates/book_edit.html:227 cps/templates/book_edit.html:244 +#: cps/templates/book_edit.html:231 cps/templates/book_edit.html:248 #: cps/templates/detail.html:126 cps/templates/search_form.html:14 msgid "Publisher" msgstr "Wydawca" -#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:246 +#: cps/templates/book_edit.html:236 cps/templates/book_edit.html:250 msgid "Source" msgstr "Źródło" -#: cps/templates/book_edit.html:241 +#: cps/templates/book_edit.html:245 msgid "Search error!" msgstr "Błąd wyszukiwania!" -#: cps/templates/book_edit.html:242 +#: cps/templates/book_edit.html:246 msgid "No Result(s) found! Please try aonther keyword." msgstr "" diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po index 7099c7a8..46532801 100644 --- a/cps/translations/ru/LC_MESSAGES/messages.po +++ b/cps/translations/ru/LC_MESSAGES/messages.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2018-08-28 10:22+0200\n" +"POT-Creation-Date: 2018-08-28 14:05+0200\n" "PO-Revision-Date: 2017-04-30 00:47+0300\n" "Last-Translator: Pavel Korovin \n" "Language: ru\n" @@ -540,24 +540,24 @@ msgstr "Изменить пользователя %(nick)s" msgid "Password for user %s reset" msgstr "" -#: cps/web.py:3170 +#: cps/web.py:3169 msgid "Error opening eBook. File does not exist or file is not accessible" msgstr "" -#: cps/web.py:3185 cps/web.py:3419 cps/web.py:3424 cps/web.py:3579 +#: cps/web.py:3184 cps/web.py:3445 cps/web.py:3450 cps/web.py:3605 msgid "edit metadata" msgstr "изменить метаданные" -#: cps/web.py:3198 cps/web.py:3449 +#: cps/web.py:3197 cps/web.py:3475 #, python-format msgid "File extension \"%s\" is not allowed to be uploaded to this server" msgstr "Запрещена загрузка файлов с расширением \"%s\"" -#: cps/web.py:3201 cps/web.py:3453 +#: cps/web.py:3201 cps/web.py:3479 msgid "File to be uploaded must have an extension" msgstr "Загружаемый файл должен иметь расширение" -#: cps/web.py:3213 cps/web.py:3473 +#: cps/web.py:3213 cps/web.py:3499 #, python-format msgid "Failed to create path %s (Permission denied)." msgstr "Ошибка при создании пути %s (доступ запрещён)" @@ -572,29 +572,43 @@ msgstr "" msgid "File format %s added to %s" msgstr "" -#: cps/web.py:3249 cps/web.py:3253 +#: cps/web.py:3252 +#, python-format +msgid "Failed to create path for cover %s (Permission denied)." +msgstr "" + +#: cps/web.py:3259 +#, python-format +msgid "Failed to store cover-file %s." +msgstr "" + +#: cps/web.py:3262 +msgid "Cover-file is not a valid image file" +msgstr "" + +#: cps/web.py:3275 cps/web.py:3279 msgid "unknown" msgstr "неизвестно" -#: cps/web.py:3275 +#: cps/web.py:3301 msgid "Cover is not a jpg file, can't save" msgstr "" -#: cps/web.py:3428 +#: cps/web.py:3454 msgid "Error editing book, please check logfile for details" msgstr "" -#: cps/web.py:3478 +#: cps/web.py:3504 #, python-format msgid "Failed to store file %s (Permission denied)." msgstr "Ошибка записи файоа %s (доступ запрещён)" -#: cps/web.py:3483 +#: cps/web.py:3509 #, python-format msgid "Failed to delete file %s (Permission denied)." msgstr "Ошибка удаления файла %s (доступ запрещён)" -#: cps/web.py:3565 +#: cps/web.py:3591 #, python-format msgid "File %s uploaded" msgstr "" @@ -778,7 +792,7 @@ msgid "Ok" msgstr "Ok" #: cps/templates/admin.html:112 cps/templates/admin.html:126 -#: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166 +#: cps/templates/book_edit.html:148 cps/templates/book_edit.html:170 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19 @@ -814,7 +828,7 @@ msgstr "Удалить книгу" msgid "Delete formats:" msgstr "" -#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165 +#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:169 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74 msgid "Delete" msgstr "Удалить" @@ -823,13 +837,13 @@ msgstr "Удалить" msgid "Book Title" msgstr "Название" -#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:225 -#: cps/templates/book_edit.html:243 cps/templates/search_form.html:10 +#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:229 +#: cps/templates/book_edit.html:247 cps/templates/search_form.html:10 msgid "Author" msgstr "Автор" -#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:230 -#: cps/templates/book_edit.html:245 cps/templates/search_form.html:106 +#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:234 +#: cps/templates/book_edit.html:249 cps/templates/search_form.html:106 msgid "Description" msgstr "Описание" @@ -856,91 +870,95 @@ msgid "" "afterwards empty again)" msgstr "" -#: cps/templates/book_edit.html:65 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:64 +msgid "Upload Cover from local drive" +msgstr "" + +#: cps/templates/book_edit.html:69 cps/templates/detail.html:131 msgid "Publishing date" msgstr "Опубликовано" -#: cps/templates/book_edit.html:72 cps/templates/user_edit.html:33 +#: cps/templates/book_edit.html:76 cps/templates/user_edit.html:33 msgid "Language" msgstr "Язык" -#: cps/templates/book_edit.html:83 cps/templates/search_form.html:117 +#: cps/templates/book_edit.html:87 cps/templates/search_form.html:117 msgid "Yes" msgstr "Да" -#: cps/templates/book_edit.html:84 cps/templates/search_form.html:118 +#: cps/templates/book_edit.html:88 cps/templates/search_form.html:118 msgid "No" msgstr "Нет" -#: cps/templates/book_edit.html:130 +#: cps/templates/book_edit.html:134 msgid "Upload format" msgstr "" -#: cps/templates/book_edit.html:139 +#: cps/templates/book_edit.html:143 msgid "view book after edit" msgstr "смотреть книгу после редактирования" -#: cps/templates/book_edit.html:142 cps/templates/book_edit.html:178 +#: cps/templates/book_edit.html:146 cps/templates/book_edit.html:182 msgid "Get metadata" msgstr "Получить метаданные" -#: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204 +#: cps/templates/book_edit.html:147 cps/templates/config_edit.html:204 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17 #: cps/templates/user_edit.html:151 msgid "Submit" msgstr "Отправить" -#: cps/templates/book_edit.html:157 +#: cps/templates/book_edit.html:161 msgid "Are you really sure?" msgstr "Вы действительно уверены?" -#: cps/templates/book_edit.html:160 +#: cps/templates/book_edit.html:164 msgid "Book will be deleted from Calibre database" msgstr "Книга будет удалена из БД Calibre" -#: cps/templates/book_edit.html:161 +#: cps/templates/book_edit.html:165 msgid "and from hard disk" msgstr "и с диска" -#: cps/templates/book_edit.html:181 +#: cps/templates/book_edit.html:185 msgid "Keyword" msgstr "Ключевое слово" -#: cps/templates/book_edit.html:182 +#: cps/templates/book_edit.html:186 msgid " Search keyword " msgstr " Поиск по ключевому слову" -#: cps/templates/book_edit.html:184 cps/templates/layout.html:46 +#: cps/templates/book_edit.html:188 cps/templates/layout.html:46 msgid "Go!" msgstr "Искать" -#: cps/templates/book_edit.html:188 +#: cps/templates/book_edit.html:192 msgid "Click the cover to load metadata to the form" msgstr "Нажмите на обложку, чтобы получить метаданные" -#: cps/templates/book_edit.html:200 cps/templates/book_edit.html:240 +#: cps/templates/book_edit.html:204 cps/templates/book_edit.html:244 msgid "Loading..." msgstr "Загрузка..." -#: cps/templates/book_edit.html:205 cps/templates/layout.html:221 +#: cps/templates/book_edit.html:209 cps/templates/layout.html:221 msgid "Close" msgstr "Закрыть" -#: cps/templates/book_edit.html:227 cps/templates/book_edit.html:244 +#: cps/templates/book_edit.html:231 cps/templates/book_edit.html:248 #: cps/templates/detail.html:126 cps/templates/search_form.html:14 msgid "Publisher" msgstr "Издатель" -#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:246 +#: cps/templates/book_edit.html:236 cps/templates/book_edit.html:250 msgid "Source" msgstr "Источник" -#: cps/templates/book_edit.html:241 +#: cps/templates/book_edit.html:245 msgid "Search error!" msgstr "Ошибка поиска!" -#: cps/templates/book_edit.html:242 +#: cps/templates/book_edit.html:246 msgid "No Result(s) found! Please try aonther keyword." msgstr "" diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po index 2f7d7eaf..4e326adc 100644 --- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po +++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Calibre-Web\n" "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n" -"POT-Creation-Date: 2018-08-28 10:22+0200\n" +"POT-Creation-Date: 2018-08-28 14:05+0200\n" "PO-Revision-Date: 2017-01-06 17:00+0000\n" "Last-Translator: dalin \n" "Language: zh_Hans_CN\n" @@ -540,24 +540,24 @@ msgstr "编辑用户 %(nick)s" msgid "Password for user %s reset" msgstr "" -#: cps/web.py:3170 +#: cps/web.py:3169 msgid "Error opening eBook. File does not exist or file is not accessible" msgstr "打开电子书出错。文件不存在或不可访问" -#: cps/web.py:3185 cps/web.py:3419 cps/web.py:3424 cps/web.py:3579 +#: cps/web.py:3184 cps/web.py:3445 cps/web.py:3450 cps/web.py:3605 msgid "edit metadata" msgstr "编辑元数据" -#: cps/web.py:3198 cps/web.py:3449 +#: cps/web.py:3197 cps/web.py:3475 #, python-format msgid "File extension \"%s\" is not allowed to be uploaded to this server" msgstr "不能上传后缀为 \"%s\" 的文件到此服务器" -#: cps/web.py:3201 cps/web.py:3453 +#: cps/web.py:3201 cps/web.py:3479 msgid "File to be uploaded must have an extension" msgstr "要上传的文件必须有一个后缀" -#: cps/web.py:3213 cps/web.py:3473 +#: cps/web.py:3213 cps/web.py:3499 #, python-format msgid "Failed to create path %s (Permission denied)." msgstr "创建路径 %s 失败(权限拒绝)。" @@ -572,29 +572,43 @@ msgstr "" msgid "File format %s added to %s" msgstr "" -#: cps/web.py:3249 cps/web.py:3253 +#: cps/web.py:3252 +#, python-format +msgid "Failed to create path for cover %s (Permission denied)." +msgstr "" + +#: cps/web.py:3259 +#, python-format +msgid "Failed to store cover-file %s." +msgstr "" + +#: cps/web.py:3262 +msgid "Cover-file is not a valid image file" +msgstr "" + +#: cps/web.py:3275 cps/web.py:3279 msgid "unknown" msgstr "未知" -#: cps/web.py:3275 +#: cps/web.py:3301 msgid "Cover is not a jpg file, can't save" msgstr "" -#: cps/web.py:3428 +#: cps/web.py:3454 msgid "Error editing book, please check logfile for details" msgstr "" -#: cps/web.py:3478 +#: cps/web.py:3504 #, python-format msgid "Failed to store file %s (Permission denied)." msgstr "存储文件 %s 失败(权限拒绝)。" -#: cps/web.py:3483 +#: cps/web.py:3509 #, python-format msgid "Failed to delete file %s (Permission denied)." msgstr "删除文件 %s 失败(权限拒绝)。" -#: cps/web.py:3565 +#: cps/web.py:3591 #, python-format msgid "File %s uploaded" msgstr "" @@ -778,7 +792,7 @@ msgid "Ok" msgstr "确定" #: cps/templates/admin.html:112 cps/templates/admin.html:126 -#: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166 +#: cps/templates/book_edit.html:148 cps/templates/book_edit.html:170 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19 @@ -814,7 +828,7 @@ msgstr "删除书籍" msgid "Delete formats:" msgstr "" -#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165 +#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:169 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74 msgid "Delete" msgstr "删除" @@ -823,13 +837,13 @@ msgstr "删除" msgid "Book Title" msgstr "书名" -#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:225 -#: cps/templates/book_edit.html:243 cps/templates/search_form.html:10 +#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:229 +#: cps/templates/book_edit.html:247 cps/templates/search_form.html:10 msgid "Author" msgstr "作者" -#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:230 -#: cps/templates/book_edit.html:245 cps/templates/search_form.html:106 +#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:234 +#: cps/templates/book_edit.html:249 cps/templates/search_form.html:106 msgid "Description" msgstr "简介" @@ -856,91 +870,95 @@ msgid "" "afterwards empty again)" msgstr "" -#: cps/templates/book_edit.html:65 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:64 +msgid "Upload Cover from local drive" +msgstr "" + +#: cps/templates/book_edit.html:69 cps/templates/detail.html:131 msgid "Publishing date" msgstr "出版日期" -#: cps/templates/book_edit.html:72 cps/templates/user_edit.html:33 +#: cps/templates/book_edit.html:76 cps/templates/user_edit.html:33 msgid "Language" msgstr "语言" -#: cps/templates/book_edit.html:83 cps/templates/search_form.html:117 +#: cps/templates/book_edit.html:87 cps/templates/search_form.html:117 msgid "Yes" msgstr "确认" -#: cps/templates/book_edit.html:84 cps/templates/search_form.html:118 +#: cps/templates/book_edit.html:88 cps/templates/search_form.html:118 msgid "No" msgstr "" -#: cps/templates/book_edit.html:130 +#: cps/templates/book_edit.html:134 msgid "Upload format" msgstr "" -#: cps/templates/book_edit.html:139 +#: cps/templates/book_edit.html:143 msgid "view book after edit" msgstr "编辑后查看书籍" -#: cps/templates/book_edit.html:142 cps/templates/book_edit.html:178 +#: cps/templates/book_edit.html:146 cps/templates/book_edit.html:182 msgid "Get metadata" msgstr "获取元数据" -#: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204 +#: cps/templates/book_edit.html:147 cps/templates/config_edit.html:204 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17 #: cps/templates/user_edit.html:151 msgid "Submit" msgstr "提交" -#: cps/templates/book_edit.html:157 +#: cps/templates/book_edit.html:161 msgid "Are you really sure?" msgstr "您真的确认?" -#: cps/templates/book_edit.html:160 +#: cps/templates/book_edit.html:164 msgid "Book will be deleted from Calibre database" msgstr "书籍会被从Calibre数据库和硬盘中删除" -#: cps/templates/book_edit.html:161 +#: cps/templates/book_edit.html:165 msgid "and from hard disk" msgstr "" -#: cps/templates/book_edit.html:181 +#: cps/templates/book_edit.html:185 msgid "Keyword" msgstr "关键字" -#: cps/templates/book_edit.html:182 +#: cps/templates/book_edit.html:186 msgid " Search keyword " msgstr "搜索关键字" -#: cps/templates/book_edit.html:184 cps/templates/layout.html:46 +#: cps/templates/book_edit.html:188 cps/templates/layout.html:46 msgid "Go!" msgstr "走起!" -#: cps/templates/book_edit.html:188 +#: cps/templates/book_edit.html:192 msgid "Click the cover to load metadata to the form" msgstr "点击封面加载元数据到表单" -#: cps/templates/book_edit.html:200 cps/templates/book_edit.html:240 +#: cps/templates/book_edit.html:204 cps/templates/book_edit.html:244 msgid "Loading..." msgstr "加载中..." -#: cps/templates/book_edit.html:205 cps/templates/layout.html:221 +#: cps/templates/book_edit.html:209 cps/templates/layout.html:221 msgid "Close" msgstr "关闭" -#: cps/templates/book_edit.html:227 cps/templates/book_edit.html:244 +#: cps/templates/book_edit.html:231 cps/templates/book_edit.html:248 #: cps/templates/detail.html:126 cps/templates/search_form.html:14 msgid "Publisher" msgstr "出版社" -#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:246 +#: cps/templates/book_edit.html:236 cps/templates/book_edit.html:250 msgid "Source" msgstr "来源" -#: cps/templates/book_edit.html:241 +#: cps/templates/book_edit.html:245 msgid "Search error!" msgstr "搜索错误" -#: cps/templates/book_edit.html:242 +#: cps/templates/book_edit.html:246 msgid "No Result(s) found! Please try aonther keyword." msgstr "" diff --git a/cps/web.py b/cps/web.py index 0d2db20c..27bcd8c6 100644 --- a/cps/web.py +++ b/cps/web.py @@ -3153,7 +3153,6 @@ def reset_password(user_id): return redirect(url_for('admin')) - @app.route("/admin/book/", methods=['GET', 'POST']) @login_required_if_no_ano @edit_required @@ -3170,14 +3169,14 @@ def edit_book(book_id): flash(_(u"Error opening eBook. File does not exist or file is not accessible"), category="error") return redirect(url_for("index")) - for index in range(0, len(book.languages)): + for indx in range(0, len(book.languages)): try: - book.languages[index].language_name = LC.parse(book.languages[index].lang_code).get_language_name( + book.languages[indx].language_name = LC.parse(book.languages[indx].lang_code).get_language_name( get_locale()) except Exception: - book.languages[index].language_name = _(isoLanguages.get(part3=book.languages[index].lang_code).name) - for author in book.authors: - author_names.append(author.name.replace('|', ',')) + book.languages[indx].language_name = _(isoLanguages.get(part3=book.languages[indx].lang_code).name) + for authr in book.authors: + author_names.append(authr.name.replace('|', ',')) # Show form if request.method != 'POST': @@ -3185,7 +3184,7 @@ def edit_book(book_id): title=_(u"edit metadata"), page="editbook") # Update book - edited_books_id = set() + edited_books_id = {} # Check and handle Uploaded file if 'btn-upload-format' in request.files: @@ -3195,7 +3194,8 @@ def edit_book(book_id): if '.' in requested_file.filename: file_ext = requested_file.filename.rsplit('.', 1)[-1].lower() if file_ext not in ALLOWED_EXTENSIONS: - flash(_('File extension "%s" is not allowed to be uploaded to this server' % file_ext), category="error") + flash(_('File extension "%s" is not allowed to be uploaded to this server' % file_ext), + category="error") return redirect(url_for('show_book', book_id=book.id)) else: flash(_('File to be uploaded must have an extension'), category="error") @@ -3231,10 +3231,36 @@ def edit_book(book_id): db.session.connection().connection.connection.create_function("title_sort", 1, db.title_sort) # Queue uploader info - uploadText=_(u"File format %s added to %s" % (file_ext.upper(),book.title)) + uploadText=_(u"File format %s added to %s" % (file_ext.upper(), book.title)) helper.global_WorkerThread.add_upload(current_user.nickname, - ""+ uploadText + "") + "" + uploadText + "") + if 'btn-upload-cover' in request.files: + requested_file = request.files['btn-upload-cover'] + # check for empty request + if requested_file.filename != '': + file_ext = requested_file.filename.rsplit('.', 1)[-1].lower() + # file_name = book.path.rsplit('/', 1)[-1] + filepath = os.path.normpath(os.path.join(config.config_calibre_dir, book.path)) + saved_filename = os.path.join(filepath, 'cover.' + file_ext) + + # check if file path exists, otherwise create it, copy file to calibre path and delete temp file + if not os.path.exists(filepath): + try: + os.makedirs(filepath) + except OSError: + flash(_(u"Failed to create path for cover %s (Permission denied)." % filepath), category="error") + return redirect(url_for('show_book', book_id=book.id)) + try: + requested_file.save(saved_filename) + # im=Image.open(saved_filename) + book.has_cover = 1 + except OSError: + flash(_(u"Failed to store cover-file %s." % saved_filename), category="error") + return redirect(url_for('show_book', book_id=book.id)) + except IOError: + flash(_(u"Cover-file is not a valid image file" % saved_filename), category="error") + return redirect(url_for('show_book', book_id=book.id)) to_save = request.form.to_dict() try: @@ -3410,8 +3436,8 @@ def edit_book(book_id): if config.config_use_google_drive: gdriveutils.updateGdriveCalibreFromLocal() author_names = [] - for author in book.authors: - author_names.append(author.name) + for authr in book.authors: + author_names.append(authr.name) if "detail_view" in to_save: return redirect(url_for('show_book', book_id=book.id)) else: @@ -3456,12 +3482,12 @@ def upload(): # extract metadata from file meta = uploader.upload(requested_file) title = meta.title - author = meta.author + authr = meta.author tags = meta.tags series = meta.series series_index = meta.series_id title_dir = helper.get_valid_filename(title) - author_dir = helper.get_valid_filename(author) + author_dir = helper.get_valid_filename(authr) filepath = os.path.join(config.config_calibre_dir, author_dir, title_dir) saved_filename = os.path.join(filepath, title_dir + meta.extension.lower()) @@ -3490,11 +3516,11 @@ def upload(): move(meta.cover, os.path.join(filepath, "cover.jpg")) # handle authors - is_author = db.session.query(db.Authors).filter(db.Authors.name == author).first() + is_author = db.session.query(db.Authors).filter(db.Authors.name == authr).first() if is_author: db_author = is_author else: - db_author = db.Authors(author, helper.get_sorted_author(author), "") + db_author = db.Authors(authr, helper.get_sorted_author(authr), "") db.session.add(db_author) # handle series diff --git a/messages.pot b/messages.pot index 4fd4bd3c..22192793 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: 2018-08-28 10:22+0200\n" +"POT-Creation-Date: 2018-08-28 14:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -529,24 +529,24 @@ msgstr "" msgid "Password for user %s reset" msgstr "" -#: cps/web.py:3170 +#: cps/web.py:3169 msgid "Error opening eBook. File does not exist or file is not accessible" msgstr "" -#: cps/web.py:3185 cps/web.py:3419 cps/web.py:3424 cps/web.py:3579 +#: cps/web.py:3184 cps/web.py:3445 cps/web.py:3450 cps/web.py:3605 msgid "edit metadata" msgstr "" -#: cps/web.py:3198 cps/web.py:3449 +#: cps/web.py:3197 cps/web.py:3475 #, python-format msgid "File extension \"%s\" is not allowed to be uploaded to this server" msgstr "" -#: cps/web.py:3201 cps/web.py:3453 +#: cps/web.py:3201 cps/web.py:3479 msgid "File to be uploaded must have an extension" msgstr "" -#: cps/web.py:3213 cps/web.py:3473 +#: cps/web.py:3213 cps/web.py:3499 #, python-format msgid "Failed to create path %s (Permission denied)." msgstr "" @@ -561,29 +561,43 @@ msgstr "" msgid "File format %s added to %s" msgstr "" -#: cps/web.py:3249 cps/web.py:3253 +#: cps/web.py:3252 +#, python-format +msgid "Failed to create path for cover %s (Permission denied)." +msgstr "" + +#: cps/web.py:3259 +#, python-format +msgid "Failed to store cover-file %s." +msgstr "" + +#: cps/web.py:3262 +msgid "Cover-file is not a valid image file" +msgstr "" + +#: cps/web.py:3275 cps/web.py:3279 msgid "unknown" msgstr "" -#: cps/web.py:3275 +#: cps/web.py:3301 msgid "Cover is not a jpg file, can't save" msgstr "" -#: cps/web.py:3428 +#: cps/web.py:3454 msgid "Error editing book, please check logfile for details" msgstr "" -#: cps/web.py:3478 +#: cps/web.py:3504 #, python-format msgid "Failed to store file %s (Permission denied)." msgstr "" -#: cps/web.py:3483 +#: cps/web.py:3509 #, python-format msgid "Failed to delete file %s (Permission denied)." msgstr "" -#: cps/web.py:3565 +#: cps/web.py:3591 #, python-format msgid "File %s uploaded" msgstr "" @@ -767,7 +781,7 @@ msgid "Ok" msgstr "" #: cps/templates/admin.html:112 cps/templates/admin.html:126 -#: cps/templates/book_edit.html:144 cps/templates/book_edit.html:166 +#: cps/templates/book_edit.html:148 cps/templates/book_edit.html:170 #: cps/templates/config_edit.html:206 cps/templates/config_view_edit.html:164 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19 @@ -803,7 +817,7 @@ msgstr "" msgid "Delete formats:" msgstr "" -#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:165 +#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:169 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74 msgid "Delete" msgstr "" @@ -812,13 +826,13 @@ msgstr "" msgid "Book Title" msgstr "" -#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:225 -#: cps/templates/book_edit.html:243 cps/templates/search_form.html:10 +#: cps/templates/book_edit.html:35 cps/templates/book_edit.html:229 +#: cps/templates/book_edit.html:247 cps/templates/search_form.html:10 msgid "Author" msgstr "" -#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:230 -#: cps/templates/book_edit.html:245 cps/templates/search_form.html:106 +#: cps/templates/book_edit.html:39 cps/templates/book_edit.html:234 +#: cps/templates/book_edit.html:249 cps/templates/search_form.html:106 msgid "Description" msgstr "" @@ -843,91 +857,95 @@ msgstr "" msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)" msgstr "" -#: cps/templates/book_edit.html:65 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:64 +msgid "Upload Cover from local drive" +msgstr "" + +#: cps/templates/book_edit.html:69 cps/templates/detail.html:131 msgid "Publishing date" msgstr "" -#: cps/templates/book_edit.html:72 cps/templates/user_edit.html:33 +#: cps/templates/book_edit.html:76 cps/templates/user_edit.html:33 msgid "Language" msgstr "" -#: cps/templates/book_edit.html:83 cps/templates/search_form.html:117 +#: cps/templates/book_edit.html:87 cps/templates/search_form.html:117 msgid "Yes" msgstr "" -#: cps/templates/book_edit.html:84 cps/templates/search_form.html:118 +#: cps/templates/book_edit.html:88 cps/templates/search_form.html:118 msgid "No" msgstr "" -#: cps/templates/book_edit.html:130 +#: cps/templates/book_edit.html:134 msgid "Upload format" msgstr "" -#: cps/templates/book_edit.html:139 +#: cps/templates/book_edit.html:143 msgid "view book after edit" msgstr "" -#: cps/templates/book_edit.html:142 cps/templates/book_edit.html:178 +#: cps/templates/book_edit.html:146 cps/templates/book_edit.html:182 msgid "Get metadata" msgstr "" -#: cps/templates/book_edit.html:143 cps/templates/config_edit.html:204 +#: cps/templates/book_edit.html:147 cps/templates/config_edit.html:204 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17 #: cps/templates/user_edit.html:151 msgid "Submit" msgstr "" -#: cps/templates/book_edit.html:157 +#: cps/templates/book_edit.html:161 msgid "Are you really sure?" msgstr "" -#: cps/templates/book_edit.html:160 +#: cps/templates/book_edit.html:164 msgid "Book will be deleted from Calibre database" msgstr "" -#: cps/templates/book_edit.html:161 +#: cps/templates/book_edit.html:165 msgid "and from hard disk" msgstr "" -#: cps/templates/book_edit.html:181 +#: cps/templates/book_edit.html:185 msgid "Keyword" msgstr "" -#: cps/templates/book_edit.html:182 +#: cps/templates/book_edit.html:186 msgid " Search keyword " msgstr "" -#: cps/templates/book_edit.html:184 cps/templates/layout.html:46 +#: cps/templates/book_edit.html:188 cps/templates/layout.html:46 msgid "Go!" msgstr "" -#: cps/templates/book_edit.html:188 +#: cps/templates/book_edit.html:192 msgid "Click the cover to load metadata to the form" msgstr "" -#: cps/templates/book_edit.html:200 cps/templates/book_edit.html:240 +#: cps/templates/book_edit.html:204 cps/templates/book_edit.html:244 msgid "Loading..." msgstr "" -#: cps/templates/book_edit.html:205 cps/templates/layout.html:221 +#: cps/templates/book_edit.html:209 cps/templates/layout.html:221 msgid "Close" msgstr "" -#: cps/templates/book_edit.html:227 cps/templates/book_edit.html:244 +#: cps/templates/book_edit.html:231 cps/templates/book_edit.html:248 #: cps/templates/detail.html:126 cps/templates/search_form.html:14 msgid "Publisher" msgstr "" -#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:246 +#: cps/templates/book_edit.html:236 cps/templates/book_edit.html:250 msgid "Source" msgstr "" -#: cps/templates/book_edit.html:241 +#: cps/templates/book_edit.html:245 msgid "Search error!" msgstr "" -#: cps/templates/book_edit.html:242 +#: cps/templates/book_edit.html:246 msgid "No Result(s) found! Please try aonther keyword." msgstr ""