NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix Upload Message

Browse Source 
Improved errorhandling at import imagemagick
This commit is contained in:
OzzieIsaacs 2018-03-31 08:00:51 +02:00
parent af5a897d1d
commit 97adb36f1b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cps/book_formats.py
View File

@ -15,7 +15,7 @@ try:
from wand.image import Image from wand.image import Image
from wand import version as ImageVersion from wand import version as ImageVersion
use_generic_pdf_cover = False use_generic_pdf_cover = False
except ImportError as e: except (ImportError, RuntimeError) as e:
logger.warning('cannot import Image, generating pdf covers for pdf uploads will not work: %s', e) logger.warning('cannot import Image, generating pdf covers for pdf uploads will not work: %s', e)
use_generic_pdf_cover = True use_generic_pdf_cover = True
try: try:

4
cps/templates/layout.html
View File

@ -100,8 +100,8 @@
{% endfor %} {% endfor %}
<div id="loader" hidden="true"> <div id="loader" hidden="true">
<center> <center>
<h3>_('Uploading...')</h3> <h3>{{_('Uploading...')}}</h3>
<span>_('please don't refresh the page')</span>. <span>{{_('please don't refresh the page')}}</span>.
<br /> <br />
<img src="{{ url_for('static', filename='img/loader.gif') }}"> <img src="{{ url_for('static', filename='img/loader.gif') }}">
</center> </center>