From 9c889d16816d7539497f5295bcf34318f7c2beda Mon Sep 17 00:00:00 2001 From: OzzieIsaacs <ozzie.fernandez.isaacs@gmail.com> Date: Thu, 30 Aug 2018 09:32:42 +0200 Subject: [PATCH] Fix #597 Updated language files --- cps/templates/admin.html | 30 +++++++++++-------- cps/translations/de/LC_MESSAGES/messages.po | 4 +-- cps/translations/es/LC_MESSAGES/messages.po | 2 +- cps/translations/fr/LC_MESSAGES/messages.po | 2 +- cps/translations/it/LC_MESSAGES/messages.po | 2 +- cps/translations/ja/LC_MESSAGES/messages.po | 2 +- cps/translations/km/LC_MESSAGES/messages.po | 2 +- cps/translations/nl/LC_MESSAGES/messages.po | 2 +- cps/translations/pl/LC_MESSAGES/messages.po | 2 +- cps/translations/ru/LC_MESSAGES/messages.po | 2 +- .../zh_Hans_CN/LC_MESSAGES/messages.po | 2 +- cps/web.py | 2 +- 12 files changed, 29 insertions(+), 25 deletions(-) diff --git a/cps/templates/admin.html b/cps/templates/admin.html index f36ecd9c..5cbaf07e 100644 --- a/cps/templates/admin.html +++ b/cps/templates/admin.html @@ -8,10 +8,10 @@ <th>{{_('Email')}}</th> <th>{{_('Kindle')}}</th> <th>{{_('DLS')}}</th> - <th>{{_('Admin')}}</th> - <th>{{_('Download')}}</th> - <th>{{_('Upload')}}</th> - <th>{{_('Edit')}}</th> + <th class="hidden-xs">{{_('Admin')}}</th> + <th class="hidden-xs">{{_('Download')}}</th> + <th class="hidden-xs">{{_('Upload')}}</th> + <th class="hidden-xs">{{_('Edit')}}</th> </tr> {% for user in content %} {% if not user.role_anonymous() or config.config_anonbrowse %} @@ -20,10 +20,10 @@ <td>{{user.email}}</td> <td>{{user.kindle_mail}}</td> <td>{{user.downloads.count()}}</td> - <td>{% if user.role_admin() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td> - <td>{% if user.role_download() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td> - <td>{% if user.role_upload() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td> - <td>{% if user.role_edit() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td> + <td class="hidden-xs">{% if user.role_admin() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td> + <td class="hidden-xs">{% if user.role_download() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td> + <td class="hidden-xs">{% if user.role_upload() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td> + <td class="hidden-xs">{% if user.role_edit() %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td> </tr> {% endif %} {% endfor %} @@ -36,14 +36,14 @@ <th>{{_('SMTP port')}}</th> <th>{{_('SSL')}}</th> <th>{{_('SMTP login')}}</th> - <th>{{_('From mail')}}</th> + <th class="hidden-xs">{{_('From mail')}}</th> </tr> <tr> <td>{{email.mail_server}}</td> <td>{{email.mail_port}}</td> <td>{% if email.mail_use_ssl %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</td> <td>{{email.mail_login}}</td> - <td>{{email.mail_from}}</td> + <td class="hidden-xs">{{email.mail_from}}</td> </table> <div class="btn btn-default" id="admin_edit_email"><a href="{{url_for('edit_mailsettings')}}">{{_('Change SMTP settings')}}</a></div> <div id="container"> @@ -54,7 +54,7 @@ <div class="col-xs-6 col-sm-6">{{config.config_calibre_dir}}</div> </div> <div class="Row"> - <div class="col-xs-6 col-sm-6">{{_('Log Level')}}</div> + <div class="col-xs-6 col-sm-6">{{_('Log level')}}</div> <div class="col-xs-6 col-sm-6">{{config.get_Log_Level()}}</div> </div> <div class="Row"> @@ -71,14 +71,18 @@ <div class="col-xs-6 col-sm-7">{{_('Uploading')}}</div> <div class="col-xs-6 col-sm-5">{% if config.config_uploading %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div> </div> + <div class="Row"> + <div class="col-xs-6 col-sm-7">{{_('Anonymous browsing')}}</div> + <div class="col-xs-6 col-sm-5">{% if config.config_anonbrowse %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div> + </div> <div class="Row"> <div class="col-xs-6 col-sm-7">{{_('Public registration')}}</div> <div class="col-xs-6 col-sm-5">{% if config.config_public_reg %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div> </div> <div class="Row"> - <div class="col-xs-6 col-sm-7">{{_('Remote Login')}}</div> + <div class="col-xs-6 col-sm-7">{{_('Remote login')}}</div> <div class="col-xs-6 col-sm-5">{% if config.config_remote_login %}<span class="glyphicon glyphicon-ok"></span>{% else %}<span class="glyphicon glyphicon-remove"></span>{% endif %}</div> - </div> + </div> </div> </div> <div class="col-xs-12 col-sm-12"> diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po index b0b3a348..6834a0b7 100644 --- a/cps/translations/de/LC_MESSAGES/messages.po +++ b/cps/translations/de/LC_MESSAGES/messages.po @@ -765,7 +765,7 @@ msgid "Public registration" msgstr "Öffentliche Registrierung" #: cps/templates/admin.html:79 cps/templates/remote_login.html:4 -msgid "Remote Login" +msgid "Remote login" msgstr "Remote Login" #: cps/templates/admin.html:89 @@ -1060,7 +1060,7 @@ msgstr "Öffentliche Registrierung aktivieren" #: cps/templates/config_edit.html:146 msgid "Enable remote login (\"magic link\")" -msgstr "Remote login aktivieren (\"Magischer Link\")" +msgstr "Remote Login aktivieren (\"Magischer Link\")" #: cps/templates/config_edit.html:151 msgid "Use" diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po index 9c56c7c8..69a576b6 100644 --- a/cps/translations/es/LC_MESSAGES/messages.po +++ b/cps/translations/es/LC_MESSAGES/messages.po @@ -746,7 +746,7 @@ msgid "Public registration" msgstr "Registro público" #: cps/templates/admin.html:79 cps/templates/remote_login.html:4 -msgid "Remote Login" +msgid "Remote login" msgstr "" #: cps/templates/admin.html:89 diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po index 3920914a..5515bd5a 100644 --- a/cps/translations/fr/LC_MESSAGES/messages.po +++ b/cps/translations/fr/LC_MESSAGES/messages.po @@ -756,7 +756,7 @@ msgid "Public registration" msgstr "Inscription public" #: cps/templates/admin.html:79 cps/templates/remote_login.html:4 -msgid "Remote Login" +msgid "Remote login" msgstr "" #: cps/templates/admin.html:89 diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po index 259d1b6f..b096d84a 100644 --- a/cps/translations/it/LC_MESSAGES/messages.po +++ b/cps/translations/it/LC_MESSAGES/messages.po @@ -752,7 +752,7 @@ msgid "Public registration" msgstr "Registrazione pubblica" #: cps/templates/admin.html:79 cps/templates/remote_login.html:4 -msgid "Remote Login" +msgid "Remote login" msgstr "Login remoto" #: cps/templates/admin.html:89 diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po index d38958f6..6463d048 100644 --- a/cps/translations/ja/LC_MESSAGES/messages.po +++ b/cps/translations/ja/LC_MESSAGES/messages.po @@ -741,7 +741,7 @@ msgid "Public registration" msgstr "公的登録" #: cps/templates/admin.html:79 cps/templates/remote_login.html:4 -msgid "Remote Login" +msgid "Remote login" msgstr "遠距離ログイン" #: cps/templates/admin.html:89 diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po index e0fac864..67dd1d90 100644 --- a/cps/translations/km/LC_MESSAGES/messages.po +++ b/cps/translations/km/LC_MESSAGES/messages.po @@ -742,7 +742,7 @@ msgid "Public registration" msgstr "ការចុះឈ្មាះសាធារណៈ" #: cps/templates/admin.html:79 cps/templates/remote_login.html:4 -msgid "Remote Login" +msgid "Remote login" msgstr "ការចូលប្រើប្រាស់ពីចម្ងាយ" #: cps/templates/admin.html:89 diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po index 3447d9e6..92d5e08c 100644 --- a/cps/translations/nl/LC_MESSAGES/messages.po +++ b/cps/translations/nl/LC_MESSAGES/messages.po @@ -758,7 +758,7 @@ msgid "Public registration" msgstr "Publieke registratie" #: cps/templates/admin.html:79 cps/templates/remote_login.html:4 -msgid "Remote Login" +msgid "Remote login" msgstr "Login op afstand" #: cps/templates/admin.html:89 diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po index c093f3bd..27096401 100644 --- a/cps/translations/pl/LC_MESSAGES/messages.po +++ b/cps/translations/pl/LC_MESSAGES/messages.po @@ -745,7 +745,7 @@ msgid "Public registration" msgstr "Publiczna rejestracja" #: cps/templates/admin.html:79 cps/templates/remote_login.html:4 -msgid "Remote Login" +msgid "Remote login" msgstr "" #: cps/templates/admin.html:89 diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po index 46532801..2ad9dac0 100644 --- a/cps/translations/ru/LC_MESSAGES/messages.po +++ b/cps/translations/ru/LC_MESSAGES/messages.po @@ -747,7 +747,7 @@ msgid "Public registration" msgstr "Публичная регистрация" #: cps/templates/admin.html:79 cps/templates/remote_login.html:4 -msgid "Remote Login" +msgid "Remote login" msgstr "" #: cps/templates/admin.html:89 diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po index 4e326adc..9984fe44 100644 --- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po +++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po @@ -747,7 +747,7 @@ msgid "Public registration" msgstr "开放注册" #: cps/templates/admin.html:79 cps/templates/remote_login.html:4 -msgid "Remote Login" +msgid "Remote login" msgstr "远程登录" #: cps/templates/admin.html:89 diff --git a/cps/web.py b/cps/web.py index 27bcd8c6..d7b95cd5 100644 --- a/cps/web.py +++ b/cps/web.py @@ -3184,7 +3184,7 @@ def edit_book(book_id): title=_(u"edit metadata"), page="editbook") # Update book - edited_books_id = {} + edited_books_id = set() # Check and handle Uploaded file if 'btn-upload-format' in request.files: