Make email host configurable, set to publictest10 so that we don't bother real group sponsors.

fas/fas/config/app.cfg

@@ -154,6 +154,8 @@ identity.saprovider.model.group="fas.model.Groups"
 # identity.saprovider.encryption_algorithm=None
 
 accounts_mail = "accounts@fedoraproject.org"
+#email_host = "fedoraproject.org"
+email_host = "publictest10.fedoraproject.org"
 
 gpgexec = "/usr/bin/gpg"
 gpghome = "/srv/fedora-infrastructure/fas/gnupg"

fas/fas/group.py

@@ -287,7 +287,8 @@ class Group(controllers.Controller):
 
                 # TODO: How do we handle gettext calls for these kinds of emails?
                 # TODO: CC to right place, put a bit more thought into how to most elegantly do this
-                message = turbomail.Message(config.get('accounts_mail'), '%s-sponsors@fedoraproject.org' % group.name, \
+                # TODO: Maybe that @fedoraproject.org (and even -sponsors) should be configurable somewhere?
+                message = turbomail.Message(config.get('accounts_mail'), '%(group)s-sponsors@%(host)s' % {'group': group.name, 'host': config.get('email_host')}, \
                     "Fedora '%(group)s' sponsor needed for %(user)s" % {'user': target.username, 'group': group.name})
                 url = config.get('base_url_filter.base_url') + turbogears.url('/group/edit/%s' % groupname)
 

fas/fas/templates/user/view.html

@@ -54,7 +54,7 @@
         <dt>${_('Status:')}</dt>
         <dd>
         <span class="approved" py:if="group in person.approved_memberships">${_('Approved')}</span>
-        <span class="unapproved" py:if="group in person.unapproved_memberships">${_('Unapproved')}</span>
+        <span class="unapproved" py:if="group in person.unapproved_memberships">${_('None')}</span>
         </dd>
         <dt>${_('Tools:')}</dt>
         <dd>