mirror of
https://github.com/janeczku/calibre-web
synced 2025-01-13 10:50:31 +00:00
fix indentation and spaces
This commit is contained in:
parent
0a7345186d
commit
ff46af9c49
@ -112,9 +112,9 @@ def convert_book_format(book_id, calibre_path, old_book_format, new_book_format,
|
|||||||
def send_test_mail(ereader_mail, user_name):
|
def send_test_mail(ereader_mail, user_name):
|
||||||
for email in ereader_mail.split(','):
|
for email in ereader_mail.split(','):
|
||||||
email = email.strip()
|
email = email.strip()
|
||||||
WorkerThread.add(user_name, TaskEmail(_(u'Calibre-Web test e-mail'), None, None,
|
WorkerThread.add(user_name, TaskEmail(_(u'Calibre-Web test e-mail'), None, None,
|
||||||
config.get_mail_settings(), email, N_(u"Test e-mail"),
|
config.get_mail_settings(), email, N_(u"Test e-mail"),
|
||||||
_(u'This e-mail has been sent via Calibre-Web.')))
|
_(u'This e-mail has been sent via Calibre-Web.')))
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
@ -226,9 +226,9 @@ def send_mail(book_id, book_format, convert, ereader_mail, calibrepath, user_id)
|
|||||||
email_text = N_(u"%(book)s send to E-Reader", book=link)
|
email_text = N_(u"%(book)s send to E-Reader", book=link)
|
||||||
for email in ereader_mail.split(','):
|
for email in ereader_mail.split(','):
|
||||||
email = email.strip()
|
email = email.strip()
|
||||||
WorkerThread.add(user_id, TaskEmail(_(u"Send to E-Reader"), book.path, converted_file_name,
|
WorkerThread.add(user_id, TaskEmail(_(u"Send to E-Reader"), book.path, converted_file_name,
|
||||||
config.get_mail_settings(), email,
|
config.get_mail_settings(), email, email_text,
|
||||||
email_text, _(u'This e-mail has been sent via Calibre-Web.')))
|
_(u'This e-mail has been sent via Calibre-Web.')))
|
||||||
return
|
return
|
||||||
return _(u"The requested file could not be read. Maybe wrong permissions?")
|
return _(u"The requested file could not be read. Maybe wrong permissions?")
|
||||||
|
|
||||||
|
@ -96,11 +96,11 @@ class TaskConvert(CalibreTask):
|
|||||||
self.results["path"],
|
self.results["path"],
|
||||||
filename,
|
filename,
|
||||||
self.settings,
|
self.settings,
|
||||||
email,
|
email,
|
||||||
EmailText,
|
EmailText,
|
||||||
self.settings['body'],
|
self.settings['body'],
|
||||||
internal=True)
|
internal=True)
|
||||||
)
|
)
|
||||||
except Exception as ex:
|
except Exception as ex:
|
||||||
return self._handleError(str(ex))
|
return self._handleError(str(ex))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user