coop-cloud-chaos-patchs/calibre-web
0
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source
This commit is contained in:
Ozzie Isaacs
2021-05-16 09:38:00 +02:00
parent 109198a374 20b84a9459
commit e15324d2cd
46 changed files with 2641 additions and 3260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cps/admin.py
View File

@ -288,7 +288,7 @@ def list_users():
for user in users:
if user.default_language == "all":
user.default = _("all")
user.default = _("All")
else:
user.default = LC.parse(user.default_language).get_language_name(get_locale())
@ -1422,7 +1422,7 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
except IntegrityError as ex:
ub.session.rollback()
log.error("An unknown error occurred while changing user: {}".format(str(ex)))
flash(_(u"An unknown error occurred."), category="error")
flash(_(u"An unknown error occurred. Please try again later."), category="error")
except OperationalError:
ub.session.rollback()
log.error("Settings DB is not Writeable")
@ -1473,7 +1473,7 @@ def update_mailsettings():
elif to_save.get("gmail"):
try:
config.mail_gmail_token = services.gmail.setup_gmail(config.mail_gmail_token)
flash(_(u"G-Mail Account Verification Successful"), category="success")
flash(_(u"Gmail Account Verification Successful"), category="success")
except Exception as ex:
flash(str(ex), category="error")
log.error(ex)