Selaa lähdekoodia

User-facing term is "groupchat", not "room"

JC Brand 6 vuotta sitten
vanhempi
commit
b7c01993b7

+ 1 - 1
dist/converse.js

@@ -92192,7 +92192,7 @@ module.exports = function(o) {
 var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
 var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
 function print() { __p += __j.call(arguments, '') }
 function print() { __p += __j.call(arguments, '') }
 __p += '<!-- src/templates/chatroom_destroyed.html -->\n<div class="alert alert-danger">\n    <h3 class="alert-heading disconnect-msg">' +
 __p += '<!-- src/templates/chatroom_destroyed.html -->\n<div class="alert alert-danger">\n    <h3 class="alert-heading disconnect-msg">' +
-__e(o.__('This room no longer exists')) +
+__e(o.__('This groupchat no longer exists')) +
 '</h3>\n\n    <p class="destroyed-reason">' +
 '</h3>\n\n    <p class="destroyed-reason">' +
 __e(o.reason) +
 __e(o.reason) +
 '</p>\n\n    ';
 '</p>\n\n    ';

+ 2 - 2
spec/chatroom.js

@@ -1611,7 +1611,7 @@
                 spyOn(view, 'showErrorMessage').and.callThrough();
                 spyOn(view, 'showErrorMessage').and.callThrough();
                 _converse.connection._dataRecv(test_utils.createRequest(presence));
                 _converse.connection._dataRecv(test_utils.createRequest(presence));
                 expect(view.el.querySelector('.chatroom-body .disconnect-msg').textContent)
                 expect(view.el.querySelector('.chatroom-body .disconnect-msg').textContent)
-                    .toBe('This room no longer exists');
+                    .toBe('This groupchat no longer exists');
                 expect(view.el.querySelector('.chatroom-body .destroyed-reason').textContent)
                 expect(view.el.querySelector('.chatroom-body .destroyed-reason').textContent)
                     .toBe(`"We didn't like the name"`);
                     .toBe(`"We didn't like the name"`);
                 expect(view.el.querySelector('.chatroom-body .moved-label').textContent.trim())
                 expect(view.el.querySelector('.chatroom-body .moved-label').textContent.trim())
@@ -2423,7 +2423,7 @@
                 expect(info_messages.pop().textContent).toBe('/topic: Set groupchat subject (alias for /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('/subject: Set groupchat subject');
                 expect(info_messages.pop().textContent).toBe('/revoke: Revoke user\'s membership');
                 expect(info_messages.pop().textContent).toBe('/revoke: Revoke user\'s membership');
-                expect(info_messages.pop().textContent).toBe('/register: Register a nickname for this room');
+                expect(info_messages.pop().textContent).toBe('/register: Register a nickname for this groupchat');
                 expect(info_messages.pop().textContent).toBe('/owner: Grant ownership of this groupchat');
                 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('/op: Grant moderator role to user');
                 expect(info_messages.pop().textContent).toBe('/nick: Change your nickname');
                 expect(info_messages.pop().textContent).toBe('/nick: Change your nickname');

+ 1 - 1
src/converse-muc-views.js

@@ -912,7 +912,7 @@ converse.plugins.add('converse-muc-views', {
                             `<strong>/nick</strong>: ${__('Change your nickname')}`,
                             `<strong>/nick</strong>: ${__('Change your nickname')}`,
                             `<strong>/op</strong>: ${__('Grant moderator role to user')}`,
                             `<strong>/op</strong>: ${__('Grant moderator role to user')}`,
                             `<strong>/owner</strong>: ${__('Grant ownership of this groupchat')}`,
                             `<strong>/owner</strong>: ${__('Grant ownership of this groupchat')}`,
-                            `<strong>/register</strong>: ${__("Register a nickname for this room")}`,
+                            `<strong>/register</strong>: ${__("Register a nickname for this groupchat")}`,
                             `<strong>/revoke</strong>: ${__("Revoke user's membership")}`,
                             `<strong>/revoke</strong>: ${__("Revoke user's membership")}`,
                             `<strong>/subject</strong>: ${__('Set groupchat subject')}`,
                             `<strong>/subject</strong>: ${__('Set groupchat subject')}`,
                             `<strong>/topic</strong>: ${__('Set groupchat subject (alias for /subject)')}`,
                             `<strong>/topic</strong>: ${__('Set groupchat subject (alias for /subject)')}`,

+ 1 - 1
src/templates/chatroom_destroyed.html

@@ -1,5 +1,5 @@
 <div class="alert alert-danger">
 <div class="alert alert-danger">
-    <h3 class="alert-heading disconnect-msg">{{{o.__('This room no longer exists')}}}</h3>
+    <h3 class="alert-heading disconnect-msg">{{{o.__('This groupchat no longer exists')}}}</h3>
 
 
     <p class="destroyed-reason">{{{o.reason}}}</p>
     <p class="destroyed-reason">{{{o.reason}}}</p>