Merge remote-tracking branch 'default_user_settings/master' (#105)

cps/templates/config_edit.html

@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
-  <h1>{{title}}</h1>
+  <h2>{{title}}</h2>
   <form role="form" method="POST" autocomplete="off">
     <div class="form-group required">
       <label for="config_calibre_dir">{{_('Location of Calibre database')}}</label>
@@ -49,6 +49,27 @@
         <input type="checkbox" id="config_public_reg" name="config_public_reg" {% if content.config_public_reg %}checked{% endif %}>
         <label for="config_public_reg">{{_('Enable public registration')}}</label>
     </div>
+    <h2>{{_('Default Settings for new users')}}</h2>
+    <div class="form-group">
+      <input type="checkbox" name="admin_role" id="admin_role" {% if content.role_admin() %}checked{% endif %}>
+      <label for="admin_role">{{_('Admin user')}}</label>
+    </div>
+    <div class="form-group">
+      <input type="checkbox" name="download_role" id="download_role" {% if content.role_download() %}checked{% endif %}>
+      <label for="download_role">{{_('Allow Downloads')}}</label>
+    </div>
+    <div class="form-group">
+      <input type="checkbox" name="upload_role" id="upload_role" {% if content.role_upload() %}checked{% endif %}>
+      <label for="upload_role">{{_('Allow Uploads')}}</label>
+    </div>
+    <div class="form-group">
+      <input type="checkbox" name="edit_role" id="edit_role" {% if content.role_edit() %}checked{% endif %}>
+      <label for="edit_role">{{_('Allow Edit')}}</label>
+    </div>
+    <div class="form-group">
+      <input type="checkbox" name="passwd_role" id="passwd_role" {% if content.role_passwd() %}checked{% endif %}>
+      <label for="passwd_role">{{_('Allow Changing Password')}}</label>
+    </div>
     <button type="submit" class="btn btn-default">{{_('Submit')}}</button>
     {% if not origin %}
       <a href="{{ url_for('admin') }}" class="btn btn-default">{{_('Back')}}</a>

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: 2017-02-10 19:55+0100\n"
+"POT-Creation-Date: 2017-02-10 20:17+0100\n"
 "PO-Revision-Date: 2016-07-12 19:54+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -67,7 +67,7 @@ msgstr "Konnte .epub nicht nach .mobi konvertieren"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Die angeforderte Datei konnte nicht gelesen werden. Falsche Dateirechte?"
 
-#: cps/ub.py:404
+#: cps/ub.py:443
 msgid "Guest"
 msgstr "Gast"
 
@@ -96,7 +96,7 @@ msgstr "Autorenliste"
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:848 cps/web.py:876 cps/web.py:975 cps/web.py:1216 cps/web.py:2089
+#: cps/web.py:848 cps/web.py:876 cps/web.py:975 cps/web.py:1216 cps/web.py:2103
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht "
@@ -153,7 +153,7 @@ msgstr "Suche"
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/web.py:1264 cps/web.py:1689
+#: cps/web.py:1264 cps/web.py:1701
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
@@ -269,85 +269,85 @@ msgstr "Profil aktualisiert"
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/web.py:1644
+#: cps/web.py:1656
 msgid "Calibre-web configuration updated"
 msgstr "Calibre-web Konfiguration wurde aktualisiert"
 
-#: cps/web.py:1651 cps/web.py:1657 cps/web.py:1670
+#: cps/web.py:1663 cps/web.py:1669 cps/web.py:1682
 msgid "Basic Configuration"
 msgstr "Basis Konfiguration"
 
-#: cps/web.py:1655
+#: cps/web.py:1667
 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:1691 cps/web.py:1735
+#: cps/templates/admin.html:33 cps/web.py:1703 cps/web.py:1749
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/web.py:1729
+#: cps/web.py:1741
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/web.py:1733
+#: cps/web.py:1745
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 "Es existiert ein Benutzerkonto für diese Emailadresse oder den "
 "Benutzernamen."
 
-#: cps/web.py:1753
+#: cps/web.py:1767
 msgid "Mail settings updated"
 msgstr "E-Mail Einstellungen aktualisiert"
 
-#: cps/web.py:1759
+#: cps/web.py:1773
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Test E-Mail erfolgreich an %(kindlemail)s versendet"
 
-#: cps/web.py:1762
+#: cps/web.py:1776
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "Fehler beim versenden der Test E-Mail: %(res)s"
 
-#: cps/web.py:1763
+#: cps/web.py:1777
 msgid "Edit mail settings"
 msgstr "E-Mail Einstellungen editieren"
 
-#: cps/web.py:1791
+#: cps/web.py:1805
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/web.py:1872
+#: cps/web.py:1886
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/web.py:1875
+#: cps/web.py:1889
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekanter Fehler aufgetreten"
 
-#: cps/web.py:1878
+#: cps/web.py:1892
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/web.py:2084 cps/web.py:2087 cps/web.py:2161
+#: cps/web.py:2098 cps/web.py:2101 cps/web.py:2175
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/web.py:2119
+#: cps/web.py:2133
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %s (Zugriff verweigert)"
 
-#: cps/web.py:2124
+#: cps/web.py:2138
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fehler beim speichern der Datei %s (Zugriff verweigert)"
 
-#: cps/web.py:2129
+#: cps/web.py:2143
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)"
@@ -485,7 +485,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #: cps/templates/admin.html:95 cps/templates/admin.html:110
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:54
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:75
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111
 msgid "Back"
@@ -544,7 +544,7 @@ msgstr "Nein"
 msgid "view book after edit"
 msgstr "Buch nach Bearbeitung ansehen"
 
-#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:52
+#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:73
 #: cps/templates/login.html:19 cps/templates/search_form.html:75
 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109
 msgid "Submit"
@@ -582,7 +582,31 @@ msgstr "Anonymes Browsen aktivieren"
 msgid "Enable public registration"
 msgstr "Öffentliche Registrierung aktivieren"
 
-#: cps/templates/config_edit.html:57 cps/templates/layout.html:91
+#: cps/templates/config_edit.html:52
+msgid "Default Settings for new users"
+msgstr ""
+
+#: cps/templates/config_edit.html:55 cps/templates/user_edit.html:80
+msgid "Admin user"
+msgstr "Admin Benutzer"
+
+#: cps/templates/config_edit.html:59 cps/templates/user_edit.html:85
+msgid "Allow Downloads"
+msgstr "Downloads erlauben"
+
+#: cps/templates/config_edit.html:63 cps/templates/user_edit.html:89
+msgid "Allow Uploads"
+msgstr "Uploads erlauben"
+
+#: cps/templates/config_edit.html:67 cps/templates/user_edit.html:93
+msgid "Allow Edit"
+msgstr "Bearbeiten erlauben"
+
+#: cps/templates/config_edit.html:71 cps/templates/user_edit.html:98
+msgid "Allow Changing Password"
+msgstr "Passwort ändern erlauben"
+
+#: cps/templates/config_edit.html:78 cps/templates/layout.html:91
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Login"
@@ -935,26 +959,6 @@ msgstr "Zeige Autorenauswahl"
 msgid "Show random books in detail view"
 msgstr "Zeige zufällige Bücher in der Detailansicht"
 
-#: cps/templates/user_edit.html:80
-msgid "Admin user"
-msgstr "Admin Benutzer"
-
-#: cps/templates/user_edit.html:85
-msgid "Allow Downloads"
-msgstr "Downloads erlauben"
-
-#: cps/templates/user_edit.html:89
-msgid "Allow Uploads"
-msgstr "Uploads erlauben"
-
-#: cps/templates/user_edit.html:93
-msgid "Allow Edit"
-msgstr "Bearbeiten erlauben"
-
-#: cps/templates/user_edit.html:98
-msgid "Allow Changing Password"
-msgstr "Passwort ändern erlauben"
-
 #: cps/templates/user_edit.html:105
 msgid "Delete this user"
 msgstr "Benutzer löschen"

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: 2017-02-10 19:55+0100\n"
+"POT-Creation-Date: 2017-02-10 20:17+0100\n"
 "PO-Revision-Date: 2016-11-13 18:35+0100\n"
 "Last-Translator: Juan F. Villa <juan.villa@paisdelconocimiento.org>\n"
 "Language: es\n"
@@ -58,7 +58,7 @@ msgstr "No fue posible convertir de epub a mobi"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "El fichero solicitado no puede ser leido. Problema de permisos?"
 
-#: cps/ub.py:404
+#: cps/ub.py:443
 msgid "Guest"
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr "Lista de Autores"
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:848 cps/web.py:876 cps/web.py:975 cps/web.py:1216 cps/web.py:2089
+#: cps/web.py:848 cps/web.py:876 cps/web.py:975 cps/web.py:1216 cps/web.py:2103
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Error en apertura del Objeto. El archivo no existe o no es accesible"
 
@@ -142,7 +142,7 @@ msgstr ""
 msgid "Read a Book"
 msgstr "Leer un Libro"
 
-#: cps/web.py:1264 cps/web.py:1689
+#: cps/web.py:1264 cps/web.py:1701
 msgid "Please fill out all fields!"
 msgstr "Por favor llenar todos los campos!"
 
@@ -258,83 +258,83 @@ msgstr "Perfil actualizado"
 msgid "Admin page"
 msgstr ""
 
-#: cps/web.py:1644
+#: cps/web.py:1656
 msgid "Calibre-web configuration updated"
 msgstr ""
 
-#: cps/web.py:1651 cps/web.py:1657 cps/web.py:1670
+#: cps/web.py:1663 cps/web.py:1669 cps/web.py:1682
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/web.py:1655
+#: cps/web.py:1667
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:33 cps/web.py:1691 cps/web.py:1735
+#: cps/templates/admin.html:33 cps/web.py:1703 cps/web.py:1749
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"
 
-#: cps/web.py:1729
+#: cps/web.py:1741
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/web.py:1733
+#: cps/web.py:1745
 msgid "Found an existing account for this email address or nickname."
 msgstr "Se ha encontrado una cuenta vinculada a esta cuenta de correo o usuario."
 
-#: cps/web.py:1753
+#: cps/web.py:1767
 msgid "Mail settings updated"
 msgstr "Parametros de correo actualizados"
 
-#: cps/web.py:1759
+#: cps/web.py:1773
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Exito al realizar envio de prueba a %(kindlemail)s"
 
-#: cps/web.py:1762
+#: cps/web.py:1776
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "Error al realizar envio de prueba a E-Mail: %(res)s"
 
-#: cps/web.py:1763
+#: cps/web.py:1777
 msgid "Edit mail settings"
 msgstr "Editar parametros de correo"
 
-#: cps/web.py:1791
+#: cps/web.py:1805
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/web.py:1872
+#: cps/web.py:1886
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  Actualizado"
 
-#: cps/web.py:1875
+#: cps/web.py:1889
 msgid "An unknown error occured."
 msgstr "Oups ! Error inesperado."
 
-#: cps/web.py:1878
+#: cps/web.py:1892
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/web.py:2084 cps/web.py:2087 cps/web.py:2161
+#: cps/web.py:2098 cps/web.py:2101 cps/web.py:2175
 msgid "edit metadata"
 msgstr ""
 
-#: cps/web.py:2119
+#: cps/web.py:2133
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fallo al crear la ruta %s (permiso negado)"
 
-#: cps/web.py:2124
+#: cps/web.py:2138
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fallo al almacenar el archivo %s (permiso negado)"
 
-#: cps/web.py:2129
+#: cps/web.py:2143
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fallo al borrar el archivo %s (permiso negado)"
@@ -472,7 +472,7 @@ msgid "Ok"
 msgstr ""
 
 #: cps/templates/admin.html:95 cps/templates/admin.html:110
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:54
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:75
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111
 msgid "Back"
@@ -531,7 +531,7 @@ msgstr "No"
 msgid "view book after edit"
 msgstr "Ver libro tras la edicion"
 
-#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:52
+#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:73
 #: cps/templates/login.html:19 cps/templates/search_form.html:75
 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109
 msgid "Submit"
@@ -569,7 +569,31 @@ msgstr ""
 msgid "Enable public registration"
 msgstr ""
 
-#: cps/templates/config_edit.html:57 cps/templates/layout.html:91
+#: cps/templates/config_edit.html:52
+msgid "Default Settings for new users"
+msgstr ""
+
+#: cps/templates/config_edit.html:55 cps/templates/user_edit.html:80
+msgid "Admin user"
+msgstr "Usuario Administrador"
+
+#: cps/templates/config_edit.html:59 cps/templates/user_edit.html:85
+msgid "Allow Downloads"
+msgstr "Permitir descargas"
+
+#: cps/templates/config_edit.html:63 cps/templates/user_edit.html:89
+msgid "Allow Uploads"
+msgstr "Permitir subidas de archivos"
+
+#: cps/templates/config_edit.html:67 cps/templates/user_edit.html:93
+msgid "Allow Edit"
+msgstr "Permitir editar"
+
+#: cps/templates/config_edit.html:71 cps/templates/user_edit.html:98
+msgid "Allow Changing Password"
+msgstr "Permitir cambiar la clave"
+
+#: cps/templates/config_edit.html:78 cps/templates/layout.html:91
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Inicio de Sesion"
@@ -920,26 +944,6 @@ msgstr ""
 msgid "Show random books in detail view"
 msgstr ""
 
-#: cps/templates/user_edit.html:80
-msgid "Admin user"
-msgstr "Usuario Administrador"
-
-#: cps/templates/user_edit.html:85
-msgid "Allow Downloads"
-msgstr "Permitir descargas"
-
-#: cps/templates/user_edit.html:89
-msgid "Allow Uploads"
-msgstr "Permitir subidas de archivos"
-
-#: cps/templates/user_edit.html:93
-msgid "Allow Edit"
-msgstr "Permitir editar"
-
-#: cps/templates/user_edit.html:98
-msgid "Allow Changing Password"
-msgstr "Permitir cambiar la clave"
-
 #: cps/templates/user_edit.html:105
 msgid "Delete this user"
 msgstr "Borrar este usuario"

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: 2017-02-10 19:55+0100\n"
+"POT-Creation-Date: 2017-02-10 20:17+0100\n"
 "PO-Revision-Date: 2016-11-13 18:35+0100\n"
 "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
 "Language: fr\n"
@@ -66,7 +66,7 @@ msgstr ""
 "Le fichier demandé ne peux pas être lu. Peut-être de mauvaises "
 "permissions ?"
 
-#: cps/ub.py:404
+#: cps/ub.py:443
 msgid "Guest"
 msgstr ""
 
@@ -95,7 +95,7 @@ msgstr "Liste des auteurs"
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:848 cps/web.py:876 cps/web.py:975 cps/web.py:1216 cps/web.py:2089
+#: cps/web.py:848 cps/web.py:876 cps/web.py:975 cps/web.py:1216 cps/web.py:2103
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Erreur d'ouverture du livre numérique. Le fichier n'existe pas ou n'est "
@@ -152,7 +152,7 @@ msgstr ""
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/web.py:1264 cps/web.py:1689
+#: cps/web.py:1264 cps/web.py:1701
 msgid "Please fill out all fields!"
 msgstr "SVP, complétez tous les champs !"
 
@@ -268,83 +268,83 @@ msgstr "Profil mis à jour"
 msgid "Admin page"
 msgstr ""
 
-#: cps/web.py:1644
+#: cps/web.py:1656
 msgid "Calibre-web configuration updated"
 msgstr ""
 
-#: cps/web.py:1651 cps/web.py:1657 cps/web.py:1670
+#: cps/web.py:1663 cps/web.py:1669 cps/web.py:1682
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/web.py:1655
+#: cps/web.py:1667
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:33 cps/web.py:1691 cps/web.py:1735
+#: cps/templates/admin.html:33 cps/web.py:1703 cps/web.py:1749
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/web.py:1729
+#: cps/web.py:1741
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/web.py:1733
+#: cps/web.py:1745
 msgid "Found an existing account for this email address or nickname."
 msgstr "Un compte avec cette adresse de courriel ou ce surnom existe déjà."
 
-#: cps/web.py:1753
+#: cps/web.py:1767
 msgid "Mail settings updated"
 msgstr "Paramètres de courriel mis à jour"
 
-#: cps/web.py:1759
+#: cps/web.py:1773
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1762
+#: cps/web.py:1776
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:1763
+#: cps/web.py:1777
 msgid "Edit mail settings"
 msgstr "Éditer les paramètres de courriel"
 
-#: cps/web.py:1791
+#: cps/web.py:1805
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/web.py:1872
+#: cps/web.py:1886
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/web.py:1875
+#: cps/web.py:1889
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/web.py:1878
+#: cps/web.py:1892
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/web.py:2084 cps/web.py:2087 cps/web.py:2161
+#: cps/web.py:2098 cps/web.py:2101 cps/web.py:2175
 msgid "edit metadata"
 msgstr ""
 
-#: cps/web.py:2119
+#: cps/web.py:2133
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Impossible de créer le chemin %s (permission refusée)"
 
-#: cps/web.py:2124
+#: cps/web.py:2138
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Impossible d'enregistrer le fichier %s (permission refusée)"
 
-#: cps/web.py:2129
+#: cps/web.py:2143
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Impossible de supprimer le fichier %s (permission refusée)"
@@ -482,7 +482,7 @@ msgid "Ok"
 msgstr ""
 
 #: cps/templates/admin.html:95 cps/templates/admin.html:110
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:54
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:75
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111
 msgid "Back"
@@ -541,7 +541,7 @@ msgstr "Non"
 msgid "view book after edit"
 msgstr "Voir le livre après l'édition"
 
-#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:52
+#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:73
 #: cps/templates/login.html:19 cps/templates/search_form.html:75
 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109
 msgid "Submit"
@@ -579,7 +579,31 @@ msgstr ""
 msgid "Enable public registration"
 msgstr ""
 
-#: cps/templates/config_edit.html:57 cps/templates/layout.html:91
+#: cps/templates/config_edit.html:52
+msgid "Default Settings for new users"
+msgstr ""
+
+#: cps/templates/config_edit.html:55 cps/templates/user_edit.html:80
+msgid "Admin user"
+msgstr "Utilisateur admin"
+
+#: cps/templates/config_edit.html:59 cps/templates/user_edit.html:85
+msgid "Allow Downloads"
+msgstr "Permettre les téléchargements"
+
+#: cps/templates/config_edit.html:63 cps/templates/user_edit.html:89
+msgid "Allow Uploads"
+msgstr "Permettre les téléversements"
+
+#: cps/templates/config_edit.html:67 cps/templates/user_edit.html:93
+msgid "Allow Edit"
+msgstr "Permettre l'édition"
+
+#: cps/templates/config_edit.html:71 cps/templates/user_edit.html:98
+msgid "Allow Changing Password"
+msgstr "Permettre le changement de mot de passe"
+
+#: cps/templates/config_edit.html:78 cps/templates/layout.html:91
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Connexion"
@@ -930,26 +954,6 @@ msgstr ""
 msgid "Show random books in detail view"
 msgstr ""
 
-#: cps/templates/user_edit.html:80
-msgid "Admin user"
-msgstr "Utilisateur admin"
-
-#: cps/templates/user_edit.html:85
-msgid "Allow Downloads"
-msgstr "Permettre les téléchargements"
-
-#: cps/templates/user_edit.html:89
-msgid "Allow Uploads"
-msgstr "Permettre les téléversements"
-
-#: cps/templates/user_edit.html:93
-msgid "Allow Edit"
-msgstr "Permettre l'édition"
-
-#: cps/templates/user_edit.html:98
-msgid "Allow Changing Password"
-msgstr "Permettre le changement de mot de passe"
-
 #: cps/templates/user_edit.html:105
 msgid "Delete this user"
 msgstr "Supprimer cet utilisateur"

cps/translations/pl/LC_MESSAGES/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre Web - polski\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-02-10 19:55+0100\n"
+"POT-Creation-Date: 2017-02-10 20:17+0100\n"
 "PO-Revision-Date: 2017-02-10 12:31+0100\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -55,7 +55,7 @@ msgstr "Nie można konwertować epub do mobi"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Żądany plik nie może być odczytany. Może złe uprawnienia?"
 
-#: cps/ub.py:404
+#: cps/ub.py:443
 msgid "Guest"
 msgstr ""
 
@@ -84,7 +84,7 @@ msgstr "Lista autorów"
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:848 cps/web.py:876 cps/web.py:975 cps/web.py:1216 cps/web.py:2089
+#: cps/web.py:848 cps/web.py:876 cps/web.py:975 cps/web.py:1216 cps/web.py:2103
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Błąd otwierania e-booka. Plik nie istnieje lub plik nie jest dostępny:"
 
@@ -139,7 +139,7 @@ msgstr ""
 msgid "Read a Book"
 msgstr "Czytaj książkę"
 
-#: cps/web.py:1264 cps/web.py:1689
+#: cps/web.py:1264 cps/web.py:1701
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
@@ -255,83 +255,83 @@ msgstr "Zaktualizowano profil"
 msgid "Admin page"
 msgstr "Portal administracyjny"
 
-#: cps/web.py:1644
+#: cps/web.py:1656
 msgid "Calibre-web configuration updated"
 msgstr ""
 
-#: cps/web.py:1651 cps/web.py:1657 cps/web.py:1670
+#: cps/web.py:1663 cps/web.py:1669 cps/web.py:1682
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/web.py:1655
+#: cps/web.py:1667
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:33 cps/web.py:1691 cps/web.py:1735
+#: cps/templates/admin.html:33 cps/web.py:1703 cps/web.py:1749
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/web.py:1729
+#: cps/web.py:1741
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/web.py:1733
+#: cps/web.py:1745
 msgid "Found an existing account for this email address or nickname."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy użytkownika."
 
-#: cps/web.py:1753
+#: cps/web.py:1767
 msgid "Mail settings updated"
 msgstr "Zaktualizowano ustawienia poczty e-mail"
 
-#: cps/web.py:1759
+#: cps/web.py:1773
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Testowy e-mail pomyślnie wysłany do %(kindlemail)s"
 
-#: cps/web.py:1762
+#: cps/web.py:1776
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:1763
+#: cps/web.py:1777
 msgid "Edit mail settings"
 msgstr "Edytuj ustawienia poczty e-mail"
 
-#: cps/web.py:1791
+#: cps/web.py:1805
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/web.py:1872
+#: cps/web.py:1886
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/web.py:1875
+#: cps/web.py:1889
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/web.py:1878
+#: cps/web.py:1892
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/web.py:2084 cps/web.py:2087 cps/web.py:2161
+#: cps/web.py:2098 cps/web.py:2101 cps/web.py:2175
 msgid "edit metadata"
 msgstr ""
 
-#: cps/web.py:2119
+#: cps/web.py:2133
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:2124
+#: cps/web.py:2138
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:2129
+#: cps/web.py:2143
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr ""
@@ -469,7 +469,7 @@ msgid "Ok"
 msgstr ""
 
 #: cps/templates/admin.html:95 cps/templates/admin.html:110
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:54
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:75
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111
 msgid "Back"
@@ -528,7 +528,7 @@ msgstr "Nie"
 msgid "view book after edit"
 msgstr "wyświetl książkę po edycji"
 
-#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:52
+#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:73
 #: cps/templates/login.html:19 cps/templates/search_form.html:75
 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109
 msgid "Submit"
@@ -566,7 +566,31 @@ msgstr ""
 msgid "Enable public registration"
 msgstr ""
 
-#: cps/templates/config_edit.html:57 cps/templates/layout.html:91
+#: cps/templates/config_edit.html:52
+msgid "Default Settings for new users"
+msgstr ""
+
+#: cps/templates/config_edit.html:55 cps/templates/user_edit.html:80
+msgid "Admin user"
+msgstr "Użytkownik z uprawnieniami administratora"
+
+#: cps/templates/config_edit.html:59 cps/templates/user_edit.html:85
+msgid "Allow Downloads"
+msgstr "Zezwalaj na pobieranie"
+
+#: cps/templates/config_edit.html:63 cps/templates/user_edit.html:89
+msgid "Allow Uploads"
+msgstr "Zezwalaj na wysyłanie"
+
+#: cps/templates/config_edit.html:67 cps/templates/user_edit.html:93
+msgid "Allow Edit"
+msgstr "Zezwalaj na edycję"
+
+#: cps/templates/config_edit.html:71 cps/templates/user_edit.html:98
+msgid "Allow Changing Password"
+msgstr "Zezwalaj na zmianę hasła"
+
+#: cps/templates/config_edit.html:78 cps/templates/layout.html:91
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Zaloguj się"
@@ -917,26 +941,6 @@ msgstr ""
 msgid "Show random books in detail view"
 msgstr ""
 
-#: cps/templates/user_edit.html:80
-msgid "Admin user"
-msgstr "Użytkownik z uprawnieniami administratora"
-
-#: cps/templates/user_edit.html:85
-msgid "Allow Downloads"
-msgstr "Zezwalaj na pobieranie"
-
-#: cps/templates/user_edit.html:89
-msgid "Allow Uploads"
-msgstr "Zezwalaj na wysyłanie"
-
-#: cps/templates/user_edit.html:93
-msgid "Allow Edit"
-msgstr "Zezwalaj na edycję"
-
-#: cps/templates/user_edit.html:98
-msgid "Allow Changing Password"
-msgstr "Zezwalaj na zmianę hasła"
-
 #: cps/templates/user_edit.html:105
 msgid "Delete this user"
 msgstr "Usuń tego użytkownika"

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: 2017-02-10 19:55+0100\n"
+"POT-Creation-Date: 2017-02-10 20:17+0100\n"
 "PO-Revision-Date: 2017-01-06 17:00+0000\n"
 "Last-Translator: dalin <dalin.lin@gmail.com>\n"
 "Language: zh_Hans_CN\n"
@@ -59,9 +59,9 @@ msgstr "无法转换epub到mobi"
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "无法读取所请求的文件。可能是错误权限不对？"
 
-#: cps/ub.py:404
+#: cps/ub.py:443
 msgid "Guest"
-msgstr ""
+msgstr "游客"
 
 #: cps/web.py:778
 msgid "Latest Books"
@@ -88,7 +88,7 @@ msgstr "作者列表"
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:848 cps/web.py:876 cps/web.py:975 cps/web.py:1216 cps/web.py:2089
+#: cps/web.py:848 cps/web.py:876 cps/web.py:975 cps/web.py:1216 cps/web.py:2103
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
 
@@ -125,11 +125,11 @@ msgstr "统计"
 
 #: cps/web.py:1029
 msgid "Performing Restart, please reload page"
-msgstr ""
+msgstr "正在重启，请刷新页面"
 
 #: cps/web.py:1031
 msgid "Performing shutdown of server, please close window"
-msgstr ""
+msgstr "正在关闭服务器，请关闭窗口"
 
 #: cps/web.py:1055
 msgid "Update done"
@@ -137,13 +137,13 @@ msgstr ""
 
 #: cps/web.py:1128 cps/web.py:1141
 msgid "search"
-msgstr ""
+msgstr "搜索"
 
 #: cps/web.py:1192 cps/web.py:1199 cps/web.py:1206 cps/web.py:1213
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/web.py:1264 cps/web.py:1689
+#: cps/web.py:1264 cps/web.py:1701
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段"
 
@@ -259,83 +259,83 @@ msgstr "资料已更新"
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/web.py:1644
+#: cps/web.py:1656
 msgid "Calibre-web configuration updated"
-msgstr ""
+msgstr "Calibre-web配置已更新"
 
-#: cps/web.py:1651 cps/web.py:1657 cps/web.py:1670
+#: cps/web.py:1663 cps/web.py:1669 cps/web.py:1682
 msgid "Basic Configuration"
-msgstr ""
+msgstr "基本配置"
 
-#: cps/web.py:1655
+#: cps/web.py:1667
 msgid "DB location is not valid, please enter correct path"
-msgstr ""
+msgstr "DB位置无效，请输入正确路径"
 
-#: cps/templates/admin.html:33 cps/web.py:1691 cps/web.py:1735
+#: cps/templates/admin.html:33 cps/web.py:1703 cps/web.py:1749
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/web.py:1729
+#: cps/web.py:1741
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户 '%(user)s' 已被创建"
 
-#: cps/web.py:1733
+#: cps/web.py:1745
 msgid "Found an existing account for this email address or nickname."
 msgstr "已找到使用此邮箱或昵称的账号。"
 
-#: cps/web.py:1753
+#: cps/web.py:1767
 msgid "Mail settings updated"
 msgstr "邮箱设置已更新"
 
-#: cps/web.py:1759
+#: cps/web.py:1773
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已成功发送到 %(kindlemail)s"
 
-#: cps/web.py:1762
+#: cps/web.py:1776
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "发送测试邮件时发生错误: %(res)s"
 
-#: cps/web.py:1763
+#: cps/web.py:1777
 msgid "Edit mail settings"
 msgstr "编辑邮箱设置"
 
-#: cps/web.py:1791
+#: cps/web.py:1805
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户 '%(nick)s' 已被删除"
 
-#: cps/web.py:1872
+#: cps/web.py:1886
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户 '%(nick)s' 已被更新"
 
-#: cps/web.py:1875
+#: cps/web.py:1889
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/web.py:1878
+#: cps/web.py:1892
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/web.py:2084 cps/web.py:2087 cps/web.py:2161
+#: cps/web.py:2098 cps/web.py:2101 cps/web.py:2175
 msgid "edit metadata"
-msgstr ""
+msgstr "编辑元数据"
 
-#: cps/web.py:2119
+#: cps/web.py:2133
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "创建路径 %s 失败(权限拒绝)。"
 
-#: cps/web.py:2124
+#: cps/web.py:2138
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "存储文件 %s 失败(权限拒绝)。"
 
-#: cps/web.py:2129
+#: cps/web.py:2143
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "删除文件 %s 失败(权限拒绝)。"
@@ -418,7 +418,7 @@ msgstr "配置"
 
 #: cps/templates/admin.html:59
 msgid "Calibre DB dir"
-msgstr ""
+msgstr "Calibre DB目录"
 
 #: cps/templates/admin.html:60 cps/templates/config_edit.html:32
 msgid "Log Level"
@@ -454,7 +454,7 @@ msgstr "重启 Calibre-web"
 
 #: cps/templates/admin.html:80
 msgid "Stop Calibre-web"
-msgstr ""
+msgstr "停止 Calibre-web"
 
 #: cps/templates/admin.html:81
 msgid "Check for update"
@@ -466,14 +466,14 @@ msgstr ""
 
 #: cps/templates/admin.html:93
 msgid "Do you really want to restart Calibre-web?"
-msgstr ""
+msgstr "您确定要重启 Calibre-web 吗？"
 
 #: cps/templates/admin.html:94 cps/templates/admin.html:109
 msgid "Ok"
-msgstr ""
+msgstr "确定"
 
 #: cps/templates/admin.html:95 cps/templates/admin.html:110
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:54
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:75
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111
 msgid "Back"
@@ -481,7 +481,7 @@ msgstr "后退"
 
 #: cps/templates/admin.html:108
 msgid "Do you really want to stop Calibre-web?"
-msgstr ""
+msgstr "您确定要关闭 Calibre-web 吗？"
 
 #: cps/templates/book_edit.html:16 cps/templates/search_form.html:6
 msgid "Book Title"
@@ -532,7 +532,7 @@ msgstr ""
 msgid "view book after edit"
 msgstr "编辑后查看书籍"
 
-#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:52
+#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:73
 #: cps/templates/login.html:19 cps/templates/search_form.html:75
 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109
 msgid "Submit"
@@ -540,37 +540,61 @@ msgstr "提交"
 
 #: cps/templates/config_edit.html:7
 msgid "Location of Calibre database"
-msgstr ""
+msgstr "Calibre 数据库位置"
 
 #: cps/templates/config_edit.html:11
 msgid "Server Port"
-msgstr ""
+msgstr "服务器端口"
 
 #: cps/templates/config_edit.html:15 cps/templates/shelf_edit.html:7
 msgid "Title"
-msgstr ""
+msgstr "标题"
 
 #: cps/templates/config_edit.html:23
 msgid "No. of random books to show"
-msgstr ""
+msgstr "随机书籍显示数量"
 
 #: cps/templates/config_edit.html:28
 msgid "Regular expression for title sorting"
-msgstr ""
+msgstr "标题排序的正则表达式"
 
 #: cps/templates/config_edit.html:42
 msgid "Enable uploading"
-msgstr ""
+msgstr "启用上传"
 
 #: cps/templates/config_edit.html:46
 msgid "Enable anonymous browsing"
-msgstr ""
+msgstr "启用匿名浏览"
 
 #: cps/templates/config_edit.html:50
 msgid "Enable public registration"
+msgstr "启用注册"
+
+#: cps/templates/config_edit.html:52
+msgid "Default Settings for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:57 cps/templates/layout.html:91
+#: cps/templates/config_edit.html:55 cps/templates/user_edit.html:80
+msgid "Admin user"
+msgstr "管理用户"
+
+#: cps/templates/config_edit.html:59 cps/templates/user_edit.html:85
+msgid "Allow Downloads"
+msgstr "允许下载"
+
+#: cps/templates/config_edit.html:63 cps/templates/user_edit.html:89
+msgid "Allow Uploads"
+msgstr "允许上传"
+
+#: cps/templates/config_edit.html:67 cps/templates/user_edit.html:93
+msgid "Allow Edit"
+msgstr "允许编辑"
+
+#: cps/templates/config_edit.html:71 cps/templates/user_edit.html:98
+msgid "Allow Changing Password"
+msgstr "允许修改密码"
+
+#: cps/templates/config_edit.html:78 cps/templates/layout.html:91
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "登录"
@@ -609,15 +633,15 @@ msgstr "编辑元数据"
 
 #: cps/templates/email_edit.html:11
 msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr ""
+msgstr "SMTP端口(无加密SMTP通常是25, SSL加密是465, STARTTLS加密是587)"
 
 #: cps/templates/email_edit.html:15
 msgid "Encryption"
-msgstr ""
+msgstr "加密方式"
 
 #: cps/templates/email_edit.html:17
 msgid "None"
-msgstr ""
+msgstr "无"
 
 #: cps/templates/email_edit.html:18
 msgid "STARTTLS"
@@ -669,7 +693,7 @@ msgstr ""
 
 #: cps/templates/index.xml:26
 msgid "Popular publications from this catalog based on Rating."
-msgstr ""
+msgstr "基于评分的热门书籍"
 
 #: cps/templates/index.xml:29 cps/templates/layout.html:122
 msgid "New Books"
@@ -701,7 +725,7 @@ msgstr "书籍按丛书排序"
 
 #: cps/templates/layout.html:48
 msgid "Toggle navigation"
-msgstr ""
+msgstr "切换导航"
 
 #: cps/templates/layout.html:63
 msgid "Go!"
@@ -775,11 +799,11 @@ msgstr ""
 
 #: cps/templates/readpdf.html:29
 msgid "PDF.js viewer"
-msgstr ""
+msgstr "PDF.js 查看器"
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
-msgstr ""
+msgstr "简单txt阅读器"
 
 #: cps/templates/register.html:4
 msgid "Register a new account"
@@ -843,7 +867,7 @@ msgstr "要公开此书架吗？"
 
 #: cps/templates/shelf_order.html:5
 msgid "Drag 'n drop to rearrange order"
-msgstr ""
+msgstr "拖拽以重新排序"
 
 #: cps/templates/stats.html:3
 msgid "Linked libraries"
@@ -915,31 +939,11 @@ msgstr "显示分类选择"
 
 #: cps/templates/user_edit.html:69
 msgid "Show author selection"
-msgstr ""
+msgstr "显示作者选择"
 
 #: cps/templates/user_edit.html:73
 msgid "Show random books in detail view"
-msgstr ""
-
-#: cps/templates/user_edit.html:80
-msgid "Admin user"
-msgstr "管理用户"
-
-#: cps/templates/user_edit.html:85
-msgid "Allow Downloads"
-msgstr "允许下载"
-
-#: cps/templates/user_edit.html:89
-msgid "Allow Uploads"
-msgstr "允许上传"
-
-#: cps/templates/user_edit.html:93
-msgid "Allow Edit"
-msgstr "允许编辑"
-
-#: cps/templates/user_edit.html:98
-msgid "Allow Changing Password"
-msgstr "允许修改密码"
+msgstr "在详情页显示随机书籍"
 
 #: cps/templates/user_edit.html:105
 msgid "Delete this user"

cps/ub.py

@@ -262,6 +262,7 @@ class Settings(Base):
     config_uploading = Column(SmallInteger, default=0)
     config_anonbrowse = Column(SmallInteger, default=0)
     config_public_reg = Column(SmallInteger, default=0)
+    config_default_role = Column(SmallInteger, default=0)
 
     def __repr__(self):
         pass
@@ -287,7 +288,8 @@ class Config:
         self.config_uploading = data.config_uploading
         self.config_anonbrowse = data.config_anonbrowse
         self.config_public_reg = data.config_public_reg
-        if self.config_calibre_dir is not None: # and (self.db_configured is None or self.db_configured is True):
+        self.config_default_role = data.config_default_role
+        if self.config_calibre_dir is not None:
             self.db_configured = True
         else:
             self.db_configured = False
@@ -296,6 +298,36 @@ class Config:
     def get_main_dir(self):
         return self.config_main_dir
 
+    def role_admin(self):
+        if self.config_default_role is not None:
+            return True if self.config_default_role & ROLE_ADMIN == ROLE_ADMIN else False
+        else:
+            return False
+
+    def role_download(self):
+        if self.config_default_role is not None:
+            return True if self.config_default_role & ROLE_DOWNLOAD == ROLE_DOWNLOAD else False
+        else:
+            return False
+
+    def role_upload(self):
+        if self.config_default_role is not None:
+            return True if self.config_default_role & ROLE_UPLOAD == ROLE_UPLOAD else False
+        else:
+            return False
+
+    def role_edit(self):
+        if self.config_default_role is not None:
+            return True if self.config_default_role & ROLE_EDIT == ROLE_EDIT else False
+        else:
+            return False
+
+    def role_passwd(self):
+        if self.config_default_role is not None:
+            return True if self.config_default_role & ROLE_PASSWD == ROLE_PASSWD else False
+        else:
+            return False
+
     def get_Log_Level(self):
         ret_value=""
         if self.config_log_level == logging.INFO:
@@ -338,6 +370,13 @@ def migrate_Database():
         conn.execute("ALTER TABLE Settings ADD column `config_anonbrowse` SmallInteger DEFAULT 0")
         conn.execute("ALTER TABLE Settings ADD column `config_public_reg` SmallInteger DEFAULT 0")
         session.commit()
+    try:
+        session.query(exists().where(Settings.config_default_role)).scalar()
+        session.commit()
+    except exc.OperationalError:  # Database is not compatible, some rows are missing
+        conn = engine.connect()
+        conn.execute("ALTER TABLE Settings ADD column `config_default_role` SmallInteger DEFAULT 0")
+        session.commit()
     try:
         session.query(exists().where(BookShelf.order)).scalar()
         session.commit()

cps/web.py

@@ -1271,7 +1271,7 @@ def register():
             content.password = generate_password_hash(to_save["password"])
             content.nickname = to_save["nickname"]
             content.email = to_save["email"]
-            content.role = 0
+            content.role = config.config_default_role
             try:
                 ub.session.add(content)
                 ub.session.commit()
@@ -1635,6 +1635,18 @@ def configuration_helper(origin):
             content.config_anonbrowse = 1
         if "config_public_reg" in to_save and to_save["config_public_reg"] == "on":
             content.config_public_reg = 1
+
+        content.config_default_role = 0
+        if "admin_role" in to_save:
+            content.config_default_role = content.config_default_role + ub.ROLE_ADMIN
+        if "download_role" in to_save:
+            content.config_default_role = content.config_default_role + ub.ROLE_DOWNLOAD
+        if "upload_role" in to_save:
+            content.config_default_role = content.config_default_role + ub.ROLE_UPLOAD
+        if "edit_role" in to_save:
+            content.config_default_role = content.config_default_role + ub.ROLE_EDIT
+        if "passwd_role" in to_save:
+            content.config_default_role = content.config_default_role + ub.ROLE_PASSWD
         try:
             if db_change:
                 if config.db_configured:
@@ -1731,6 +1743,8 @@ def new_user():
         except IntegrityError:
             ub.session.rollback()
             flash(_(u"Found an existing account for this email address or nickname."), category="error")
+    else:
+        content.role=config.config_default_role
     return render_title_template("user_edit.html", new_user=1, content=content, translations=translations,
                                  languages=languages, title=_(u"Add new user"))
 

messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-02-10 19:55+0100\n"
+"POT-Creation-Date: 2017-02-10 20:17+0100\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"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/ub.py:404
+#: cps/ub.py:443
 msgid "Guest"
 msgstr ""
 
@@ -79,7 +79,7 @@ msgstr ""
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:848 cps/web.py:876 cps/web.py:975 cps/web.py:1216 cps/web.py:2089
+#: cps/web.py:848 cps/web.py:876 cps/web.py:975 cps/web.py:1216 cps/web.py:2103
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 
@@ -134,7 +134,7 @@ msgstr ""
 msgid "Read a Book"
 msgstr ""
 
-#: cps/web.py:1264 cps/web.py:1689
+#: cps/web.py:1264 cps/web.py:1701
 msgid "Please fill out all fields!"
 msgstr ""
 
@@ -250,83 +250,83 @@ msgstr ""
 msgid "Admin page"
 msgstr ""
 
-#: cps/web.py:1644
+#: cps/web.py:1656
 msgid "Calibre-web configuration updated"
 msgstr ""
 
-#: cps/web.py:1651 cps/web.py:1657 cps/web.py:1670
+#: cps/web.py:1663 cps/web.py:1669 cps/web.py:1682
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/web.py:1655
+#: cps/web.py:1667
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:33 cps/web.py:1691 cps/web.py:1735
+#: cps/templates/admin.html:33 cps/web.py:1703 cps/web.py:1749
 msgid "Add new user"
 msgstr ""
 
-#: cps/web.py:1729
+#: cps/web.py:1741
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/web.py:1733
+#: cps/web.py:1745
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 
-#: cps/web.py:1753
+#: cps/web.py:1767
 msgid "Mail settings updated"
 msgstr ""
 
-#: cps/web.py:1759
+#: cps/web.py:1773
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1762
+#: cps/web.py:1776
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:1763
+#: cps/web.py:1777
 msgid "Edit mail settings"
 msgstr ""
 
-#: cps/web.py:1791
+#: cps/web.py:1805
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/web.py:1872
+#: cps/web.py:1886
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/web.py:1875
+#: cps/web.py:1889
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/web.py:1878
+#: cps/web.py:1892
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/web.py:2084 cps/web.py:2087 cps/web.py:2161
+#: cps/web.py:2098 cps/web.py:2101 cps/web.py:2175
 msgid "edit metadata"
 msgstr ""
 
-#: cps/web.py:2119
+#: cps/web.py:2133
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:2124
+#: cps/web.py:2138
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:2129
+#: cps/web.py:2143
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr ""
@@ -464,7 +464,7 @@ msgid "Ok"
 msgstr ""
 
 #: cps/templates/admin.html:95 cps/templates/admin.html:110
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:54
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:75
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111
 msgid "Back"
@@ -523,7 +523,7 @@ msgstr ""
 msgid "view book after edit"
 msgstr ""
 
-#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:52
+#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:73
 #: cps/templates/login.html:19 cps/templates/search_form.html:75
 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109
 msgid "Submit"
@@ -561,7 +561,31 @@ msgstr ""
 msgid "Enable public registration"
 msgstr ""
 
-#: cps/templates/config_edit.html:57 cps/templates/layout.html:91
+#: cps/templates/config_edit.html:52
+msgid "Default Settings for new users"
+msgstr ""
+
+#: cps/templates/config_edit.html:55 cps/templates/user_edit.html:80
+msgid "Admin user"
+msgstr ""
+
+#: cps/templates/config_edit.html:59 cps/templates/user_edit.html:85
+msgid "Allow Downloads"
+msgstr ""
+
+#: cps/templates/config_edit.html:63 cps/templates/user_edit.html:89
+msgid "Allow Uploads"
+msgstr ""
+
+#: cps/templates/config_edit.html:67 cps/templates/user_edit.html:93
+msgid "Allow Edit"
+msgstr ""
+
+#: cps/templates/config_edit.html:71 cps/templates/user_edit.html:98
+msgid "Allow Changing Password"
+msgstr ""
+
+#: cps/templates/config_edit.html:78 cps/templates/layout.html:91
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr ""
@@ -912,26 +936,6 @@ msgstr ""
 msgid "Show random books in detail view"
 msgstr ""
 
-#: cps/templates/user_edit.html:80
-msgid "Admin user"
-msgstr ""
-
-#: cps/templates/user_edit.html:85
-msgid "Allow Downloads"
-msgstr ""
-
-#: cps/templates/user_edit.html:89
-msgid "Allow Uploads"
-msgstr ""
-
-#: cps/templates/user_edit.html:93
-msgid "Allow Edit"
-msgstr ""
-
-#: cps/templates/user_edit.html:98
-msgid "Allow Changing Password"
-msgstr ""
-
 #: cps/templates/user_edit.html:105
 msgid "Delete this user"
 msgstr ""