Merge branch '8.0' into master

Author: lian

frontend/src/pages/upload-link/file-uploader.js

@@ -439,7 +439,7 @@ class FileUploader extends React.Component {
       msg = gettext('Failed to upload {file_name}.')
         .replace('{file_name}', file.fileName);
     }
-    toaster.danger(msg);
+    toaster.danger(msg, {'id': 'file-error-msg'});
     this.error = true;
 
     // reset upload link loaded

seahub/api2/endpoints/invitation.py

@@ -15,6 +15,7 @@
 from seahub.api2.utils import api_error
 from seahub.invitations.models import Invitation
 from seahub.base.accounts import User
+from seahub.base.templatetags.seahub_tags import email2nickname
 from seahub.utils.mail import send_html_email_with_dj_template
 from seahub.utils import get_site_name
 
@@ -103,9 +104,9 @@ def post(self, request, token, format=None):
         # send email
         site_name = get_site_name()
         subject = _('%(user)s revoked your access to %(site_name)s.') % {
-            'user': inviter, 'site_name': site_name}
+            'user': email2nickname(inviter), 'site_name': site_name}
         context = {
-            'inviter': inviter,
+            'inviter': email2nickname(inviter),
             'site_name': site_name,
         }