Fix for magic link with python 3

cps/templates/readpdf.html

@@ -124,7 +124,7 @@ See https://github.com/adobe-type-tools/cmap-resources
               <span data-l10n-id="print_label">Print</span>
             </button>
 
-            <button id="secondaryDownload" class="secondaryToolbarButton download visibleMediumView" title="Download" tabindex="54" data-l10n-id="download">
+            <button id="secondaryDownload" class="secondaryToolbarButton download visibleMediumView" title="Download" tabindex="54" data-l10n-id="download" {% if not g.user.role_download() %} style="display:none;" {% endif %}>
               <span data-l10n-id="download_label">Download</span>
             </button>
 
@@ -227,7 +227,7 @@ See https://github.com/adobe-type-tools/cmap-resources
                   <span data-l10n-id="print_label">Print</span>
                 </button>
 
-                <button id="download" class="toolbarButton download hiddenMediumView" title="Download" tabindex="34" data-l10n-id="download">
+                <button id="download" class="toolbarButton download hiddenMediumView" title="Download" tabindex="34" data-l10n-id="download" {% if not g.user.role_download() %} style="display:none;" {% endif %}>
                   <span data-l10n-id="download_label">Download</span>
                 </button>
                 <a href="#" id="viewBookmark" class="toolbarButton bookmark hiddenSmallView" title="Current view (copy or open in new window)" tabindex="35" data-l10n-id="bookmark">

cps/templates/remote_login.html

@@ -3,13 +3,13 @@
 <div class="well">
   <h2 style="margin-top: 0">{{_('Remote login')}}</h2>
   <p>
-    {{_('Using your another device, visit')}} <a href="{{verify_url}}">{{verify_url}}</a> {{_('and log in')}}.
+    {{_('Using your another device, login and visit ')}} <a href="{{verify_url}}">{{verify_url}}</a>.
   </p>
   <p>
     {{_('Once you do so, you will automatically get logged in on this device.')}}
   </p>
   <p>
-    {{_('The link will expire after %s minutes.' % 10)}}
+    {{_('The link will expire after 10 minutes.')}}
   </p>
 </div>
 {% endblock %}

cps/translations/de/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2019-05-08 20:23+0200\n"
+"POT-Creation-Date: 2019-05-26 11:29+0200\n"
 "PO-Revision-Date: 2019-05-08 20:23+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -126,39 +126,39 @@ msgstr "Fehler bei der Ausführung von UnRar"
 msgid "Unrar binary file not found"
 msgstr "UnRar Datei nicht gefunden"
 
-#: cps/helper.py:589
+#: cps/helper.py:585
 msgid "Waiting"
 msgstr "Wartend"
 
-#: cps/helper.py:591
+#: cps/helper.py:587
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cps/helper.py:593
+#: cps/helper.py:589
 msgid "Started"
 msgstr "Gestartet"
 
-#: cps/helper.py:595
+#: cps/helper.py:591
 msgid "Finished"
 msgstr "Beendet"
 
-#: cps/helper.py:597
+#: cps/helper.py:593
 msgid "Unknown Status"
 msgstr "Unbekannter Status"
 
-#: cps/helper.py:602
+#: cps/helper.py:598
 msgid "E-mail: "
 msgstr "E-Mail: "
 
-#: cps/helper.py:604 cps/helper.py:608
+#: cps/helper.py:600 cps/helper.py:604
 msgid "Convert: "
 msgstr "Konvertiere: "
 
-#: cps/helper.py:606
+#: cps/helper.py:602
 msgid "Upload: "
 msgstr "Upload: "
 
-#: cps/helper.py:610
+#: cps/helper.py:606
 msgid "Unknown Task: "
 msgstr "Unbekannte Aufgabe: "
 
@@ -203,7 +203,7 @@ msgstr "Keine Release Informationen verfügbar"
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Ein neues Update ist verfügbar. Klicke auf den Button unten, um auf Version: %(version)s zu aktualisieren"
 
-#: cps/updater.py:491 cps/web.py:2801
+#: cps/updater.py:491 cps/web.py:2795
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -271,7 +271,7 @@ msgstr "Best bewertete Bücher"
 msgid "Random Books"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2167
+#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
 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:"
 
@@ -311,437 +311,437 @@ msgstr "Kategorieliste"
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/templates/layout.html:73 cps/web.py:1654
+#: cps/templates/layout.html:73 cps/web.py:1648
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:1688
+#: cps/web.py:1682
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/web.py:1756
+#: cps/web.py:1750
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr "Google Drive setup is nicht komplett, bitte versuche Google Drive zu deaktivieren und aktiviere es anschließend wieder"
 
-#: cps/web.py:1801
+#: cps/web.py:1795
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback Domain ist nicht verifiziert, bitte Domain in der Google Developer Console verifizieren"
 
-#: cps/web.py:1877
+#: cps/web.py:1871
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet,bitte Seite neu laden"
 
-#: cps/web.py:1880
+#: cps/web.py:1874
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird runtergefahren, bitte Fenster schließen"
 
-#: cps/web.py:1959
+#: cps/web.py:1953
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:1966
+#: cps/web.py:1960
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:1980
+#: cps/web.py:1974
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:1982
+#: cps/web.py:1976
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:2042 cps/web.py:2051
+#: cps/web.py:2036 cps/web.py:2045
 msgid "search"
 msgstr "Suche"
 
 #: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2122
+#: cps/templates/layout.html:148 cps/web.py:2116
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
 #: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2125
+#: cps/templates/layout.html:150 cps/web.py:2119
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
-#: cps/web.py:2177 cps/web.py:2179 cps/web.py:2181 cps/web.py:2193
+#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/web.py:2205
+#: cps/web.py:2199
 msgid "Error opening eBook. Fileformat is not supported."
 msgstr "Fehler beim Öffnen des Buches, das Format wird nicht unterstützt"
 
-#: cps/web.py:2255 cps/web.py:3176
+#: cps/web.py:2249 cps/web.py:3170
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/web.py:2256 cps/web.py:2278 cps/web.py:2282 cps/web.py:2287
-#: cps/web.py:2289
+#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
+#: cps/web.py:2283
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:2277 cps/web.py:3395
+#: cps/web.py:2271 cps/web.py:3389
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/web.py:2280
+#: cps/web.py:2274
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:2283
+#: cps/web.py:2277
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Eine Bestätigungs E-Mail wurde an den E-Mail Account versendet."
 
-#: cps/web.py:2286
+#: cps/web.py:2280
 msgid "This username or e-mail address is already in use."
 msgstr "Benutzername oder E-Mailadresse ist bereits in Verwendung."
 
-#: cps/web.py:2303 cps/web.py:2399
+#: cps/web.py:2297 cps/web.py:2393
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/web.py:2308
+#: cps/web.py:2302
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:2314 cps/web.py:2335
+#: cps/web.py:2308 cps/web.py:2329
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:2347 cps/web.py:2378
+#: cps/web.py:2341 cps/web.py:2372
 msgid "Token not found"
 msgstr "Token wurde nicht gefunden"
 
-#: cps/web.py:2355 cps/web.py:2386
+#: cps/web.py:2349 cps/web.py:2380
 msgid "Token has expired"
 msgstr "Das Token ist abgelaufen"
 
-#: cps/web.py:2363
+#: cps/web.py:2357
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/web.py:2413
+#: cps/web.py:2407
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP Mail Einstellung konfigurieren ..."
 
-#: cps/web.py:2418
+#: cps/web.py:2412
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:2422
+#: cps/web.py:2416
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Beim Senden des Buchs trat ein Fehler auf: %(res)s"
 
-#: cps/web.py:2424 cps/web.py:3229
+#: cps/web.py:2418 cps/web.py:3223
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
 
-#: cps/web.py:2435 cps/web.py:2487
+#: cps/web.py:2429 cps/web.py:2481
 msgid "Invalid shelf specified"
 msgstr "Ungültiges Bücherregal angegeben"
 
-#: cps/web.py:2442
+#: cps/web.py:2436
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Keine Erlaubnis ein Buch zum Bücherregale %(shelfname)s hinzuzufügen vorhanden"
 
-#: cps/web.py:2450
+#: cps/web.py:2444
 msgid "You are not allowed to edit public shelves"
 msgstr "Keine Erlaubnis öffentliche Bücherregale zu editieren vorhanden"
 
-#: cps/web.py:2459
+#: cps/web.py:2453
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr "Buch ist bereits Teil des Bücherregals %(shelfname)s"
 
-#: cps/web.py:2473
+#: cps/web.py:2467
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Das Buch wurde dem Bücherregal: %(sname)s hinzugefügt"
 
-#: cps/web.py:2492
+#: cps/web.py:2486
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Keine Erlaubnis ein Buch zum Bücherregal %(name)s  hinzuzufügen"
 
-#: cps/web.py:2497
+#: cps/web.py:2491
 msgid "User is not allowed to edit public shelves"
 msgstr "Benutzer hat keine Erlaubnis öffentliche Bücherregale zu editieren"
 
-#: cps/web.py:2515
+#: cps/web.py:2509
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Bücher sind bereits Teil des Bücherregals %(name)s"
 
-#: cps/web.py:2529
+#: cps/web.py:2523
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "Bücher wurden zum Bücherregal %(sname)s hinzugefügt"
 
-#: cps/web.py:2531
+#: cps/web.py:2525
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Bücher konnten nicht zum Bücherregal %(sname)s hinzugefügt werden"
 
-#: cps/web.py:2568
+#: cps/web.py:2562
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 
-#: cps/web.py:2574
+#: cps/web.py:2568
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Keine Erlaubnis das Buch aus dem Bücherregal %(sname)s zu entfernen"
 
-#: cps/web.py:2595 cps/web.py:2619
+#: cps/web.py:2589 cps/web.py:2613
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Es existiert bereits ein Bücheregal mit dem Titel '%(title)s'."
 
-#: cps/web.py:2600
+#: cps/web.py:2594
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/web.py:2602 cps/web.py:2630
+#: cps/web.py:2596 cps/web.py:2624
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/web.py:2603 cps/web.py:2605
+#: cps/web.py:2597 cps/web.py:2599
 msgid "create a shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/web.py:2628
+#: cps/web.py:2622
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/web.py:2631 cps/web.py:2633
+#: cps/web.py:2625 cps/web.py:2627
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/web.py:2654
+#: cps/web.py:2648
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Bücherregal %(name)s erfolgreich gelöscht"
 
-#: cps/web.py:2681
+#: cps/web.py:2675
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/web.py:2684
+#: cps/web.py:2678
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Fehler beim Öffnen. Bücherregel exisitert nicht oder ist nicht zugänglich"
 
-#: cps/web.py:2715
+#: cps/web.py:2709
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/web.py:2744 cps/web.py:3182
+#: cps/web.py:2738 cps/web.py:3176
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail ist nicht Teil einer gültigen Domain"
 
-#: cps/web.py:2746 cps/web.py:2788 cps/web.py:2791
+#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:2786
+#: cps/web.py:2780
 msgid "Found an existing account for this e-mail address."
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse."
 
-#: cps/web.py:2789
+#: cps/web.py:2783
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:2820
+#: cps/web.py:2814
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/web.py:2905 cps/web.py:3085
+#: cps/web.py:2899 cps/web.py:3079
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web Konfiguration wurde aktualisiert"
 
-#: cps/templates/admin.html:100 cps/web.py:2919
+#: cps/templates/admin.html:100 cps/web.py:2913
 msgid "UI Configuration"
 msgstr "Konfiguration Benutzeroberfläche"
 
-#: cps/web.py:2937
+#: cps/web.py:2931
 msgid "Import of optional Google Drive requirements missing"
 msgstr "Optionale Abhängigkeiten für Google Drive fehlen"
 
-#: cps/web.py:2940
+#: cps/web.py:2934
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json nicht vorhanden, oder nicht lesbar"
 
-#: cps/web.py:2945 cps/web.py:2974
+#: cps/web.py:2939 cps/web.py:2968
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json nicht als Webapplication konfiguriert"
 
-#: cps/templates/admin.html:99 cps/web.py:2977 cps/web.py:3003 cps/web.py:3015
-#: cps/web.py:3060 cps/web.py:3075 cps/web.py:3094 cps/web.py:3102
-#: cps/web.py:3118
+#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
+#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
+#: cps/web.py:3112
 msgid "Basic Configuration"
 msgstr "Basis Konfiguration"
 
-#: cps/web.py:3000
+#: cps/web.py:2994
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "SSL-Keydatei Speicherort ist ungültig, bitte gültigen Pfad angeben"
 
-#: cps/web.py:3012
+#: cps/web.py:3006
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "SSL-Certdatei Speicherort ist ungültig, bitte gültigen Pfad angeben"
 
-#: cps/web.py:3057
+#: cps/web.py:3051
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "Speicherort Logdatei ist ungültig, bitte Pfad korrigieren"
 
-#: cps/web.py:3098
+#: cps/web.py:3092
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB Speicherort ist ungültig, bitte Pfad korrigieren"
 
-#: cps/templates/admin.html:33 cps/web.py:3178 cps/web.py:3184 cps/web.py:3200
+#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/web.py:3190
+#: cps/web.py:3184
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/web.py:3194
+#: cps/web.py:3188
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder Benutzernamen."
 
-#: cps/web.py:3224
+#: cps/web.py:3218
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test E-Mail wurde erfolgreich an %(kindlemail)s versendet"
 
-#: cps/web.py:3227
+#: cps/web.py:3221
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Es trat ein Fehler beim Versenden der Test E-Mail auf: %(res)s"
 
-#: cps/web.py:3231
+#: cps/web.py:3225
 msgid "E-mail server settings updated"
 msgstr "E-Mail Server Einstellungen aktualisiert"
 
-#: cps/web.py:3232
+#: cps/web.py:3226
 msgid "Edit e-mail server settings"
 msgstr "E-Mail Server Einstellungen bearbeiten"
 
-#: cps/web.py:3257
+#: cps/web.py:3251
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/web.py:3370
+#: cps/web.py:3364
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/web.py:3373
+#: cps/web.py:3367
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekannter Fehler aufgetreten."
 
-#: cps/web.py:3375
+#: cps/web.py:3369
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/web.py:3392
+#: cps/web.py:3386
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/web.py:3406 cps/web.py:3598
+#: cps/web.py:3400 cps/web.py:3592
 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:3434
+#: cps/web.py:3428
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/web.py:3527 cps/web.py:3760
+#: cps/web.py:3521 cps/web.py:3754
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Dateiendung '%(ext)s' kann nicht auf diesen Server hochgeladen werden"
 
-#: cps/web.py:3531 cps/web.py:3763
+#: cps/web.py:3525 cps/web.py:3757
 msgid "File to be uploaded must have an extension"
 msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/web.py:3543 cps/web.py:3782
+#: cps/web.py:3537 cps/web.py:3776
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
 
-#: cps/web.py:3548
+#: cps/web.py:3542
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fehler beim speichern der Datei %(file)s."
 
-#: cps/web.py:3565
+#: cps/web.py:3559
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Dateiformat %(ext)s zu %(book)s hinzugefügt"
 
-#: cps/web.py:3579 cps/web.py:3652
+#: cps/web.py:3573 cps/web.py:3646
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr "Cover ist keine unterstütztes Bildformat (jpg/png/webp) und kann nicht abgespeichert werden"
 
-#: cps/web.py:3611 cps/web.py:3620
+#: cps/web.py:3605 cps/web.py:3614
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: cps/web.py:3700
+#: cps/web.py:3694
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s ist keine gültige Sprache"
 
-#: cps/web.py:3731
+#: cps/web.py:3725
 msgid "Metadata successfully updated"
 msgstr "Metadaten wurden erfolgreich aktualisiert"
 
-#: cps/web.py:3740
+#: cps/web.py:3734
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim Editieren des Buchs, Details im Logfile"
 
-#: cps/web.py:3786
+#: cps/web.py:3780
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Fehler beim speichern der Datei %(file)s (Zugriff verweigert)"
 
-#: cps/web.py:3791
+#: cps/web.py:3785
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Fehler beim Löschen von Datei %(file)s (Zugriff verweigert)"
 
-#: cps/web.py:3873
+#: cps/web.py:3867
 #, python-format
 msgid "File %(title)s"
 msgstr "Datei %(title)s"
 
-#: cps/web.py:3902
+#: cps/web.py:3896
 msgid "Source or destination format for conversion missing"
 msgstr "Quell- oder Zielformat für Konvertierung fehlt"
 
-#: cps/web.py:3912
+#: cps/web.py:3906
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Buch wurde erfolgreich für die Konvertierung in das %(book_format)s Format eingereiht"
 
-#: cps/web.py:3916
+#: cps/web.py:3910
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Es trat ein Fehlker beim Konvertieren des Buches auf: %(res)s"
@@ -1833,17 +1833,17 @@ msgid "Your email address"
 msgstr "Deine E-Mail Adresse"
 
 #: cps/templates/remote_login.html:6
-msgid "Using your another device, visit"
-msgstr "Benutze das andere Gerät und besuche"
-
-#: cps/templates/remote_login.html:6
-msgid "and log in"
-msgstr "und logge Dich ein"
+msgid "Using your another device, login and visit "
+msgstr ""
 
 #: cps/templates/remote_login.html:9
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr "Danach wirst Du automatisch auf diesem Gerät eingeloggt sein."
 
+#: cps/templates/remote_login.html:12
+msgid "The link will expire after 10 minutes."
+msgstr ""
+
 #: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr "Keine Ergebnisse für:"
@@ -2019,3 +2019,9 @@ msgstr "Letzte Downloads"
 #~ msgid "Preparing document for printing..."
 #~ msgstr "Bereite Dokument zum Ducken vor..."
 
+#~ msgid "Using your another device, visit"
+#~ msgstr "Benutze das andere Gerät und besuche"
+
+#~ msgid "and log in"
+#~ msgstr "und logge Dich ein"
+

cps/ub.py

@@ -356,7 +356,7 @@ class RemoteAuthToken(Base):
     expiration = Column(DateTime)
 
     def __init__(self):
-        self.auth_token = hexlify(os.urandom(4))
+        self.auth_token = (hexlify(os.urandom(4))).decode('utf-8')
         self.expiration = datetime.datetime.now() + datetime.timedelta(minutes=10)  # 10 min from now
 
     def __repr__(self):

messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-05-08 20:23+0200\n"
+"POT-Creation-Date: 2019-05-26 11:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -125,39 +125,39 @@ msgstr ""
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:589
+#: cps/helper.py:585
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:591
+#: cps/helper.py:587
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:593
+#: cps/helper.py:589
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:595
+#: cps/helper.py:591
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:597
+#: cps/helper.py:593
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/helper.py:602
+#: cps/helper.py:598
 msgid "E-mail: "
 msgstr ""
 
-#: cps/helper.py:604 cps/helper.py:608
+#: cps/helper.py:600 cps/helper.py:604
 msgid "Convert: "
 msgstr ""
 
-#: cps/helper.py:606
+#: cps/helper.py:602
 msgid "Upload: "
 msgstr ""
 
-#: cps/helper.py:610
+#: cps/helper.py:606
 msgid "Unknown Task: "
 msgstr ""
 
@@ -202,7 +202,7 @@ msgstr ""
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:491 cps/web.py:2801
+#: cps/updater.py:491 cps/web.py:2795
 msgid "Unknown"
 msgstr ""
 
@@ -270,7 +270,7 @@ msgstr ""
 msgid "Random Books"
 msgstr ""
 
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2167
+#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 
@@ -310,437 +310,437 @@ msgstr ""
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:73 cps/web.py:1654
+#: cps/templates/layout.html:73 cps/web.py:1648
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1688
+#: cps/web.py:1682
 msgid "Statistics"
 msgstr ""
 
-#: cps/web.py:1756
+#: cps/web.py:1750
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
 msgstr ""
 
-#: cps/web.py:1801
+#: cps/web.py:1795
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/web.py:1877
+#: cps/web.py:1871
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/web.py:1880
+#: cps/web.py:1874
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/web.py:1959
+#: cps/web.py:1953
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1966
+#: cps/web.py:1960
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1980
+#: cps/web.py:1974
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1982
+#: cps/web.py:1976
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:2042 cps/web.py:2051
+#: cps/web.py:2036 cps/web.py:2045
 msgid "search"
 msgstr ""
 
 #: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2122
+#: cps/templates/layout.html:148 cps/web.py:2116
 msgid "Read Books"
 msgstr ""
 
 #: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2125
+#: cps/templates/layout.html:150 cps/web.py:2119
 msgid "Unread Books"
 msgstr ""
 
-#: cps/web.py:2177 cps/web.py:2179 cps/web.py:2181 cps/web.py:2193
+#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
 msgid "Read a Book"
 msgstr ""
 
-#: cps/web.py:2205
+#: cps/web.py:2199
 msgid "Error opening eBook. Fileformat is not supported."
 msgstr ""
 
-#: cps/web.py:2255 cps/web.py:3176
+#: cps/web.py:2249 cps/web.py:3170
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/web.py:2256 cps/web.py:2278 cps/web.py:2282 cps/web.py:2287
-#: cps/web.py:2289
+#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
+#: cps/web.py:2283
 msgid "register"
 msgstr ""
 
-#: cps/web.py:2277 cps/web.py:3395
+#: cps/web.py:2271 cps/web.py:3389
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2280
+#: cps/web.py:2274
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2283
+#: cps/web.py:2277
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2286
+#: cps/web.py:2280
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2303 cps/web.py:2399
+#: cps/web.py:2297 cps/web.py:2393
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:2308
+#: cps/web.py:2302
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:2314 cps/web.py:2335
+#: cps/web.py:2308 cps/web.py:2329
 msgid "login"
 msgstr ""
 
-#: cps/web.py:2347 cps/web.py:2378
+#: cps/web.py:2341 cps/web.py:2372
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2355 cps/web.py:2386
+#: cps/web.py:2349 cps/web.py:2380
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2363
+#: cps/web.py:2357
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2413
+#: cps/web.py:2407
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/web.py:2418
+#: cps/web.py:2412
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2422
+#: cps/web.py:2416
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:2424 cps/web.py:3229
+#: cps/web.py:2418 cps/web.py:3223
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2435 cps/web.py:2487
+#: cps/web.py:2429 cps/web.py:2481
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2442
+#: cps/web.py:2436
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr ""
 
-#: cps/web.py:2450
+#: cps/web.py:2444
 msgid "You are not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2459
+#: cps/web.py:2453
 #, python-format
 msgid "Book is already part of the shelf: %(shelfname)s"
 msgstr ""
 
-#: cps/web.py:2473
+#: cps/web.py:2467
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2492
+#: cps/web.py:2486
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2497
+#: cps/web.py:2491
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2515
+#: cps/web.py:2509
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2529
+#: cps/web.py:2523
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2531
+#: cps/web.py:2525
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2568
+#: cps/web.py:2562
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2574
+#: cps/web.py:2568
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2595 cps/web.py:2619
+#: cps/web.py:2589 cps/web.py:2613
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/web.py:2600
+#: cps/web.py:2594
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/web.py:2602 cps/web.py:2630
+#: cps/web.py:2596 cps/web.py:2624
 msgid "There was an error"
 msgstr ""
 
-#: cps/web.py:2603 cps/web.py:2605
+#: cps/web.py:2597 cps/web.py:2599
 msgid "create a shelf"
 msgstr ""
 
-#: cps/web.py:2628
+#: cps/web.py:2622
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:2631 cps/web.py:2633
+#: cps/web.py:2625 cps/web.py:2627
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/web.py:2654
+#: cps/web.py:2648
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr ""
 
-#: cps/web.py:2681
+#: cps/web.py:2675
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2684
+#: cps/web.py:2678
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2715
+#: cps/web.py:2709
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2744 cps/web.py:3182
+#: cps/web.py:2738 cps/web.py:3176
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2746 cps/web.py:2788 cps/web.py:2791
+#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:2786
+#: cps/web.py:2780
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2789
+#: cps/web.py:2783
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:2820
+#: cps/web.py:2814
 msgid "Admin page"
 msgstr ""
 
-#: cps/web.py:2905 cps/web.py:3085
+#: cps/web.py:2899 cps/web.py:3079
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/web.py:2919
+#: cps/templates/admin.html:100 cps/web.py:2913
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2937
+#: cps/web.py:2931
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2940
+#: cps/web.py:2934
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2945 cps/web.py:2974
+#: cps/web.py:2939 cps/web.py:2968
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:99 cps/web.py:2977 cps/web.py:3003 cps/web.py:3015
-#: cps/web.py:3060 cps/web.py:3075 cps/web.py:3094 cps/web.py:3102
-#: cps/web.py:3118
+#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
+#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
+#: cps/web.py:3112
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/web.py:3000
+#: cps/web.py:2994
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:3012
+#: cps/web.py:3006
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:3057
+#: cps/web.py:3051
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:3098
+#: cps/web.py:3092
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:33 cps/web.py:3178 cps/web.py:3184 cps/web.py:3200
+#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
 msgid "Add new user"
 msgstr ""
 
-#: cps/web.py:3190
+#: cps/web.py:3184
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/web.py:3194
+#: cps/web.py:3188
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3224
+#: cps/web.py:3218
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3227
+#: cps/web.py:3221
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3231
+#: cps/web.py:3225
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3232
+#: cps/web.py:3226
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3257
+#: cps/web.py:3251
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/web.py:3370
+#: cps/web.py:3364
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/web.py:3373
+#: cps/web.py:3367
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/web.py:3375
+#: cps/web.py:3369
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/web.py:3392
+#: cps/web.py:3386
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/web.py:3406 cps/web.py:3598
+#: cps/web.py:3400 cps/web.py:3592
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3434
+#: cps/web.py:3428
 msgid "edit metadata"
 msgstr ""
 
-#: cps/web.py:3527 cps/web.py:3760
+#: cps/web.py:3521 cps/web.py:3754
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/web.py:3531 cps/web.py:3763
+#: cps/web.py:3525 cps/web.py:3757
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/web.py:3543 cps/web.py:3782
+#: cps/web.py:3537 cps/web.py:3776
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3548
+#: cps/web.py:3542
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/web.py:3565
+#: cps/web.py:3559
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/web.py:3579 cps/web.py:3652
+#: cps/web.py:3573 cps/web.py:3646
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3611 cps/web.py:3620
+#: cps/web.py:3605 cps/web.py:3614
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3700
+#: cps/web.py:3694
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/web.py:3731
+#: cps/web.py:3725
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/web.py:3740
+#: cps/web.py:3734
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3786
+#: cps/web.py:3780
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3791
+#: cps/web.py:3785
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3873
+#: cps/web.py:3867
 #, python-format
 msgid "File %(title)s"
 msgstr ""
 
-#: cps/web.py:3902
+#: cps/web.py:3896
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3912
+#: cps/web.py:3906
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3916
+#: cps/web.py:3910
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -1832,17 +1832,17 @@ msgid "Your email address"
 msgstr ""
 
 #: cps/templates/remote_login.html:6
-msgid "Using your another device, visit"
-msgstr ""
-
-#: cps/templates/remote_login.html:6
-msgid "and log in"
+msgid "Using your another device, login and visit "
 msgstr ""
 
 #: cps/templates/remote_login.html:9
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr ""
 
+#: cps/templates/remote_login.html:12
+msgid "The link will expire after 10 minutes."
+msgstr ""
+
 #: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr ""