From e09741c08e4731d5b996c6e85ffddea93961a1fd Mon Sep 17 00:00:00 2001
From: lian <imwhatiam123@gmail.com>
Date: Tue, 21 Mar 2017 15:32:50 +0800
Subject: [PATCH] update email body

---
 seahub/group/templates/group/add_member_email.html       | 2 +-
 seahub/notifications/management/commands/send_notices.py | 4 ++--
 seahub/templates/shared_link_email.html                  | 2 +-
 seahub/templates/shared_upload_link_email.html           | 2 +-
 seahub/templates/sysadmin/user_add_email.html            | 4 ++--
 seahub/templates/sysadmin/user_batch_add_email.html      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/seahub/group/templates/group/add_member_email.html b/seahub/group/templates/group/add_member_email.html
index 88932fca60..f5890e7db8 100644
--- a/seahub/group/templates/group/add_member_email.html
+++ b/seahub/group/templates/group/add_member_email.html
@@ -8,7 +8,7 @@
 <p style="color:#121214;font-size:14px;">{% trans "Hi, " %}</p>
 
 <p style="font-size:14px;color:#434144;">
-{% blocktrans with grp_name=group.group_name %}{{ email }} invited you to join group {{ grp_name }} on {{ site_name }}: {% endblocktrans %}<br />
+{% blocktrans with grp_name=group.group_name %}{{ email|email2nickname|escape }} invited you to join group {{ grp_name }} on {{ site_name }}: {% endblocktrans %}<br />
 {{ url_base }}{% url 'registration_register' %}?src={{ to_email }}
 </p>
 
diff --git a/seahub/notifications/management/commands/send_notices.py b/seahub/notifications/management/commands/send_notices.py
index 00d1369395..d5b7ec1f4c 100644
--- a/seahub/notifications/management/commands/send_notices.py
+++ b/seahub/notifications/management/commands/send_notices.py
@@ -151,7 +151,7 @@ class Command(BaseCommand):
         notice.grpjoin_user_profile_url = reverse('user_profile',
                                                   args=[username])
         notice.grpjoin_group_url = reverse('group_members', args=[group_id])
-        notice.notice_from = username
+        notice.notice_from = escape(email2nickname(username))
         notice.grpjoin_group_name = group.group_name
         notice.grpjoin_request_msg = join_request_msg
         notice.avatar_src = self.get_avatar_src(username)
@@ -164,7 +164,7 @@ class Command(BaseCommand):
 
         group = ccnet_api.get_group(group_id)
 
-        notice.notice_from = group_staff
+        notice.notice_from = escape(email2nickname(group_staff))
         notice.avatar_src = self.get_avatar_src(group_staff)
         notice.group_staff_profile_url = reverse('user_profile',
                                                   args=[group_staff])
diff --git a/seahub/templates/shared_link_email.html b/seahub/templates/shared_link_email.html
index 5bb0bb6dfb..bad01a1ccb 100644
--- a/seahub/templates/shared_link_email.html
+++ b/seahub/templates/shared_link_email.html
@@ -9,7 +9,7 @@
 <p style="color:#121214;font-size:14px;">{% trans "Hi," %}</p>
 
 <p style="font-size:14px;color:#434144;">
-{% blocktrans %}{{ email }} shared a {{ file_shared_type }} <span style="font-weight:bold;">{{ file_shared_name}}</span> to you on {{ site_name }}:{% endblocktrans%} <br />
+{% blocktrans %}{{ email|email2nickname|escape }} shared a {{ file_shared_type }} <span style="font-weight:bold;">{{ file_shared_name}}</span> to you on {{ site_name }}:{% endblocktrans%} <br />
 <a href="{{ file_shared_link }}">{{ file_shared_link }}</a>
 </p>
 
diff --git a/seahub/templates/shared_upload_link_email.html b/seahub/templates/shared_upload_link_email.html
index 231da9ab73..da74b26d6c 100644
--- a/seahub/templates/shared_upload_link_email.html
+++ b/seahub/templates/shared_upload_link_email.html
@@ -8,7 +8,7 @@
 <p style="color:#121214;font-size:14px;">{% trans "Hi," %}</p>
 
 <p style="font-size:14px;color:#434144;">
-{% blocktrans %}{{ email }} shared an upload link to you on {{ site_name }}.{% endblocktrans%}
+{% blocktrans %}{{ email|email2nickname|escape }} shared an upload link to you on {{ site_name }}.{% endblocktrans%}
 </p>
 
 <p style="font-size:14px;color:#434144;">
diff --git a/seahub/templates/sysadmin/user_add_email.html b/seahub/templates/sysadmin/user_add_email.html
index 7b6690c51c..f6b85ad0ea 100644
--- a/seahub/templates/sysadmin/user_add_email.html
+++ b/seahub/templates/sysadmin/user_add_email.html
@@ -10,9 +10,9 @@
 
 <p style="font-size:14px;color:#434144;">
 {% if org %}
-{% blocktrans with org_name=org.org_name %}{{ user }} invited you to join organization "{{ org_name }}" on {{ site_name }}.{% endblocktrans%}
+{% blocktrans with org_name=org.org_name %}{{ user|email2nickname|escape }} invited you to join organization "{{ org_name }}" on {{ site_name }}.{% endblocktrans%}
 {% else %}
-{% blocktrans %}{{ user }} invited you to join {{ site_name }}.{% endblocktrans%}
+{% blocktrans %}{{ user|email2nickname|escape }} invited you to join {{ site_name }}.{% endblocktrans%}
 {% endif %}
 </p>
 
diff --git a/seahub/templates/sysadmin/user_batch_add_email.html b/seahub/templates/sysadmin/user_batch_add_email.html
index 97a237dd7f..fa55ec1816 100644
--- a/seahub/templates/sysadmin/user_batch_add_email.html
+++ b/seahub/templates/sysadmin/user_batch_add_email.html
@@ -9,7 +9,7 @@
 <p style="color:#121214;font-size:14px;">{% trans "Hi," %}</p>
 
 <p style="font-size:14px;color:#434144;">
-{% blocktrans %}{{ user }} invited you to join {{ site_name }}.{% endblocktrans%}
+{% blocktrans %}{{ user|email2nickname|escape }} invited you to join {{ site_name }}.{% endblocktrans%}
 </p>
 
 <p style="font-size:14px;color:#434144;">