remove hardcoded service name & use site.name instead of SERVICE_NAME setting

Refs: #1914
Refs: #1912

diff --git a/astakos/im/admin/views.py b/astakos/im/admin/views.py
index edfc3a6..94ed117 100644 (file)
--- a/astakos/im/admin/views.py
+++ b/astakos/im/admin/views.py
@@ -308,16 +308,16 @@ def pending_users(request, template_name='pending_users.html', extra_context={})
                             context_instance = get_context(request, extra_context,**kwargs))
 
 def _send_greeting(request, user, template_name):
-    subject = _('Welcome to %s' %settings.SERVICE_NAME)
     site = Site.objects.get_current()
+    subject = _('Welcome to %s' % site.name)
     baseurl = request.build_absolute_uri('/').rstrip('/')
     message = render_to_string(template_name, {
                 'user': user,
                 'url': site.domain,
                 'baseurl': baseurl,
                 'site_name': site.name,
-                'support': settings.DEFAULT_CONTACT_EMAIL})
-    sender = settings.DEFAULT_FROM_EMAIL
+                'support': settings.DEFAULT_CONTACT_EMAIL % site.name.lower()})
+    sender = settings.DEFAULT_FROM_EMAIL % site.name
     send_mail(subject, message, sender, [user.email])
     logging.info('Sent greeting %s', user)
 

diff --git a/astakos/im/backends/__init__.py b/astakos/im/backends/__init__.py
index 12d76d3..2b3b03a 100644 (file)
--- a/astakos/im/backends/__init__.py
+++ b/astakos/im/backends/__init__.py
@@ -220,7 +220,7 @@ def _send_verification(request, user, template_name):
             'url': url,
             'baseurl': baseurl,
             'site_name': site.name,
-            'support': settings.DEFAULT_CONTACT_EMAIL})
-    sender = settings.DEFAULT_FROM_EMAIL
-    send_mail('Pithos account activation', message, sender, [user.email])
+            'support': settings.DEFAULT_CONTACT_EMAIL % site.name.lower()})
+    sender = settings.DEFAULT_FROM_EMAIL % site.name
+    send_mail('%s account activation' % site.name, message, sender, [user.email])
     logging.info('Sent activation %s', user)

diff --git a/astakos/im/views.py b/astakos/im/views.py
index b83354f..438e12d 100644 (file)
--- a/astakos/im/views.py
+++ b/astakos/im/views.py
@@ -122,16 +122,16 @@ def _generate_invitation_code():
             return code
 
 def _send_invitation(request, baseurl, inv):
-    subject = _('Invitation to Astakos')
     site = Site.objects.get_current()
+    subject = _('Invitation to %s' % site.name)
     url = settings.SIGNUP_TARGET % (baseurl, inv.code, quote(site.domain))
     message = render_to_string('invitation.txt', {
                 'invitation': inv,
                 'url': url,
                 'baseurl': baseurl,
                 'service': site.name,
-                'support': settings.DEFAULT_CONTACT_EMAIL})
-    sender = settings.DEFAULT_FROM_EMAIL
+                'support': settings.DEFAULT_CONTACT_EMAIL % site.name.lower()})
+    sender = settings.DEFAULT_FROM_EMAIL % site.name
     send_mail(subject, message, sender, [inv.username])
     logging.info('Sent invitation %s', inv)
 
@@ -343,7 +343,7 @@ def send_feedback(request, template_name='feedback.html', email_template_name='f
     
     **Settings:**
     
-    * FEEDBACK_CONTACT_EMAIL: List of feedback recipients
+    * DEFAULT_CONTACT_EMAIL: List of feedback recipients
     """
     if request.method == 'GET':
         form = FeedbackForm()
@@ -353,9 +353,10 @@ def send_feedback(request, template_name='feedback.html', email_template_name='f
         
         form = FeedbackForm(request.POST)
         if form.is_valid():
-            subject = _("Feedback from Okeanos")
+            site = Site.objects.get_current()
+            subject = _("Feedback from %s" % site.name)
             from_email = request.user.email
-            recipient_list = [settings.FEEDBACK_CONTACT_EMAIL]
+            recipient_list = [settings.DEFAULT_CONTACT_EMAIL]
             content = render_to_string(email_template_name, {
                         'message': form.cleaned_data('feedback_msg'),
                         'data': form.cleaned_data('feedback_data'),

diff --git a/astakos/settings.d/20-im.conf b/astakos/settings.d/20-im.conf
index 979c87a..d183a86 100644 (file)
--- a/astakos/settings.d/20-im.conf
+++ b/astakos/settings.d/20-im.conf
@@ -20,12 +20,9 @@ INVITATIONS_PER_LEVEL = {
     4   :   0
 }
 
-SERVICE_NAME = 'Astakos'
-
 # Address to use for outgoing emails
-DEFAULT_FROM_EMAIL = '%s <no-reply@grnet.gr>' %SERVICE_NAME
-DEFAULT_CONTACT_EMAIL = 'support@%s.grnet.gr' %SERVICE_NAME.lower()
-FEEDBACK_CONTACT_EMAIL = DEFAULT_CONTACT_EMAIL
+DEFAULT_FROM_EMAIL = '%s <no-reply@grnet.gr>'
+DEFAULT_CONTACT_EMAIL = 'support@%s.grnet.gr'
 
 # Where users should signup with their invitation code
 SIGNUP_TARGET = '%s/im/signup/?code=%d&next=%s'