diff --git a/www/maposmatic/templatetags/extratags.py b/www/maposmatic/templatetags/extratags.py index 100f432c..591e8323 100644 --- a/www/maposmatic/templatetags/extratags.py +++ b/www/maposmatic/templatetags/extratags.py @@ -66,25 +66,26 @@ def job_status_to_str(value): # TODO properly templatize this result = _alert_err result+= "

%s!

" % value.resultmsg # TODO localize the result messages - - error_log_tail = escape(_lastline(value.get_errorlog_file())).replace(':',':
') - if error_log_tail: - result+= _("Check the %(error_log)s for more details
") % { - 'error_log': " %s" % (value.get_errorlog(), _("error log")), - } - - if www.settings.CONTACT_EMAIL: + + if not value.resultmsg.startswith("Not enough memory"): + error_log_tail = escape(_lastline(value.get_errorlog_file())).replace(':',':
') if error_log_tail: - result+= "or " - result+= _("contact %(email)s for more information.") % { - 'email': " %(email)s" % { - "email": www.settings.CONTACT_EMAIL, - "id": value.id - } + result+= _("Check the %(error_log)s for more details
") % { + 'error_log': " %s" % (value.get_errorlog(), _("error log")), } + + if www.settings.CONTACT_EMAIL: + if error_log_tail: + result+= "or " + result+= _("contact %(email)s for more information.") % { + 'email': " %(email)s" % { + "email": www.settings.CONTACT_EMAIL, + "id": value.id + } + } - if error_log_tail: - result+= "
%s" % error_log_tail + if error_log_tail: + result+= "
%s" % error_log_tail result += _alert_end