From d45cf60c6c6ed056fa893102b3bbfbc318b92c1c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 13 Apr 2017 14:52:13 +0530 Subject: [PATCH] [fix] expiry message --- frappe/limits.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/limits.py b/frappe/limits.py index 65fd735673..84b90f057c 100755 --- a/frappe/limits.py +++ b/frappe/limits.py @@ -18,6 +18,11 @@ def check_if_expired(): return limits = get_limits() + expiry = limits.get("expiry") + + if not expiry: + return + expires_on = formatdate(limits.get("expiry")) support_email = limits.get("support_email") @@ -28,7 +33,8 @@ def check_if_expired(): message = _("""Your subscription expired on {0}. To renew, please send an email to {1}.""").format(expires_on, support_email) else: - message = _("""Your subscription expired on {0}""").format(expires_on) + # no recourse just quit + return frappe.throw(message, SiteExpiredError)