mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-10-17 00:27:39 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'titlelink/titles-links'

Browse Source 
Fix for #694
This commit is contained in:
Ozzieisaacs
2018-11-03 18:02:28 +01:00
parent 89bddead35 13883db5a0
commit 8d6d28eb57
6 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cps/helper.py
View File

@@ -109,7 +109,7 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
text += "Sincerely\r\n\r\n"
text += "Your Calibre-Web team"
global_WorkerThread.add_email(_(u'Get Started with Calibre-Web'),None, None, ub.get_mail_settings(),
e_mail, user_name, _(u"Registration e-mail for user: %(name)s", name=user_name),text)
e_mail, user_name, _(u"Registration e-mail for user: %(name)s", name=user_name), text)
return
@@ -145,7 +145,8 @@ def send_mail(book_id, kindle_mail, calibrepath, user_id):
return _(u"Could not find any formats suitable for sending by e-mail")
if result:
global_WorkerThread.add_email(_(u"Send to Kindle"), book.path, result, ub.get_mail_settings(),
kindle_mail, user_id, _(u"E-mail: %(book)s", book=book.title))
kindle_mail, user_id, _(u"E-mail: %(book)s", book=book.title),
_(u'This e-mail has been sent via Calibre-Web.'))
else:
return _(u"The requested file could not be read. Maybe wrong permissions?")