Merge branch 'master' into converse-omemo

src/converse-bookmarks.js

@@ -88,7 +88,7 @@
 
                 checkForReservedNick () {
                     /* Check if the user has a bookmark with a saved nickanme
-                     * for this room, and if so use it.
+                     * for this groupchat, and if so use it.
                      * Otherwise delegate to the super method.
                      */
                     const { _converse } = this.__super__;
@@ -116,7 +116,7 @@
                 },
 
                 setBookmarkState () {
-                    /* Set whether the room is bookmarked or not.
+                    /* Set whether the groupchat is bookmarked or not.
                      */
                     const { _converse } = this.__super__;
                     if (!_.isUndefined(_converse.bookmarks)) {
@@ -257,9 +257,9 @@
 
                 openBookmarkedRoom (bookmark) {
                     if (bookmark.get('autojoin')) {
-                        const room = _converse.api.rooms.create(bookmark.get('jid'), bookmark.get('nick'));
-                        if (!room.get('hidden')) {
-                            room.trigger('show');
+                        const groupchat = _converse.api.rooms.create(bookmark.get('jid'), bookmark.get('nick'));
+                        if (!groupchat.get('hidden')) {
+                            groupchat.trigger('show');
                         }
                     }
                     return bookmark;
@@ -344,16 +344,16 @@
                 },
 
                 markRoomAsBookmarked (bookmark) {
-                    const room = _converse.chatboxes.get(bookmark.get('jid'));
-                    if (!_.isUndefined(room)) {
-                        room.save('bookmarked', true);
+                    const groupchat = _converse.chatboxes.get(bookmark.get('jid'));
+                    if (!_.isUndefined(groupchat)) {
+                        groupchat.save('bookmarked', true);
                     }
                 },
 
                 markRoomAsUnbookmarked (bookmark) {
-                    const room = _converse.chatboxes.get(bookmark.get('jid'));
-                    if (!_.isUndefined(room)) {
-                        room.save('bookmarked', false);
+                    const groupchat = _converse.chatboxes.get(bookmark.get('jid'));
+                    if (!_.isUndefined(groupchat)) {
+                        groupchat.save('bookmarked', false);
                     }
                 },
 

src/templates/chatroom_details_modal.html

@@ -8,7 +8,7 @@
             <div class="modal-body">
                 <div class="room-info">
                     <p class="room-info"><strong>{{{o.__('Name')}}}</strong>: {{{o.name}}}</p>
-                    <p class="room-info"><strong>{{{o.__('Room address (JID)')}}}</strong>: {{{o.jid}}}</p>
+                    <p class="room-info"><strong>{{{o.__('Groupchat address (JID)')}}}</strong>: {{{o.jid}}}</p>
                     <p class="room-info"><strong>{{{o.__('Description')}}}</strong>: {{{o.description}}}</p>
                     {[ if (o.subject) { ]}
                     <p class="room-info"><strong>{{{o.__('Topic')}}}</strong>: {{o.topic}}</p> <!-- Sanitized in converse-muc-views. We want to render links. -->
@@ -19,40 +19,40 @@
                         <div class="chatroom-features">
                         <ul class="features-list">
                         {[ if (o.passwordprotected) { ]}
-                        <li class="feature" ><span class="fa fa-lock"></span>{{{ o.__('Password protected') }}} - <em>{{{ o.__('This room requires a password before entry') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-lock"></span>{{{ o.__('Password protected') }}} - <em>{{{ o.__('This groupchat requires a password before entry') }}}</em></li>
                         {[ } ]}
                         {[ if (o.unsecured) { ]}
-                        <li class="feature" ><span class="fa fa-unlock"></span>{{{ o.__('No password required') }}} - <em>{{{ o.__('This room does not require a password upon entry') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-unlock"></span>{{{ o.__('No password required') }}} - <em>{{{ o.__('This groupchat does not require a password upon entry') }}}</em></li>
                         {[ } ]}
                         {[ if (o.hidden) { ]}
-                        <li class="feature" ><span class="fa fa-eye-slash"></span>{{{ o.__('Hidden') }}} - <em>{{{ o.__('This room is not publicly searchable') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-eye-slash"></span>{{{ o.__('Hidden') }}} - <em>{{{ o.__('This groupchat is not publicly searchable') }}}</em></li>
                         {[ } ]}
                         {[ if (o.public_room) { ]}
-                        <li class="feature" ><span class="fa fa-eye"></span>{{{ o.__('Public') }}} - <em>{{{ o.__('This room is publicly searchable') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-eye"></span>{{{ o.__('Public') }}} - <em>{{{ o.__('This groupchat is publicly searchable') }}}</em></li>
                         {[ } ]}
                         {[ if (o.membersonly) { ]}
-                        <li class="feature" ><span class="fa fa-address-book"></span>{{{ o.__('Members only') }}} - <em>{{{ o.__('this room is restricted to members only') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-address-book"></span>{{{ o.__('Members only') }}} - <em>{{{ o.__('This groupchat is restricted to members only') }}}</em></li>
                         {[ } ]}
                         {[ if (o.open) { ]}
-                        <li class="feature" ><span class="fa fa-globe"></span>{{{ o.__('Open') }}} - <em>{{{ o.__('Anyone can join this room') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-globe"></span>{{{ o.__('Open') }}} - <em>{{{ o.__('Anyone can join this groupchat') }}}</em></li>
                         {[ } ]}
                         {[ if (o.persistent) { ]}
-                        <li class="feature" ><span class="fa fa-save"></span>{{{ o.__('Persistent') }}} - <em>{{{ o.__('This room persists even if it\'s unoccupied') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-save"></span>{{{ o.__('Persistent') }}} - <em>{{{ o.__('This groupchat persists even if it\'s unoccupied') }}}</em></li>
                         {[ } ]}
                         {[ if (o.temporary) { ]}
-                        <li class="feature" ><span class="fa fa-snowflake-o"></span>{{{ o.__('Temporary') }}} - <em>{{{ o.__('This room will disappear once the last person leaves') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-snowflake-o"></span>{{{ o.__('Temporary') }}} - <em>{{{ o.__('This groupchat will disappear once the last person leaves') }}}</em></li>
                         {[ } ]}
                         {[ if (o.nonanonymous) { ]}
-                        <li class="feature" ><span class="fa fa-id-card"></span>{{{ o.__('Not anonymous') }}} - <em>{{{ o.__('All other room occupants can see your XMPP username') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-id-card"></span>{{{ o.__('Not anonymous') }}} - <em>{{{ o.__('All other groupchat participants can see your XMPP username') }}}</em></li>
                         {[ } ]}
                         {[ if (o.semianonymous) { ]}
                         <li class="feature" ><span class="fa fa-user-secret"></span>{{{ o.__('Semi-anonymous') }}} - <em>{{{ o.__('Only moderators can see your XMPP username') }}}</em></li>
                         {[ } ]}
                         {[ if (o.moderated) { ]}
-                        <li class="feature" ><span class="fa fa-gavel"></span>{{{ o.__('Moderated') }}} - <em>{{{ o.__('This room is being moderated') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-gavel"></span>{{{ o.__('Moderated') }}} - <em>{{{ o.__('This groupchat is being moderated') }}}</em></li>
                         {[ } ]}
                         {[ if (o.unmoderated) { ]}
-                        <li class="feature" ><span class="fa fa-info-circle"></span>{{{ o.__('Not moderated') }}} - <em>{{{ o.__('This room is not being moderated') }}}</em></li>
+                        <li class="feature" ><span class="fa fa-info-circle"></span>{{{ o.__('Not moderated') }}} - <em>{{{ o.__('This groupchat is not being moderated') }}}</em></li>
                         {[ } ]}
                         {[ if (o.mam_enabled) { ]}
                         <li class="feature" ><span class="fa fa-database"></span>{{{ o.__('Message archiving') }}} - <em>{{{ o.__('Messages are archived on the server') }}}</em></li>