mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-31 07:13:02 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source 
# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt
This commit is contained in:
Ozzieisaacs
2020-01-26 19:29:36 +01:00
parent 0411d4a8c9 3c63e2b7e4
commit 2eec329bdf
13 changed files with 361 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cps/templates/user_edit.html
View File

@@ -26,6 +26,7 @@
<label for="kindle_mail">{{_('Kindle E-Mail')}}</label>
<input type="email" class="form-control" name="kindle_mail" id="kindle_mail" value="{{ content.kindle_mail if content.kindle_mail != None }}">
</div>
{% if not content.role_anonymous() %}
<div class="form-group">
<label for="locale">{{_('Language')}}</label>
<select name="locale" id="locale" class="form-control">
@@ -34,6 +35,8 @@
{% endfor %}
</select>
</div>
{% endif %}
<div class="form-group">
<label for="default_language">{{_('Show books with language')}}</label>
<select name="default_language" id="default_language" class="form-control">