Merge branch 'quote-nicknames' into 'master'

Always quote nicknames.

See merge request !1342

website/members/models.py

@@ -414,7 +414,7 @@ class Profile(models.Model):
     def display_name(self):
         pref = self.display_name_preference
         if pref == 'nickname' and self.nickname is not None:
-            return self.nickname
+            return f"'{self.nickname}'"
         elif pref == 'firstname':
             return self.user.first_name
         elif pref == 'initials':
@@ -436,7 +436,7 @@ class Profile(models.Model):
         pref = self.display_name_preference
         if (self.nickname is not None and
                 (pref == 'nickname' or pref == 'nicklast')):
-            return self.nickname
+            return f"'{self.nickname}'"
         elif pref == 'initials':
             if self.initials:
                 return '{} {}'.format(self.initials, self.user.last_name)

website/members/tests/test_models.py

@@ -113,8 +113,8 @@ class MemberDisplayNameTest(TestCase):
         self.assertEqual('Johnny Test', self.profile.display_name())
         self.assertEqual('Johnny', self.profile.short_display_name())
         self.profile.nickname = 'John'
-        self.assertEqual('John', self.profile.display_name())
-        self.assertEqual('John', self.profile.short_display_name())
+        self.assertEqual("'John'", self.profile.display_name())
+        self.assertEqual("'John'", self.profile.short_display_name())
 
     def test_check_display_name_firstname(self):
         self.profile.display_name_preference = 'firstname'
@@ -143,4 +143,4 @@ class MemberDisplayNameTest(TestCase):
         self.assertEqual('Johnny', self.profile.short_display_name())
         self.profile.nickname = 'John'
         self.assertEqual('\'John\' Test', self.profile.display_name())
-        self.assertEqual('John', self.profile.short_display_name())
+        self.assertEqual('\'John\'', self.profile.short_display_name())