Commit 1692044d authored by OzzieIsaacs's avatar OzzieIsaacs

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

parents 8ededba3 bff86f02
{% extends "layout.html" %} {% extends "layout.html" %}
{% block body %} {% block body %}
<div class="discover"> <div class="discover">
<h1>{{title}}</h1> <h2>{{title}}</h2>
<form role="form" method="POST" autocomplete="off"> <form role="form" method="POST" autocomplete="off">
<div class="form-group required"> <div class="form-group required">
<label for="config_calibre_dir">{{_('Location of Calibre database')}}</label> <label for="config_calibre_dir">{{_('Location of Calibre database')}}</label>
...@@ -49,6 +49,27 @@ ...@@ -49,6 +49,27 @@
<input type="checkbox" id="config_public_reg" name="config_public_reg" {% if content.config_public_reg %}checked{% endif %}> <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> <label for="config_public_reg">{{_('Enable public registration')}}</label>
</div> </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> <button type="submit" class="btn btn-default">{{_('Submit')}}</button>
{% if not origin %} {% if not origin %}
<a href="{{ url_for('admin') }}" class="btn btn-default">{{_('Back')}}</a> <a href="{{ url_for('admin') }}" class="btn btn-default">{{_('Back')}}</a>
......
...@@ -21,7 +21,7 @@ msgid "" ...@@ -21,7 +21,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Calibre-web\n" "Project-Id-Version: Calibre-web\n"
"Report-Msgid-Bugs-To: https://github.com/janeczku/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" "PO-Revision-Date: 2016-07-12 19:54+0200\n"
"Last-Translator: Ozzie Isaacs\n" "Last-Translator: Ozzie Isaacs\n"
"Language: de\n" "Language: de\n"
...@@ -67,7 +67,7 @@ msgstr "Konnte .epub nicht nach .mobi konvertieren" ...@@ -67,7 +67,7 @@ msgstr "Konnte .epub nicht nach .mobi konvertieren"
msgid "The requested file could not be read. Maybe wrong permissions?" msgid "The requested file could not be read. Maybe wrong permissions?"
msgstr "Die angeforderte Datei konnte nicht gelesen werden. Falsche Dateirechte?" msgstr "Die angeforderte Datei konnte nicht gelesen werden. Falsche Dateirechte?"
#: cps/ub.py:404 #: cps/ub.py:443
msgid "Guest" msgid "Guest"
msgstr "Gast" msgstr "Gast"
...@@ -96,7 +96,7 @@ msgstr "Autorenliste" ...@@ -96,7 +96,7 @@ msgstr "Autorenliste"
msgid "Author: %(name)s" msgid "Author: %(name)s"
msgstr "" 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:" msgid "Error opening eBook. File does not exist or file is not accessible:"
msgstr "" msgstr ""
"Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht " "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht "
...@@ -153,7 +153,7 @@ msgstr "Suche" ...@@ -153,7 +153,7 @@ msgstr "Suche"
msgid "Read a Book" msgid "Read a Book"
msgstr "Lese ein Buch" 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!" msgid "Please fill out all fields!"
msgstr "Bitte alle Felder ausfüllen!" msgstr "Bitte alle Felder ausfüllen!"
...@@ -269,85 +269,85 @@ msgstr "Profil aktualisiert" ...@@ -269,85 +269,85 @@ msgstr "Profil aktualisiert"
msgid "Admin page" msgid "Admin page"
msgstr "Admin Seite" msgstr "Admin Seite"
#: cps/web.py:1644 #: cps/web.py:1656
msgid "Calibre-web configuration updated" msgid "Calibre-web configuration updated"
msgstr "Calibre-web Konfiguration wurde aktualisiert" 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" msgid "Basic Configuration"
msgstr "Basis Konfiguration" msgstr "Basis Konfiguration"
#: cps/web.py:1655 #: cps/web.py:1667
msgid "DB location is not valid, please enter correct path" msgid "DB location is not valid, please enter correct path"
msgstr "DB Speicherort ist ungültig, bitte Pfad korrigieren" 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" msgid "Add new user"
msgstr "Neuen Benutzer hinzufügen" msgstr "Neuen Benutzer hinzufügen"
#: cps/web.py:1729 #: cps/web.py:1741
#, python-format #, python-format
msgid "User '%(user)s' created" msgid "User '%(user)s' created"
msgstr "Benutzer '%(user)s' angelegt" msgstr "Benutzer '%(user)s' angelegt"
#: cps/web.py:1733 #: cps/web.py:1745
msgid "Found an existing account for this email address or nickname." msgid "Found an existing account for this email address or nickname."
msgstr "" msgstr ""
"Es existiert ein Benutzerkonto für diese Emailadresse oder den " "Es existiert ein Benutzerkonto für diese Emailadresse oder den "
"Benutzernamen." "Benutzernamen."
#: cps/web.py:1753 #: cps/web.py:1767
msgid "Mail settings updated" msgid "Mail settings updated"
msgstr "E-Mail Einstellungen aktualisiert" msgstr "E-Mail Einstellungen aktualisiert"
#: cps/web.py:1759 #: cps/web.py:1773
#, python-format #, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s" msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr "Test E-Mail erfolgreich an %(kindlemail)s versendet" msgstr "Test E-Mail erfolgreich an %(kindlemail)s versendet"
#: cps/web.py:1762 #: cps/web.py:1776
#, python-format #, python-format
msgid "There was an error sending the Test E-Mail: %(res)s" msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr "Fehler beim versenden der 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" msgid "Edit mail settings"
msgstr "E-Mail Einstellungen editieren" msgstr "E-Mail Einstellungen editieren"
#: cps/web.py:1791 #: cps/web.py:1805
#, python-format #, python-format
msgid "User '%(nick)s' deleted" msgid "User '%(nick)s' deleted"
msgstr "Benutzer '%(nick)s' gelöscht" msgstr "Benutzer '%(nick)s' gelöscht"
#: cps/web.py:1872 #: cps/web.py:1886
#, python-format #, python-format
msgid "User '%(nick)s' updated" msgid "User '%(nick)s' updated"
msgstr "Benutzer '%(nick)s' aktualisiert" msgstr "Benutzer '%(nick)s' aktualisiert"
#: cps/web.py:1875 #: cps/web.py:1889
msgid "An unknown error occured." msgid "An unknown error occured."
msgstr "Es ist ein unbekanter Fehler aufgetreten" msgstr "Es ist ein unbekanter Fehler aufgetreten"
#: cps/web.py:1878 #: cps/web.py:1892
#, python-format #, python-format
msgid "Edit User %(nick)s" msgid "Edit User %(nick)s"
msgstr "Benutzer %(nick)s bearbeiten" 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" msgid "edit metadata"
msgstr "Metadaten editieren" msgstr "Metadaten editieren"
#: cps/web.py:2119 #: cps/web.py:2133
#, python-format #, python-format
msgid "Failed to create path %s (Permission denied)." msgid "Failed to create path %s (Permission denied)."
msgstr "Fehler beim Erzeugen des Pfads %s (Zugriff verweigert)" msgstr "Fehler beim Erzeugen des Pfads %s (Zugriff verweigert)"
#: cps/web.py:2124 #: cps/web.py:2138
#, python-format #, python-format
msgid "Failed to store file %s (Permission denied)." msgid "Failed to store file %s (Permission denied)."
msgstr "Fehler beim speichern der Datei %s (Zugriff verweigert)" msgstr "Fehler beim speichern der Datei %s (Zugriff verweigert)"
#: cps/web.py:2129 #: cps/web.py:2143
#, python-format #, python-format
msgid "Failed to delete file %s (Permission denied)." msgid "Failed to delete file %s (Permission denied)."
msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)" msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)"
...@@ -485,7 +485,7 @@ msgid "Ok" ...@@ -485,7 +485,7 @@ msgid "Ok"
msgstr "Ok" msgstr "Ok"
#: cps/templates/admin.html:95 cps/templates/admin.html:110 #: 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/email_edit.html:36 cps/templates/shelf_edit.html:17
#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111
msgid "Back" msgid "Back"
...@@ -544,7 +544,7 @@ msgstr "Nein" ...@@ -544,7 +544,7 @@ msgstr "Nein"
msgid "view book after edit" msgid "view book after edit"
msgstr "Buch nach Bearbeitung ansehen" 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/login.html:19 cps/templates/search_form.html:75
#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109
msgid "Submit" msgid "Submit"
...@@ -582,7 +582,31 @@ msgstr "Anonymes Browsen aktivieren" ...@@ -582,7 +582,31 @@ msgstr "Anonymes Browsen aktivieren"
msgid "Enable public registration" msgid "Enable public registration"
msgstr "Öffentliche Registrierung aktivieren" 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 #: cps/templates/login.html:4
msgid "Login" msgid "Login"
msgstr "Login" msgstr "Login"
...@@ -935,26 +959,6 @@ msgstr "Zeige Autorenauswahl" ...@@ -935,26 +959,6 @@ msgstr "Zeige Autorenauswahl"
msgid "Show random books in detail view" msgid "Show random books in detail view"
msgstr "Zeige zufällige Bücher in der Detailansicht" 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 #: cps/templates/user_edit.html:105
msgid "Delete this user" msgid "Delete this user"
msgstr "Benutzer löschen" msgstr "Benutzer löschen"
......
...@@ -14,7 +14,7 @@ msgid "" ...@@ -14,7 +14,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Calibre-web\n" "Project-Id-Version: Calibre-web\n"
"Report-Msgid-Bugs-To: https://github.com/janeczku/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" "PO-Revision-Date: 2016-11-13 18:35+0100\n"
"Last-Translator: Juan F. Villa <juan.villa@paisdelconocimiento.org>\n" "Last-Translator: Juan F. Villa <juan.villa@paisdelconocimiento.org>\n"
"Language: es\n" "Language: es\n"
...@@ -58,7 +58,7 @@ msgstr "No fue posible convertir de epub a mobi" ...@@ -58,7 +58,7 @@ msgstr "No fue posible convertir de epub a mobi"
msgid "The requested file could not be read. Maybe wrong permissions?" msgid "The requested file could not be read. Maybe wrong permissions?"
msgstr "El fichero solicitado no puede ser leido. Problema de permisos?" msgstr "El fichero solicitado no puede ser leido. Problema de permisos?"
#: cps/ub.py:404 #: cps/ub.py:443
msgid "Guest" msgid "Guest"
msgstr "" msgstr ""
...@@ -87,7 +87,7 @@ msgstr "Lista de Autores" ...@@ -87,7 +87,7 @@ msgstr "Lista de Autores"
msgid "Author: %(name)s" msgid "Author: %(name)s"
msgstr "" 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:" 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" msgstr "Error en apertura del Objeto. El archivo no existe o no es accesible"
...@@ -142,7 +142,7 @@ msgstr "" ...@@ -142,7 +142,7 @@ msgstr ""
msgid "Read a Book" msgid "Read a Book"
msgstr "Leer un Libro" 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!" msgid "Please fill out all fields!"
msgstr "Por favor llenar todos los campos!" msgstr "Por favor llenar todos los campos!"
...@@ -258,83 +258,83 @@ msgstr "Perfil actualizado" ...@@ -258,83 +258,83 @@ msgstr "Perfil actualizado"
msgid "Admin page" msgid "Admin page"
msgstr "" msgstr ""
#: cps/web.py:1644 #: cps/web.py:1656
msgid "Calibre-web configuration updated" msgid "Calibre-web configuration updated"
msgstr "" 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" msgid "Basic Configuration"
msgstr "" msgstr ""
#: cps/web.py:1655 #: cps/web.py:1667
msgid "DB location is not valid, please enter correct path" msgid "DB location is not valid, please enter correct path"
msgstr "" 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" msgid "Add new user"
msgstr "Agregar un nuevo usuario" msgstr "Agregar un nuevo usuario"
#: cps/web.py:1729 #: cps/web.py:1741
#, python-format #, python-format
msgid "User '%(user)s' created" msgid "User '%(user)s' created"
msgstr "Usuario '%(user)s' creado" msgstr "Usuario '%(user)s' creado"
#: cps/web.py:1733 #: cps/web.py:1745
msgid "Found an existing account for this email address or nickname." 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." 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" msgid "Mail settings updated"
msgstr "Parametros de correo actualizados" msgstr "Parametros de correo actualizados"
#: cps/web.py:1759 #: cps/web.py:1773
#, python-format #, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s" msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr "Exito al realizar envio de prueba a %(kindlemail)s" msgstr "Exito al realizar envio de prueba a %(kindlemail)s"
#: cps/web.py:1762 #: cps/web.py:1776
#, python-format #, python-format
msgid "There was an error sending the Test E-Mail: %(res)s" msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr "Error al realizar envio de prueba a 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" msgid "Edit mail settings"
msgstr "Editar parametros de correo" msgstr "Editar parametros de correo"
#: cps/web.py:1791 #: cps/web.py:1805
#, python-format #, python-format
msgid "User '%(nick)s' deleted" msgid "User '%(nick)s' deleted"
msgstr "Usuario '%(nick)s' borrado" msgstr "Usuario '%(nick)s' borrado"
#: cps/web.py:1872 #: cps/web.py:1886
#, python-format #, python-format
msgid "User '%(nick)s' updated" msgid "User '%(nick)s' updated"
msgstr "Usuario '%(nick)s' Actualizado" msgstr "Usuario '%(nick)s' Actualizado"
#: cps/web.py:1875 #: cps/web.py:1889
msgid "An unknown error occured." msgid "An unknown error occured."
msgstr "Oups ! Error inesperado." msgstr "Oups ! Error inesperado."
#: cps/web.py:1878 #: cps/web.py:1892
#, python-format #, python-format
msgid "Edit User %(nick)s" msgid "Edit User %(nick)s"
msgstr "Editar Usuario %(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" msgid "edit metadata"
msgstr "" msgstr ""
#: cps/web.py:2119 #: cps/web.py:2133
#, python-format #, python-format
msgid "Failed to create path %s (Permission denied)." msgid "Failed to create path %s (Permission denied)."
msgstr "Fallo al crear la ruta %s (permiso negado)" msgstr "Fallo al crear la ruta %s (permiso negado)"
#: cps/web.py:2124 #: cps/web.py:2138
#, python-format #, python-format
msgid "Failed to store file %s (Permission denied)." msgid "Failed to store file %s (Permission denied)."
msgstr "Fallo al almacenar el archivo %s (permiso negado)" msgstr "Fallo al almacenar el archivo %s (permiso negado)"
#: cps/web.py:2129 #: cps/web.py:2143
#, python-format #, python-format
msgid "Failed to delete file %s (Permission denied)." msgid "Failed to delete file %s (Permission denied)."
msgstr "Fallo al borrar el archivo %s (permiso negado)" msgstr "Fallo al borrar el archivo %s (permiso negado)"
...@@ -472,7 +472,7 @@ msgid "Ok" ...@@ -472,7 +472,7 @@ msgid "Ok"
msgstr "" msgstr ""
#: cps/templates/admin.html:95 cps/templates/admin.html:110 #: 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/email_edit.html:36 cps/templates/shelf_edit.html:17
#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111
msgid "Back" msgid "Back"
...@@ -531,7 +531,7 @@ msgstr "No" ...@@ -531,7 +531,7 @@ msgstr "No"
msgid "view book after edit" msgid "view book after edit"
msgstr "Ver libro tras la edicion" 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/login.html:19 cps/templates/search_form.html:75
#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109
msgid "Submit" msgid "Submit"
...@@ -569,7 +569,31 @@ msgstr "" ...@@ -569,7 +569,31 @@ msgstr ""
msgid "Enable public registration" msgid "Enable public registration"
msgstr "" 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 #: cps/templates/login.html:4
msgid "Login" msgid "Login"
msgstr "Inicio de Sesion" msgstr "Inicio de Sesion"
...@@ -920,26 +944,6 @@ msgstr "" ...@@ -920,26 +944,6 @@ msgstr ""
msgid "Show random books in detail view" msgid "Show random books in detail view"
msgstr "" 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 #: cps/templates/user_edit.html:105
msgid "Delete this user" msgid "Delete this user"
msgstr "Borrar este usuario" msgstr "Borrar este usuario"
......
...@@ -20,7 +20,7 @@ msgid "" ...@@ -20,7 +20,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Calibre-web\n" "Project-Id-Version: Calibre-web\n"
"Report-Msgid-Bugs-To: https://github.com/janeczku/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" "PO-Revision-Date: 2016-11-13 18:35+0100\n"
"Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n" "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
"Language: fr\n" "Language: fr\n"
...@@ -66,7 +66,7 @@ msgstr "" ...@@ -66,7 +66,7 @@ msgstr ""
"Le fichier demandé ne peux pas être lu. Peut-être de mauvaises " "Le fichier demandé ne peux pas être lu. Peut-être de mauvaises "
"permissions ?" "permissions ?"
#: cps/ub.py:404 #: cps/ub.py:443
msgid "Guest" msgid "Guest"
msgstr "" msgstr ""
...@@ -95,7 +95,7 @@ msgstr "Liste des auteurs" ...@@ -95,7 +95,7 @@ msgstr "Liste des auteurs"
msgid "Author: %(name)s" msgid "Author: %(name)s"
msgstr "" 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:" msgid "Error opening eBook. File does not exist or file is not accessible:"
msgstr "" msgstr ""
"Erreur d'ouverture du livre numérique. Le fichier n'existe pas ou n'est " "Erreur d'ouverture du livre numérique. Le fichier n'existe pas ou n'est "
...@@ -152,7 +152,7 @@ msgstr "" ...@@ -152,7 +152,7 @@ msgstr ""
msgid "Read a Book" msgid "Read a Book"
msgstr "Lire un livre" 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!" msgid "Please fill out all fields!"
msgstr "SVP, complétez tous les champs !" msgstr "SVP, complétez tous les champs !"
...@@ -268,83 +268,83 @@ msgstr "Profil mis à jour" ...@@ -268,83 +268,83 @@ msgstr "Profil mis à jour"
msgid "Admin page" msgid "Admin page"
msgstr "" msgstr ""
#: cps/web.py:1644 #: cps/web.py:1656
msgid "Calibre-web configuration updated" msgid "Calibre-web configuration updated"
msgstr "" 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" msgid "Basic Configuration"
msgstr "" msgstr ""
#: cps/web.py:1655 #: cps/web.py:1667
msgid "DB location is not valid, please enter correct path" msgid "DB location is not valid, please enter correct path"
msgstr "" 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" msgid "Add new user"
msgstr "Ajouter un nouvel utilisateur" msgstr "Ajouter un nouvel utilisateur"
#: cps/web.py:1729 #: cps/web.py:1741
#, python-format #, python-format
msgid "User '%(user)s' created" msgid "User '%(user)s' created"
msgstr "Utilisateur '%(user)s' créé" msgstr "Utilisateur '%(user)s' créé"
#: cps/web.py:1733 #: cps/web.py:1745
msgid "Found an existing account for this email address or nickname." 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à." 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" msgid "Mail settings updated"
msgstr "Paramètres de courriel mis à jour" msgstr "Paramètres de courriel mis à jour"
#: cps/web.py:1759 #: cps/web.py:1773
#, python-format #, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s" msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr "" msgstr ""
#: cps/web.py:1762 #: cps/web.py:1776
#, python-format #, python-format
msgid "There was an error sending the Test E-Mail: %(res)s" msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr "" msgstr ""
#: cps/web.py:1763 #: cps/web.py:1777
msgid "Edit mail settings" msgid "Edit mail settings"
msgstr "Éditer les paramètres de courriel" msgstr "Éditer les paramètres de courriel"
#: cps/web.py:1791 #: cps/web.py:1805
#, python-format #, python-format
msgid "User '%(nick)s' deleted" msgid "User '%(nick)s' deleted"
msgstr "Utilisateur '%(nick)s' supprimé" msgstr "Utilisateur '%(nick)s' supprimé"
#: cps/web.py:1872 #: cps/web.py:1886
#, python-format #, python-format
msgid "User '%(nick)s' updated" msgid "User '%(nick)s' updated"
msgstr "Utilisateur '%(nick)s' mis à jour" msgstr "Utilisateur '%(nick)s' mis à jour"
#: cps/web.py:1875 #: cps/web.py:1889
msgid "An unknown error occured." msgid "An unknown error occured."
msgstr "Oups ! Une erreur inconnue a eu lieu." msgstr "Oups ! Une erreur inconnue a eu lieu."
#: cps/web.py:1878 #: cps/web.py:1892
#, python-format #, python-format
msgid "Edit User %(nick)s" msgid "Edit User %(nick)s"
msgstr "Éditer l'utilisateur %(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" msgid "edit metadata"
msgstr "" msgstr ""
#: cps/web.py:2119 #: cps/web.py:2133
#, python-format #, python-format
msgid "Failed to create path %s (Permission denied)." msgid "Failed to create path %s (Permission denied)."
msgstr "Impossible de créer le chemin %s (permission refusée)" msgstr "Impossible de créer le chemin %s (permission refusée)"
#: cps/web.py:2124 #: cps/web.py:2138
#, python-format #, python-format
msgid "Failed to store file %s (Permission denied)." msgid "Failed to store file %s (Permission denied)."
msgstr "Impossible d'enregistrer le fichier %s (permission refusée)" msgstr "Impossible d'enregistrer le fichier %s (permission refusée)"
#: cps/web.py:2129 #: cps/web.py:2143
#, python-format #, python-format
msgid "Failed to delete file %s (Permission denied)." msgid "Failed to delete file %s (Permission denied)."
msgstr "Impossible de supprimer le fichier %s (permission refusée)" msgstr "Impossible de supprimer le fichier %s (permission refusée)"
...@@ -482,7 +482,7 @@ msgid "Ok" ...@@ -482,7 +482,7 @@ msgid "Ok"
msgstr "" msgstr ""
#: cps/templates/admin.html:95 cps/templates/admin.html:110 #: 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/email_edit.html:36 cps/templates/shelf_edit.html:17
#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111
msgid "Back" msgid "Back"
...@@ -541,7 +541,7 @@ msgstr "Non" ...@@ -541,7 +541,7 @@ msgstr "Non"
msgid "view book after edit" msgid "view book after edit"
msgstr "Voir le livre après l'édition" 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/login.html:19 cps/templates/search_form.html:75
#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109
msgid "Submit" msgid "Submit"
...@@ -579,7 +579,31 @@ msgstr "" ...@@ -579,7 +579,31 @@ msgstr ""
msgid "Enable public registration" msgid "Enable public registration"
msgstr "" 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 #: cps/templates/login.html:4
msgid "Login" msgid "Login"
msgstr "Connexion" msgstr "Connexion"
...@@ -930,26 +954,6 @@ msgstr "" ...@@ -930,26 +954,6 @@ msgstr ""
msgid "Show random books in detail view" msgid "Show random books in detail view"
msgstr "" 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 #: cps/templates/user_edit.html:105
msgid "Delete this user" msgid "Delete this user"
msgstr "Supprimer cet utilisateur" msgstr "Supprimer cet utilisateur"
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Calibre Web - polski\n" "Project-Id-Version: Calibre Web - polski\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: 2017-02-10 12:31+0100\n"
"Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n" "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
"Language: pl\n" "Language: pl\n"
...@@ -55,7 +55,7 @@ msgstr "Nie można konwertować epub do mobi" ...@@ -55,7 +55,7 @@ msgstr "Nie można konwertować epub do mobi"
msgid "The requested file could not be read. Maybe wrong permissions?" msgid "The requested file could not be read. Maybe wrong permissions?"
msgstr "Żądany plik nie może być odczytany. Może złe uprawnienia?" msgstr "Żądany plik nie może być odczytany. Może złe uprawnienia?"
#: cps/ub.py:404 #: cps/ub.py:443
msgid "Guest" msgid "Guest"
msgstr "" msgstr ""
...@@ -84,7 +84,7 @@ msgstr "Lista autorów" ...@@ -84,7 +84,7 @@ msgstr "Lista autorów"
msgid "Author: %(name)s" msgid "Author: %(name)s"
msgstr "" 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:" 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:" msgstr "Błąd otwierania e-booka. Plik nie istnieje lub plik nie jest dostępny:"
...@@ -139,7 +139,7 @@ msgstr "" ...@@ -139,7 +139,7 @@ msgstr ""
msgid "Read a Book" msgid "Read a Book"
msgstr "Czytaj książkę" 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!" msgid "Please fill out all fields!"
msgstr "Proszę wypełnić wszystkie pola!" msgstr "Proszę wypełnić wszystkie pola!"
...@@ -255,83 +255,83 @@ msgstr "Zaktualizowano profil" ...@@ -255,83 +255,83 @@ msgstr "Zaktualizowano profil"
msgid "Admin page" msgid "Admin page"
msgstr "Portal administracyjny" msgstr "Portal administracyjny"
#: cps/web.py:1644 #: cps/web.py:1656
msgid "Calibre-web configuration updated" msgid "Calibre-web configuration updated"
msgstr "" 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" msgid "Basic Configuration"
msgstr "" msgstr ""
#: cps/web.py:1655 #: cps/web.py:1667
msgid "DB location is not valid, please enter correct path" msgid "DB location is not valid, please enter correct path"
msgstr "" 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" msgid "Add new user"
msgstr "Dodaj nowego użytkownika" msgstr "Dodaj nowego użytkownika"
#: cps/web.py:1729 #: cps/web.py:1741
#, python-format #, python-format
msgid "User '%(user)s' created" msgid "User '%(user)s' created"
msgstr "Użytkownik '%(user)s' został utworzony" 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." 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." 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" msgid "Mail settings updated"
msgstr "Zaktualizowano ustawienia poczty e-mail" msgstr "Zaktualizowano ustawienia poczty e-mail"
#: cps/web.py:1759 #: cps/web.py:1773
#, python-format #, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s" msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr "Testowy e-mail pomyślnie wysłany do %(kindlemail)s" msgstr "Testowy e-mail pomyślnie wysłany do %(kindlemail)s"
#: cps/web.py:1762 #: cps/web.py:1776
#, python-format #, python-format
msgid "There was an error sending the Test E-Mail: %(res)s" msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr "" msgstr ""
#: cps/web.py:1763 #: cps/web.py:1777
msgid "Edit mail settings" msgid "Edit mail settings"
msgstr "Edytuj ustawienia poczty e-mail" msgstr "Edytuj ustawienia poczty e-mail"
#: cps/web.py:1791 #: cps/web.py:1805
#, python-format #, python-format
msgid "User '%(nick)s' deleted" msgid "User '%(nick)s' deleted"
msgstr "Użytkownik '%(nick)s' został usunięty" msgstr "Użytkownik '%(nick)s' został usunięty"
#: cps/web.py:1872 #: cps/web.py:1886
#, python-format #, python-format
msgid "User '%(nick)s' updated" msgid "User '%(nick)s' updated"
msgstr "Użytkownik '%(nick)s' został zaktualizowany" msgstr "Użytkownik '%(nick)s' został zaktualizowany"
#: cps/web.py:1875 #: cps/web.py:1889
msgid "An unknown error occured." msgid "An unknown error occured."
msgstr "" msgstr ""
#: cps/web.py:1878 #: cps/web.py:1892
#, python-format #, python-format
msgid "Edit User %(nick)s" msgid "Edit User %(nick)s"
msgstr "Edytuj użytkownika %(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" msgid "edit metadata"
msgstr "" msgstr ""
#: cps/web.py:2119 #: cps/web.py:2133
#, python-format #, python-format
msgid "Failed to create path %s (Permission denied)." msgid "Failed to create path %s (Permission denied)."
msgstr "" msgstr ""
#: cps/web.py:2124 #: cps/web.py:2138
#, python-format #, python-format
msgid "Failed to store file %s (Permission denied)." msgid "Failed to store file %s (Permission denied)."
msgstr "" msgstr ""
#: cps/web.py:2129 #: cps/web.py:2143
#, python-format #, python-format
msgid "Failed to delete file %s (Permission denied)." msgid "Failed to delete file %s (Permission denied)."
msgstr "" msgstr ""
...@@ -469,7 +469,7 @@ msgid "Ok" ...@@ -469,7 +469,7 @@ msgid "Ok"
msgstr "" msgstr ""
#: cps/templates/admin.html:95 cps/templates/admin.html:110 #: 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/email_edit.html:36 cps/templates/shelf_edit.html:17
#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111
msgid "Back" msgid "Back"
...@@ -528,7 +528,7 @@ msgstr "Nie" ...@@ -528,7 +528,7 @@ msgstr "Nie"
msgid "view book after edit" msgid "view book after edit"
msgstr "wyświetl książkę po edycji" 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/login.html:19 cps/templates/search_form.html:75
#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109
msgid "Submit" msgid "Submit"
...@@ -566,7 +566,31 @@ msgstr "" ...@@ -566,7 +566,31 @@ msgstr ""
msgid "Enable public registration" msgid "Enable public registration"
msgstr "" 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 #: cps/templates/login.html:4
msgid "Login" msgid "Login"
msgstr "Zaloguj się" msgstr "Zaloguj się"
...@@ -917,26 +941,6 @@ msgstr "" ...@@ -917,26 +941,6 @@ msgstr ""
msgid "Show random books in detail view" msgid "Show random books in detail view"
msgstr "" 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 #: cps/templates/user_edit.html:105
msgid "Delete this user" msgid "Delete this user"
msgstr "Usuń tego użytkownika" msgstr "Usuń tego użytkownika"
......
...@@ -262,6 +262,7 @@ class Settings(Base): ...@@ -262,6 +262,7 @@ class Settings(Base):
config_uploading = Column(SmallInteger, default=0) config_uploading = Column(SmallInteger, default=0)
config_anonbrowse = Column(SmallInteger, default=0) config_anonbrowse = Column(SmallInteger, default=0)
config_public_reg = Column(SmallInteger, default=0) config_public_reg = Column(SmallInteger, default=0)
config_default_role = Column(SmallInteger, default=0)
def __repr__(self): def __repr__(self):
pass pass
...@@ -287,7 +288,8 @@ class Config: ...@@ -287,7 +288,8 @@ class Config:
self.config_uploading = data.config_uploading self.config_uploading = data.config_uploading
self.config_anonbrowse = data.config_anonbrowse self.config_anonbrowse = data.config_anonbrowse
self.config_public_reg = data.config_public_reg 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 self.db_configured = True
else: else:
self.db_configured = False self.db_configured = False
...@@ -296,6 +298,36 @@ class Config: ...@@ -296,6 +298,36 @@ class Config:
def get_main_dir(self): def get_main_dir(self):
return self.config_main_dir 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): def get_Log_Level(self):
ret_value="" ret_value=""
if self.config_log_level == logging.INFO: if self.config_log_level == logging.INFO:
...@@ -338,6 +370,13 @@ def migrate_Database(): ...@@ -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_anonbrowse` SmallInteger DEFAULT 0")
conn.execute("ALTER TABLE Settings ADD column `config_public_reg` SmallInteger DEFAULT 0") conn.execute("ALTER TABLE Settings ADD column `config_public_reg` SmallInteger DEFAULT 0")
session.commit() 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: try:
session.query(exists().where(BookShelf.order)).scalar() session.query(exists().where(BookShelf.order)).scalar()
session.commit() session.commit()
......
...@@ -1271,7 +1271,7 @@ def register(): ...@@ -1271,7 +1271,7 @@ def register():
content.password = generate_password_hash(to_save["password"]) content.password = generate_password_hash(to_save["password"])
content.nickname = to_save["nickname"] content.nickname = to_save["nickname"]
content.email = to_save["email"] content.email = to_save["email"]
content.role = 0 content.role = config.config_default_role
try: try:
ub.session.add(content) ub.session.add(content)
ub.session.commit() ub.session.commit()
...@@ -1635,6 +1635,18 @@ def configuration_helper(origin): ...@@ -1635,6 +1635,18 @@ def configuration_helper(origin):
content.config_anonbrowse = 1 content.config_anonbrowse = 1
if "config_public_reg" in to_save and to_save["config_public_reg"] == "on": if "config_public_reg" in to_save and to_save["config_public_reg"] == "on":
content.config_public_reg = 1 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: try:
if db_change: if db_change:
if config.db_configured: if config.db_configured:
...@@ -1731,6 +1743,8 @@ def new_user(): ...@@ -1731,6 +1743,8 @@ def new_user():
except IntegrityError: except IntegrityError:
ub.session.rollback() ub.session.rollback()
flash(_(u"Found an existing account for this email address or nickname."), category="error") 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, return render_title_template("user_edit.html", new_user=1, content=content, translations=translations,
languages=languages, title=_(u"Add new user")) languages=languages, title=_(u"Add new user"))
......
...@@ -8,7 +8,7 @@ msgid "" ...@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -50,7 +50,7 @@ msgstr "" ...@@ -50,7 +50,7 @@ msgstr ""
msgid "The requested file could not be read. Maybe wrong permissions?" msgid "The requested file could not be read. Maybe wrong permissions?"
msgstr "" msgstr ""
#: cps/ub.py:404 #: cps/ub.py:443
msgid "Guest" msgid "Guest"
msgstr "" msgstr ""
...@@ -79,7 +79,7 @@ msgstr "" ...@@ -79,7 +79,7 @@ msgstr ""
msgid "Author: %(name)s" msgid "Author: %(name)s"
msgstr "" 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:" msgid "Error opening eBook. File does not exist or file is not accessible:"
msgstr "" msgstr ""
...@@ -134,7 +134,7 @@ msgstr "" ...@@ -134,7 +134,7 @@ msgstr ""
msgid "Read a Book" msgid "Read a Book"
msgstr "" msgstr ""
#: cps/web.py:1264 cps/web.py:1689 #: cps/web.py:1264 cps/web.py:1701
msgid "Please fill out all fields!" msgid "Please fill out all fields!"
msgstr "" msgstr ""
...@@ -250,83 +250,83 @@ msgstr "" ...@@ -250,83 +250,83 @@ msgstr ""
msgid "Admin page" msgid "Admin page"
msgstr "" msgstr ""
#: cps/web.py:1644 #: cps/web.py:1656
msgid "Calibre-web configuration updated" msgid "Calibre-web configuration updated"
msgstr "" 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" msgid "Basic Configuration"
msgstr "" msgstr ""
#: cps/web.py:1655 #: cps/web.py:1667
msgid "DB location is not valid, please enter correct path" msgid "DB location is not valid, please enter correct path"
msgstr "" 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" msgid "Add new user"
msgstr "" msgstr ""
#: cps/web.py:1729 #: cps/web.py:1741
#, python-format #, python-format
msgid "User '%(user)s' created" msgid "User '%(user)s' created"
msgstr "" msgstr ""
#: cps/web.py:1733 #: cps/web.py:1745
msgid "Found an existing account for this email address or nickname." msgid "Found an existing account for this email address or nickname."
msgstr "" msgstr ""
#: cps/web.py:1753 #: cps/web.py:1767
msgid "Mail settings updated" msgid "Mail settings updated"
msgstr "" msgstr ""
#: cps/web.py:1759 #: cps/web.py:1773
#, python-format #, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s" msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr "" msgstr ""
#: cps/web.py:1762 #: cps/web.py:1776
#, python-format #, python-format
msgid "There was an error sending the Test E-Mail: %(res)s" msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr "" msgstr ""
#: cps/web.py:1763 #: cps/web.py:1777
msgid "Edit mail settings" msgid "Edit mail settings"
msgstr "" msgstr ""
#: cps/web.py:1791 #: cps/web.py:1805
#, python-format #, python-format
msgid "User '%(nick)s' deleted" msgid "User '%(nick)s' deleted"
msgstr "" msgstr ""
#: cps/web.py:1872 #: cps/web.py:1886
#, python-format #, python-format
msgid "User '%(nick)s' updated" msgid "User '%(nick)s' updated"
msgstr "" msgstr ""
#: cps/web.py:1875 #: cps/web.py:1889
msgid "An unknown error occured." msgid "An unknown error occured."
msgstr "" msgstr ""
#: cps/web.py:1878 #: cps/web.py:1892
#, python-format #, python-format
msgid "Edit User %(nick)s" msgid "Edit User %(nick)s"
msgstr "" 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" msgid "edit metadata"
msgstr "" msgstr ""
#: cps/web.py:2119 #: cps/web.py:2133
#, python-format #, python-format
msgid "Failed to create path %s (Permission denied)." msgid "Failed to create path %s (Permission denied)."
msgstr "" msgstr ""
#: cps/web.py:2124 #: cps/web.py:2138
#, python-format #, python-format
msgid "Failed to store file %s (Permission denied)." msgid "Failed to store file %s (Permission denied)."
msgstr "" msgstr ""
#: cps/web.py:2129 #: cps/web.py:2143
#, python-format #, python-format
msgid "Failed to delete file %s (Permission denied)." msgid "Failed to delete file %s (Permission denied)."
msgstr "" msgstr ""
...@@ -464,7 +464,7 @@ msgid "Ok" ...@@ -464,7 +464,7 @@ msgid "Ok"
msgstr "" msgstr ""
#: cps/templates/admin.html:95 cps/templates/admin.html:110 #: 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/email_edit.html:36 cps/templates/shelf_edit.html:17
#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:111
msgid "Back" msgid "Back"
...@@ -523,7 +523,7 @@ msgstr "" ...@@ -523,7 +523,7 @@ msgstr ""
msgid "view book after edit" msgid "view book after edit"
msgstr "" 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/login.html:19 cps/templates/search_form.html:75
#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:109
msgid "Submit" msgid "Submit"
...@@ -561,7 +561,31 @@ msgstr "" ...@@ -561,7 +561,31 @@ msgstr ""
msgid "Enable public registration" msgid "Enable public registration"
msgstr "" 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 #: cps/templates/login.html:4
msgid "Login" msgid "Login"
msgstr "" msgstr ""
...@@ -912,26 +936,6 @@ msgstr "" ...@@ -912,26 +936,6 @@ msgstr ""
msgid "Show random books in detail view" msgid "Show random books in detail view"
msgstr "" 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 #: cps/templates/user_edit.html:105
msgid "Delete this user" msgid "Delete this user"
msgstr "" msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment