From e64edf19b44991c943bb577b865403c04f105a7b Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 2 Jul 2018 15:54:51 +0200 Subject: [PATCH] Use "Groupchat" instead of "Chatroom" --- spec/chatroom.js | 190 +++++++++++++-------------- spec/roomslist.js | 6 +- src/converse-bookmarks.js | 16 +-- src/converse-muc-views.js | 104 +++++++-------- src/converse-roomslist.js | 16 +-- src/templates/chatroom_features.html | 22 ++-- 6 files changed, 177 insertions(+), 177 deletions(-) diff --git a/spec/chatroom.js b/spec/chatroom.js index b9ba2712e..bb0979c56 100644 --- a/spec/chatroom.js +++ b/spec/chatroom.js @@ -177,7 +177,7 @@ 'membersonly': true, 'persistentroom': true, 'publicroom': true, - 'roomdesc': 'Welcome to this room', + 'roomdesc': 'Welcome to this groupchat', 'whois': 'anyone' } }); @@ -262,7 +262,7 @@ sent_stanza = sent_IQ_els.pop(); } expect(sizzle('field[var="muc#roomconfig_roomname"] value', sent_stanza).pop().textContent).toBe('Room'); - expect(sizzle('field[var="muc#roomconfig_roomdesc"] value', sent_stanza).pop().textContent).toBe('Welcome to this room'); + expect(sizzle('field[var="muc#roomconfig_roomdesc"] value', sent_stanza).pop().textContent).toBe('Welcome to this groupchat'); expect(sizzle('field[var="muc#roomconfig_persistentroom"] value', sent_stanza).pop().textContent).toBe('1'); expect(sizzle('field[var="muc#roomconfig_publicroom"] value ', sent_stanza).pop().textContent).toBe('1'); expect(sizzle('field[var="muc#roomconfig_changesubject"] value', sent_stanza).pop().textContent).toBe('0'); @@ -390,7 +390,7 @@ _converse.connection._dataRecv(test_utils.createRequest(presence)); var info_text = view.el.querySelector('.chat-content .chat-info').textContent; - expect(info_text).toBe('A new room has been created'); + expect(info_text).toBe('A new groupchat has been created'); // An instant room is created by saving the default configuratoin. // @@ -453,7 +453,7 @@ }).up() .c('status', {code: '110'}); _converse.connection._dataRecv(test_utils.createRequest(presence)); - expect($chat_content.find('div.chat-info:first').html()).toBe("some1 has entered the room"); + expect($chat_content.find('div.chat-info:first').html()).toBe("some1 has entered the groupchat"); presence = $pres({ to: 'dummy@localhost/_converse.js-29092160', @@ -467,7 +467,7 @@ }); _converse.connection._dataRecv(test_utils.createRequest(presence)); expect($chat_content[0].querySelectorAll('div.chat-info').length).toBe(2); - expect($chat_content.find('div.chat-info:last').html()).toBe("newguy has entered the room"); + expect($chat_content.find('div.chat-info:last').html()).toBe("newguy has entered the groupchat"); // Add another entrant, otherwise the above message will be // collapsed if "newguy" leaves immediately again @@ -483,7 +483,7 @@ }); _converse.connection._dataRecv(test_utils.createRequest(presence)); expect($chat_content[0].querySelectorAll('div.chat-info').length).toBe(3); - expect($chat_content.find('div.chat-info:last').html()).toBe("newgirl has entered the room"); + expect($chat_content.find('div.chat-info:last').html()).toBe("newgirl has entered the groupchat"); // Don't show duplicate join messages presence = $pres({ @@ -525,7 +525,7 @@ _converse.connection._dataRecv(test_utils.createRequest(presence)); expect($chat_content.find('div.chat-info').length).toBe(4); expect($chat_content.find('div.chat-info:last').html()).toBe( - 'newguy has left the room. '+ + 'newguy has left the groupchat. '+ '"Disconnected: Replaced by new connection"'); // When the user immediately joins again, we collapse the @@ -542,7 +542,7 @@ _converse.connection._dataRecv(test_utils.createRequest(presence)); expect($chat_content.find('div.chat-info').length).toBe(4); var $msg_el = $chat_content.find('div.chat-info:last'); - expect($msg_el.html()).toBe("newguy has left and re-entered the room"); + expect($msg_el.html()).toBe("newguy has left and re-entered the groupchat"); expect($msg_el.data('leavejoin')).toBe('"newguy"'); presence = $pres({ @@ -559,7 +559,7 @@ _converse.connection._dataRecv(test_utils.createRequest(presence)); expect($chat_content.find('div.chat-info').length).toBe(4); $msg_el = $chat_content.find('div.chat-info:last'); - expect($msg_el.html()).toBe('newguy has left the room'); + expect($msg_el.html()).toBe('newguy has left the groupchat'); expect($msg_el.data('leave')).toBe('"newguy"'); presence = $pres({ @@ -574,7 +574,7 @@ }); _converse.connection._dataRecv(test_utils.createRequest(presence)); expect($chat_content[0].querySelectorAll('div.chat-info').length).toBe(5); - expect($chat_content.find('div.chat-info:last').html()).toBe("nomorenicks has entered the room"); + expect($chat_content.find('div.chat-info:last').html()).toBe("nomorenicks has entered the groupchat"); presence = $pres({ to: 'dummy@localhost/_converse.js-290918392', @@ -588,7 +588,7 @@ }); _converse.connection._dataRecv(test_utils.createRequest(presence)); expect($chat_content[0].querySelectorAll('div.chat-info').length).toBe(5); - expect($chat_content.find('div.chat-info:last').html()).toBe("nomorenicks has entered and left the room"); + expect($chat_content.find('div.chat-info:last').html()).toBe("nomorenicks has entered and left the groupchat"); presence = $pres({ to: 'dummy@localhost/_converse.js-29092160', @@ -602,7 +602,7 @@ }); _converse.connection._dataRecv(test_utils.createRequest(presence)); expect($chat_content[0].querySelectorAll('div.chat-info').length).toBe(5); - expect($chat_content.find('div.chat-info:last').html()).toBe("nomorenicks has entered the room"); + expect($chat_content.find('div.chat-info:last').html()).toBe("nomorenicks has entered the groupchat"); done(); })); @@ -622,7 +622,7 @@ expect(indicator.querySelector('time').textContent).toEqual(moment().startOf('day').format("dddd MMM Do YYYY")); expect(chat_content.querySelectorAll('div.chat-info').length).toBe(1); expect(chat_content.querySelector('div.chat-info').textContent).toBe( - "dummy has entered the room" + "dummy has entered the groupchat" ); var baseTime = new Date(); @@ -659,7 +659,7 @@ expect(indicator.querySelector('time').textContent).toEqual(moment().startOf('day').format("dddd MMM Do YYYY")); expect(chat_content.querySelectorAll('div.chat-info').length).toBe(2); expect(chat_content.querySelector('div.chat-info:last-child').textContent).toBe( - "some1 has entered the room" + "some1 has entered the groupchat" ); jasmine.clock().tick(ONE_DAY_LATER); @@ -688,7 +688,7 @@ expect(indicator.querySelector('time').textContent).toEqual(moment().startOf('day').format("dddd MMM Do YYYY")); expect(chat_content.querySelectorAll('div.chat-info').length).toBe(3); expect($(chat_content).find('div.chat-info:last').html()).toBe( - 'some1 has left the room. '+ + 'some1 has left the groupchat. '+ '"Disconnected: Replaced by new connection"'); jasmine.clock().tick(ONE_DAY_LATER); @@ -722,7 +722,7 @@ expect($indicator.data('isodate')).toEqual(moment().startOf('day').format()); expect($indicator.find('time').text()).toEqual(moment().startOf('day').format("dddd MMM Do YYYY")); expect(chat_content.querySelectorAll('div.chat-info').length).toBe(4); - expect($chat_content.find('div.chat-info:last').html()).toBe("newguy has entered the room"); + expect($chat_content.find('div.chat-info:last').html()).toBe("newguy has entered the groupchat"); jasmine.clock().tick(ONE_DAY_LATER); @@ -763,7 +763,7 @@ expect($indicator.find('time').text()).toEqual(moment().startOf('day').format("dddd MMM Do YYYY")); expect(chat_content.querySelectorAll('div.chat-info').length).toBe(5); expect($chat_content.find('div.chat-info:last').html()).toBe( - 'newguy has left the room. '+ + 'newguy has left the groupchat. '+ '"Disconnected: Replaced by new connection"'); jasmine.clock().uninstall(); @@ -811,7 +811,7 @@ .c('value').t('http://jabber.org/protocol/muc#roominfo').up().up() .c('field', {'type':'text-single', 'var':'muc#roominfo_description', 'label':'Description'}) .c('value').t('This is the description').up().up() - .c('field', {'type':'text-single', 'var':'muc#roominfo_occupants', 'label':'Number of occupants'}) + .c('field', {'type':'text-single', 'var':'muc#roominfo_occupants', 'label':'Number of participants'}) .c('value').t(0); _converse.connection._dataRecv(test_utils.createRequest(features_stanza)); test_utils.waitUntil(() => _.get(view.el.querySelector('.chatroom-description'), 'textContent')) @@ -1065,7 +1065,7 @@ 'var': 'muc#roomconfig_passwordprotectedroom'}) .c('value').t(1).up().up() .c('field', {'type': 'fixed'}) - .c('value').t('If a password is required to enter this room,'+ + .c('value').t('If a password is required to enter this groupchat,'+ 'you must specify the password below.').up().up() .c('field', { 'label': 'Password', @@ -1113,7 +1113,7 @@ }).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL)); })); - it("shows all members even if they're not currently present in the room", + it("shows all members even if they're not currently present in the groupchat", mock.initConverseWithPromises( null, ['rosterGroupsFetched'], {}, function (done, _converse) { @@ -1145,7 +1145,7 @@ expect(occupants.querySelectorAll('li .occupant-nick')[index].textContent.trim()).toBe(mock.chatroom_names[i]); } - // Test users leaving the room + // Test users leaving the groupchat // http://xmpp.org/extensions/xep-0045.html#exit for (i=mock.chatroom_names.length-1; i>-1; i--) { name = mock.chatroom_names[i]; @@ -1168,7 +1168,7 @@ }).catch(_.partial(console.error, _)); })); - it("shows users currently present in the room", + it("shows users currently present in the groupchat", mock.initConverseWithPromises( null, ['rosterGroupsFetched'], {}, function (done, _converse) { @@ -1200,7 +1200,7 @@ expect(occupants.querySelectorAll('li .occupant-nick')[index].textContent.trim()).toBe(mock.chatroom_names[i]); } - // Test users leaving the room + // Test users leaving the groupchat // http://xmpp.org/extensions/xep-0045.html#exit for (i=mock.chatroom_names.length-1; i>-1; i--) { name = mock.chatroom_names[i]; @@ -1310,7 +1310,7 @@ expect($(occupants).last().find('.badge').length).toBe(1); expect($(occupants).last().find('.badge').last().text()).toBe('Visitor'); expect($(occupants).last().attr('title')).toBe( - contact_jid + ' This user can NOT send messages in this room. Click to mention visitorwoman in your message.' + contact_jid + ' This user can NOT send messages in this groupchat. Click to mention visitorwoman in your message.' ); done(); }).catch(_.partial(console.error, _)); @@ -1395,7 +1395,7 @@ expect(view.join).toHaveBeenCalled(); - // The user has just entered the room (because join was called) + // The user has just entered the groupchat (because join was called) // and receives their own presence from the server. // See example 24: // http://xmpp.org/extensions/xep-0045.html#enter-pres @@ -1437,7 +1437,7 @@ var view = _converse.chatboxviews.get('lounge@localhost'); // XXX: cheating a lttle bit, normally this'll be set after - // receiving the features for the room. + // receiving the features for the groupchat. view.model.set('open', 'true'); spyOn(view.model, 'directInvite').and.callThrough(); @@ -1632,7 +1632,7 @@ }); })); - it("shows received chatroom subject messages", + it("shows received groupchat subject messages", mock.initConverseWithPromises( null, ['rosterGroupsFetched'], {}, function (done, _converse) { @@ -1724,7 +1724,7 @@ expect($occupants.children().first(0).find('.occupant-nick').text().trim()).toBe("oldnick"); expect($chat_content.find('div.chat-info').length).toBe(1); - expect($chat_content.find('div.chat-info:first').html()).toBe("oldnick has entered the room"); + expect($chat_content.find('div.chat-info:first').html()).toBe("oldnick has entered the groupchat"); var presence = $pres().attrs({ from:'lounge@localhost/oldnick', @@ -1765,7 +1765,7 @@ .c('status').attrs({code:'110'}).nodeTree; _converse.connection._dataRecv(test_utils.createRequest(presence)); - // XXX: currently we still have an additional "has entered the room" + // XXX: currently we still have an additional "has entered the groupchat" // notification for the new nickname. Ideally we'd not have // that, but that's probably not possible without some // significant refactoring. @@ -1780,7 +1780,7 @@ }); })); - it("queries for the room information before attempting to join the user", + it("queries for the groupchat information before attempting to join the user", mock.initConverseWithPromises( null, ['rosterGroupsFetched'], {}, function (done, _converse) { @@ -1794,7 +1794,7 @@ _converse.api.rooms.open('coven@chat.shakespeare.lit', {'nick': 'some1'}); - // Check that the room queried for the feautures. + // Check that the groupchat queried for the feautures. expect(sent_IQ.toLocaleString()).toBe( ""+ ""+ @@ -1854,7 +1854,7 @@ }); })); - it("updates the shown features when the room configuration has changed", + it("updates the shown features when the groupchat configuration has changed", mock.initConverseWithPromises( null, ['rosterGroupsFetched'], {}, function (done, _converse) { @@ -1954,7 +1954,7 @@ .c('status', {code: '172'}); _converse.connection._dataRecv(test_utils.createRequest(message)); var $chat_body = $(view.el.querySelector('.chatroom-body')); - expect($chat_body.find('.message:last').text()).toBe('This room is now no longer anonymous'); + expect($chat_body.find('.message:last').text()).toBe('This groupchat is now no longer anonymous'); done(); }); })); @@ -2003,7 +2003,7 @@ const chat_body = view.el.querySelector('.chatroom-body'); expect(chat_body.querySelectorAll('.disconnect-msg').length).toBe(3); expect(chat_body.querySelector('.disconnect-msg:first-child').textContent).toBe( - 'You have been kicked from this room'); + 'You have been kicked from this groupchat'); expect(chat_body.querySelector('.disconnect-msg:nth-child(2)').textContent).toBe( 'This action was done by Fluellen.'); expect(chat_body.querySelector('.disconnect-msg:nth-child(3)').textContent).toBe( @@ -2093,7 +2093,7 @@ }); - describe("Each chat room can take special commands", function () { + describe("Each chat groupchat can take special commands", function () { it("/help to show the available commands", mock.initConverseWithPromises( @@ -2104,7 +2104,7 @@ var view = _converse.chatboxviews.get('lounge@localhost'); spyOn(view, 'onMessageSubmitted').and.callThrough(); var textarea = view.el.querySelector('.chat-textarea'); - textarea.value = '/help This is the room subject'; + textarea.value = '/help This is the groupchat subject'; view.keyPressed({ target: textarea, preventDefault: _.noop, @@ -2115,26 +2115,26 @@ const info_messages = Array.prototype.slice.call(view.el.querySelectorAll('.chat-info'), 0); expect(info_messages.length).toBe(17); expect(info_messages.pop().textContent).toBe('/voice: Allow muted user to post messages'); - expect(info_messages.pop().textContent).toBe('/topic: Set room subject (alias for /subject)'); - expect(info_messages.pop().textContent).toBe('/subject: Set room subject'); + expect(info_messages.pop().textContent).toBe('/topic: Set groupchat subject (alias for /subject)'); + expect(info_messages.pop().textContent).toBe('/subject: Set groupchat subject'); expect(info_messages.pop().textContent).toBe('/revoke: Revoke user\'s membership'); - expect(info_messages.pop().textContent).toBe('/owner: Grant ownership of this room'); + expect(info_messages.pop().textContent).toBe('/owner: Grant ownership of this groupchat'); expect(info_messages.pop().textContent).toBe('/op: Grant moderator role to user'); expect(info_messages.pop().textContent).toBe('/nick: Change your nickname'); expect(info_messages.pop().textContent).toBe('/mute: Remove user\'s ability to post messages'); expect(info_messages.pop().textContent).toBe('/member: Grant membership to a user'); expect(info_messages.pop().textContent).toBe('/me: Write in 3rd person'); - expect(info_messages.pop().textContent).toBe('/kick: Kick user from room'); + expect(info_messages.pop().textContent).toBe('/kick: Kick user from groupchat'); expect(info_messages.pop().textContent).toBe('/help: Show this menu'); expect(info_messages.pop().textContent).toBe('/deop: Change user role to participant'); expect(info_messages.pop().textContent).toBe('/clear: Remove messages'); - expect(info_messages.pop().textContent).toBe('/ban: Ban user from room'); + expect(info_messages.pop().textContent).toBe('/ban: Ban user from groupchat'); expect(info_messages.pop().textContent).toBe('/admin: Change user\'s affiliation to admin'); done(); }); })); - it("/topic to set the room topic", + it("/topic to set the groupchat topic", mock.initConverseWithPromises( null, ['rosterGroupsFetched'], {}, function (done, _converse) { @@ -2149,7 +2149,7 @@ }); // Check the alias /topic var textarea = view.el.querySelector('.chat-textarea'); - textarea.value = '/topic This is the room subject'; + textarea.value = '/topic This is the groupchat subject'; view.keyPressed({ target: textarea, preventDefault: _.noop, @@ -2157,7 +2157,7 @@ }); expect(view.onMessageSubmitted).toHaveBeenCalled(); expect(_converse.connection.send).toHaveBeenCalled(); - expect(sent_stanza.textContent).toBe('This is the room subject'); + expect(sent_stanza.textContent).toBe('This is the groupchat subject'); // Check /subject textarea.value = '/subject This is a new subject'; @@ -2415,7 +2415,7 @@ spyOn(view, 'showChatEvent').and.callThrough(); spyOn(view, 'validateRoleChangeCommand').and.callThrough(); - // New user enters the room + // New user enters the groupchat /* /admin: ${__("Change user's affiliation to admin")}`, - `/ban: ${__('Ban user from room')}`, + `/ban: ${__('Ban user from groupchat')}`, `/clear: ${__('Remove messages')}`, `/deop: ${__('Change user role to participant')}`, `/help: ${__('Show this menu')}`, - `/kick: ${__('Kick user from room')}`, + `/kick: ${__('Kick user from groupchat')}`, `/me: ${__('Write in 3rd person')}`, `/member: ${__('Grant membership to a user')}`, `/mute: ${__("Remove user's ability to post messages")}`, `/nick: ${__('Change your nickname')}`, `/op: ${__('Grant moderator role to user')}`, - `/owner: ${__('Grant ownership of this room')}`, + `/owner: ${__('Grant ownership of this groupchat')}`, `/revoke: ${__("Revoke user's membership")}`, - `/subject: ${__('Set room subject')}`, - `/topic: ${__('Set room subject (alias for /subject)')}`, + `/subject: ${__('Set groupchat subject')}`, + `/topic: ${__('Set groupchat subject (alias for /subject)')}`, `/voice: ${__('Allow muted user to post messages')}` ]); break; @@ -1227,7 +1227,7 @@ tpl_chatroom_nickname_form({ heading: __('Please choose your nickname'), label_nickname: __('Nickname'), - label_join: __('Enter room'), + label_join: __('Enter groupchat'), validation_message: message })); this.model.save('connection_status', converse.ROOMSTATUS.NICKNAME_REQUIRED); @@ -1250,7 +1250,7 @@ container_el.insertAdjacentHTML('beforeend', tpl_chatroom_password_form({ - heading: __('This chatroom requires a password'), + heading: __('This groupchat requires a password'), label_password: __('Password: '), label_submit: __('Submit') })); @@ -1395,14 +1395,14 @@ 'data': `data-leavejoin="${nick}"`, 'isodate': moment().format(), 'extra_classes': 'chat-event', - 'message': __('%1$s has left and re-entered the room', nick) + 'message': __('%1$s has left and re-entered the groupchat', nick) }); } else { let message; if (_.isNil(stat)) { - message = __('%1$s has entered the room', nick); + message = __('%1$s has entered the groupchat', nick); } else { - message = __('%1$s has entered the room. "%2$s"', nick, stat); + message = __('%1$s has entered the groupchat. "%2$s"', nick, stat); } const data = { 'data': `data-join="${nick}"`, @@ -1435,9 +1435,9 @@ let message; if (_.isNil(stat)) { - message = __('%1$s has entered and left the room', nick); + message = __('%1$s has entered and left the groupchat', nick); } else { - message = __('%1$s has entered and left the room. "%2$s"', nick, stat); + message = __('%1$s has entered and left the groupchat. "%2$s"', nick, stat); } last_el.outerHTML = tpl_info({ @@ -1449,9 +1449,9 @@ } else { let message; if (_.isNil(stat)) { - message = __('%1$s has left the room', nick); + message = __('%1$s has left the groupchat', nick); } else { - message = __('%1$s has left the room. "%2$s"', nick, stat); + message = __('%1$s has left the groupchat. "%2$s"', nick, stat); } const data = { 'message': message, @@ -1494,9 +1494,9 @@ if (!_.isNull(error.querySelector('not-authorized'))) { this.renderPasswordForm(); } else if (!_.isNull(error.querySelector('registration-required'))) { - this.showDisconnectMessages(__('You are not on the member list of this room.')); + this.showDisconnectMessages(__('You are not on the member list of this groupchat.')); } else if (!_.isNull(error.querySelector('forbidden'))) { - this.showDisconnectMessages(__('You have been banned from this room.')); + this.showDisconnectMessages(__('You have been banned from this groupchat.')); } } else if (error.getAttribute('type') === 'modify') { if (!_.isNull(error.querySelector('jid-malformed'))) { @@ -1506,13 +1506,13 @@ if (!_.isNull(error.querySelector('not-allowed'))) { this.showDisconnectMessages(__('You are not allowed to create new rooms.')); } else if (!_.isNull(error.querySelector('not-acceptable'))) { - this.showDisconnectMessages(__("Your nickname doesn't conform to this room's policies.")); + this.showDisconnectMessages(__("Your nickname doesn't conform to this groupchat's policies.")); } else if (!_.isNull(error.querySelector('conflict'))) { this.onNicknameClash(presence); } else if (!_.isNull(error.querySelector('item-not-found'))) { - this.showDisconnectMessages(__("This room does not (yet) exist.")); + this.showDisconnectMessages(__("This groupchat does not (yet) exist.")); } else if (!_.isNull(error.querySelector('service-unavailable'))) { - this.showDisconnectMessages(__("This room has reached its maximum number of occupants.")); + this.showDisconnectMessages(__("This groupchat has reached its maximum number of participants.")); } else if (!_.isNull(error.querySelector('remote-server-not-found'))) { const messages = [__("Remote server not found")]; const reason = _.get(error.querySelector('text'), 'textContent'); @@ -1602,7 +1602,7 @@ render () { this.el.innerHTML = tpl_room_panel({ - 'heading_chatrooms': __('Chatrooms'), + 'heading_chatrooms': __('Groupchats'), 'title_new_room': __('Add a new room'), 'title_list_rooms': __('Query for rooms') }); @@ -1643,8 +1643,8 @@ 'hint_show': _converse.PRETTY_CHAT_STATUS[show], 'hint_occupant': __('Click to mention %1$s in your message.', this.model.get('nick')), 'desc_moderator': __('This user is a moderator.'), - 'desc_participant': __('This user can send messages in this room.'), - 'desc_visitor': __('This user can NOT send messages in this room.'), + 'desc_participant': __('This user can send messages in this groupchat.'), + 'desc_visitor': __('This user can NOT send messages in this groupchat.'), 'label_moderator': __('Moderator'), 'label_visitor': __('Visitor'), 'label_owner': __('Owner'), @@ -1701,7 +1701,7 @@ this.el.innerHTML = tpl_chatroom_sidebar( _.extend(this.chatroomview.model.toJSON(), { 'allow_muc_invitations': _converse.allow_muc_invitations, - 'label_occupants': __('Occupants') + 'label_occupants': __('Participants') }) ); if (_converse.allow_muc_invitations) { diff --git a/src/converse-roomslist.js b/src/converse-roomslist.js index bff60a138..f7b34797f 100644 --- a/src/converse-roomslist.js +++ b/src/converse-roomslist.js @@ -118,12 +118,12 @@ // supported by the XMPP server. So we can use it // as a check for support (other ways of checking are async). 'allow_bookmarks': _converse.allow_bookmarks && _converse.bookmarks, - 'info_leave_room': __('Leave this room'), - 'info_remove_bookmark': __('Unbookmark this room'), - 'info_add_bookmark': __('Bookmark this room'), - 'info_title': __('Show more information on this room'), + 'info_leave_room': __('Leave this groupchat'), + 'info_remove_bookmark': __('Unbookmark this groupchat'), + 'info_add_bookmark': __('Bookmark this groupchat'), + 'info_title': __('Show more information on this groupchat'), 'name': this.getRoomsListElementName(), - 'open_title': __('Click to open this room') + 'open_title': __('Click to open this groupchat') })); }, @@ -181,8 +181,8 @@ render () { this.el.innerHTML = tpl_rooms_list({ 'toggle_state': this.list_model.get('toggle-state'), - 'desc_rooms': __('Click to toggle the rooms list'), - 'label_rooms': __('Open Rooms'), + 'desc_rooms': __('Click to toggle the list of open groupchats'), + 'label_rooms': __('Open Groupchats'), '_converse': _converse }); if (this.list_model.get('toggle-state') !== _converse.OPENED) { @@ -225,7 +225,7 @@ ev.preventDefault(); const name = ev.target.getAttribute('data-room-name'); const jid = ev.target.getAttribute('data-room-jid'); - if (confirm(__("Are you sure you want to leave the room %1$s?", name))) { + if (confirm(__("Are you sure you want to leave the groupchat %1$s?", name))) { // TODO: replace with API call _converse.chatboxviews.get(jid).close(); } diff --git a/src/templates/chatroom_features.html b/src/templates/chatroom_features.html index 6f7c76bdb..07a3a581d 100644 --- a/src/templates/chatroom_features.html +++ b/src/templates/chatroom_features.html @@ -3,40 +3,40 @@ {[ } ]}
    {[ if (o.passwordprotected) { ]} -
  • {{{ o.__('Password protected') }}}
    • +
  • {{{ o.__('Password protected') }}}
    • {[ } ]} {[ if (o.unsecured) { ]} -
  • {{{ o.__('No password') }}}
    • +
  • {{{ o.__('No password') }}}
    • {[ } ]} {[ if (o.hidden) { ]} -
  • {{{ o.__('Hidden') }}}
    • +
  • {{{ o.__('Hidden') }}}
    • {[ } ]} {[ if (o.public_room) { ]} -
  • {{{ o.__('Public') }}}
    • +
  • {{{ o.__('Public') }}}
    • {[ } ]} {[ if (o.membersonly) { ]} -
  • {{{ o.__('Members only') }}}
    • +
  • {{{ o.__('Members only') }}}
    • {[ } ]} {[ if (o.open) { ]} -
  • {{{ o.__('Open') }}}
    • +
  • {{{ o.__('Open') }}}
    • {[ } ]} {[ if (o.persistent) { ]} -
  • {{{ o.__('Persistent') }}}
    • +
  • {{{ o.__('Persistent') }}}
    • {[ } ]} {[ if (o.temporary) { ]} -
  • {{{ o.__('Temporary') }}}
    • +
  • {{{ o.__('Temporary') }}}
    • {[ } ]} {[ if (o.nonanonymous) { ]} -
  • {{{ o.__('Not anonymous') }}}
    • +
  • {{{ o.__('Not anonymous') }}}
    • {[ } ]} {[ if (o.semianonymous) { ]}
  • {{{ o.__('Semi-anonymous') }}}
    • {[ } ]} {[ if (o.moderated) { ]} -
  • {{{ o.__('Moderated') }}}
    • +
  • {{{ o.__('Moderated') }}}
    • {[ } ]} {[ if (o.unmoderated) { ]} -
  • {{{ o.__('Not moderated') }}}
    • +
  • {{{ o.__('Not moderated') }}}
    • {[ } ]} {[ if (o.mam_enabled) { ]}
  • {{{ o.__('Message archiving') }}}