Merge branch 'master' of https://github.com/gnowgi/gnowsys-studio

Conflicts:
	objectapp/templates/objectapp/gbobject_detail.html

1 files changed, 2 insertions, 1 deletions

diff --git a/objectapp/models.py b/objectapp/models.py
index c0c2d5ba..6242b151 100644
--- a/objectapp/models.py
+++ b/objectapp/models.py
@@ -113,6 +113,7 @@ from objectapp.url_shortener import get_url_shortener
 from objectapp.signals import ping_directories_handler
 from objectapp.signals import ping_external_urls_handler
 from objectapp.settings import OBJECTAPP_VERSIONING
+
 if OBJECTAPP_VERSIONING:
     import reversion
     from reversion.models import *
@@ -748,7 +749,7 @@ class Gbobject(Node):
         if self.objecttypes.count:
             for each in self.objecttypes.all():
                 return '%s is a member of objecttype %s' % (self.title, each)
-        return '%s is not a fully defined name, consider making it a member of a suitable objecttype' % (self.title)
+        return u'%s is not a fully defined name, consider making it a member of a suitable objecttype' % (self.title)
 
 
     @models.permalink