Merge remote-tracking branch 'origin/master'

weblate/html/show-lock.html

 {% load translations %}
-{% if object.is_user_locked %}
+{% if object.is_user_locked and object.lock_user != request.user %}
 {% show_message "warning" object.get_lock_display %}
 {% endif %}
 {% if object.subproject.locked or object.locked %}

weblate/trans/util.py

@@ -20,6 +20,7 @@
 
 import hashlib
 import re
+import os.path
 from translate.misc import quote
 from translate.storage.properties import propunit
 from django.utils.translation import ugettext as _
@@ -48,8 +49,9 @@ def get_user_display(user, icon = True):
     '''
     # Did we get any user?
     if user is None:
-        return _('None')
-
+        # None user, probably remotely triggered action
+        full_name = _('None')
+    else:
         # Get full name
         full_name = user.get_full_name()
 
@@ -61,6 +63,10 @@ def get_user_display(user, icon = True):
     if not icon:
         return full_name
 
+    if user is None:
+        # Weblate icon
+        gravatar = os.path.join(settings.MEDIA_URL, 'weblate-32.png')
+    else:
         # Get gravatar image
         gravatar = gravatar_for_email(user.email, size = 32)