Replace email.notification.from config

README.md

@@ -318,7 +318,8 @@ The reset password related parameters are the follwoing ones :
 The main parameters for notifications are the following ones:
 
     email.notification.activated = true
-    email.notification.from = Tracim Notification <tracim@tmycompany.com>
+    email.notification.from.email = noreply@trac.im
+    email.notification.from.default_label = Tracim Notification
     email.notification.smtp.server = smtp.mycompany.com
     email.notification.smtp.port = 25
     email.notification.smtp.user = username

tracim/development.ini.base

@@ -176,7 +176,8 @@ website.base_url = http://127.0.0.1:8080
 website.server_name = 127.0.0.1
     
 email.notification.activated = False
-email.notification.from = Tracim Notification <noreply@trac.im>
+email.notification.from.email = noreply@trac.im
+email.notification.from.default_label = Tracim Notifications
 email.notification.content_update.template.html = ./tracim/templates/mail/content_update_body_html.mak
 email.notification.content_update.template.text = ./tracim/templates/mail/content_update_body_text.mak
 email.notification.created_account.template.html = ./tracim/templates/mail/created_account_body_html.mak

tracim/tracim/config/app_cfg.py

@@ -202,8 +202,17 @@ class CFG(object):
         self.WEBSITE_SUBTITLE = tg.config.get('website.home.subtitle', '')
         self.WEBSITE_HOME_BELOW_LOGIN_FORM = tg.config.get('website.home.below_login_form', '')
 
+        if tg.config.get('email.notification.from'):
+            raise Exception(
+                'email.notification.from configuration is deprecated. '
+                'Use instead email.notification.from.email and '
+                'email.notification.from.default_label.'
+            )
 
-        self.EMAIL_NOTIFICATION_FROM = tg.config.get('email.notification.from')
+        self.EMAIL_NOTIFICATION_FROM_EMAIL = \
+            tg.config.get('email.notification.from.email')
+        self.EMAIL_NOTIFICATION_FROM_DEFAULT_LABEL = \
+            tg.config.get('email.notification.from.default_label')
         self.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_HTML = tg.config.get('email.notification.content_update.template.html')
         self.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_TEXT = tg.config.get('email.notification.content_update.template.text')
         self.EMAIL_NOTIFICATION_CREATED_ACCOUNT_TEMPLATE_HTML = tg.config.get(

tracim/tracim/lib/email.py

@@ -103,7 +103,10 @@ class EmailManager(object):
             )
         message = MIMEMultipart('alternative')
         message['Subject'] = subject
-        message['From'] = self._global_config.EMAIL_NOTIFICATION_FROM
+        message['From'] = '{0} <{1}>'.format(
+            self._global_config.EMAIL_NOTIFICATION_FROM_DEFAULT_LABEL,
+            self._global_config.EMAIL_NOTIFICATION_FROM_EMAIL,
+        )
         message['To'] = user.email
 
         text_template_file_path = self._global_config.EMAIL_NOTIFICATION_CREATED_ACCOUNT_TEMPLATE_TEXT  # nopep8

tracim/tracim/lib/notifications.py

@@ -233,7 +233,10 @@ class EmailNotifier(object):
 
             message = MIMEMultipart('alternative')
             message['Subject'] = subject
-            message['From'] = self._global_config.EMAIL_NOTIFICATION_FROM
+            message['From'] = '{0} <{1}>'.format(
+                self._global_config.EMAIL_NOTIFICATION_FROM_DEFAULT_LABEL,
+                self._global_config.EMAIL_NOTIFICATION_FROM_EMAIL,
+            )
             message['To'] = to_addr
 
             body_text = self._build_email_body(self._global_config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_TEXT, role, content, user)