From 165dfa49abd792688149c249fa66e8b72e1de795 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Fri, 23 Jun 2017 01:42:37 +0530
Subject: [PATCH] Fixed __proxy__ to string conversion issue

---
 membership/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/membership/models.py b/membership/models.py
index 115e8cb1..db0155b5 100644
--- a/membership/models.py
+++ b/membership/models.py
@@ -87,7 +87,7 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
                     dcl_from_address = settings.DCL_SUPPORT_FROM_ADDRESS
                     user.is_active = False
                     email_data = {
-                        'subject': _('Activate your ') + dcl_text + _(' account'),
+                        'subject': str(_('Activate your ')) + dcl_text + str(_(' account')),
                         'from_address': settings.DCL_SUPPORT_FROM_ADDRESS,
                         'to': user.email,
                         'context': {'base_url'  : base_url,