Merge pull request #883 from jitsi/contactlist-displayname

Syncs contactlist display names with thumbnails.

lang/main.json

@@ -5,7 +5,6 @@
     "downloadlogs": "Download logs",
     "feedback": "Give us your feedback",
     "roomUrlDefaultMsg": "Your conference is currently being created...",
-    "participant": "Participant",
     "me": "me",
     "speaker": "Speaker",
     "raisedHand": "Would like to speak",

modules/UI/UI.js

@@ -292,7 +292,7 @@ UI.initConference = function () {
     }
 
     // Add myself to the contact list.
-    ContactList.addContact(id);
+    ContactList.addContact(id, true);
 
     //update default button states before showing the toolbar
     //if local role changes buttons state will be again updated

modules/UI/side_pannels/contactlist/ContactList.js

@@ -96,9 +96,9 @@ var ContactList = {
 
     /**
      * Adds a contact for the given id.
-     *
+     * @param isLocal is an id for the local user.
      */
-    addContact (id) {
+    addContact (id, isLocal) {
         let contactlist = $('#contacts');
 
         let newContact = document.createElement('li');
@@ -112,7 +112,11 @@ var ContactList = {
 
         if (interfaceConfig.SHOW_CONTACTLIST_AVATARS)
             newContact.appendChild(createAvatar(id));
-        newContact.appendChild(createDisplayNameParagraph("participant"));
+
+        newContact.appendChild(
+            createDisplayNameParagraph(
+                isLocal ? interfaceConfig.DEFAULT_LOCAL_DISPLAY_NAME : null,
+                isLocal ? null : interfaceConfig.DEFAULT_REMOTE_DISPLAY_NAME));
 
         if (APP.conference.isLocalId(id)) {
             contactlist.prepend(newContact);