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

Merge remote-tracking branch 'polish_update/master'

Browse Source 
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po

Fix for #147
This commit is contained in:
OzzieIsaacs
2017-03-12 19:12:17 +01:00
parent dbf07cb593 89fa9eb02f
commit 16cac6ac4f
13 changed files with 141 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cps/web.py
View File

@@ -1856,12 +1856,15 @@ def edit_mailsettings():
except e:
flash(e, category="error")
if "test" in to_save and to_save["test"]:
result = helper.send_test_mail(current_user.kindle_mail)
if result is None:
flash(_(u"Test E-Mail successfully send to %(kindlemail)s", kindlemail=current_user.kindle_mail),
category="success")
if current_user.kindle_mail:
result = helper.send_test_mail(current_user.kindle_mail)
if result is None:
flash(_(u"Test E-Mail successfully send to %(kindlemail)s", kindlemail=current_user.kindle_mail),
category="success")
else:
flash(_(u"There was an error sending the Test E-Mail: %(res)s", res=result), category="error")
else:
flash(_(u"There was an error sending the Test E-Mail: %(res)s", res=result), category="error")
flash(_(u"Please configure your kindle email address first..."), category="error")
else:
flash(_(u"E-Mail settings updated"), category="success")
return render_title_template("email_edit.html", content=content, title=_(u"Edit mail settings"))