Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
b7c01993
Commit
b7c01993
authored
6 years ago
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
User-facing term is "groupchat", not "room"
parent
60236469
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
dist/converse.js
dist/converse.js
+1
-1
spec/chatroom.js
spec/chatroom.js
+2
-2
src/converse-muc-views.js
src/converse-muc-views.js
+1
-1
src/templates/chatroom_destroyed.html
src/templates/chatroom_destroyed.html
+1
-1
No files found.
dist/converse.js
View file @
b7c01993
...
...
@@ -92192,7 +92192,7 @@ module.exports = function(o) {
var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
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">' +
__e(o.__('This
room
no longer exists')) +
__e(o.__('This
groupchat
no longer exists')) +
'</h3>\n\n <p class="destroyed-reason">' +
__e(o.reason) +
'</p>\n\n ';
This diff is collapsed.
Click to expand it.
spec/chatroom.js
View file @
b7c01993
...
...
@@ -1611,7 +1611,7 @@
spyOn
(
view
,
'
showErrorMessage
'
).
and
.
callThrough
();
_converse
.
connection
.
_dataRecv
(
test_utils
.
createRequest
(
presence
));
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
)
.
toBe
(
`"We didn't like the name"`
);
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
(
'
/subject: Set groupchat subject
'
);
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
(
'
/op: Grant moderator role to user
'
);
expect
(
info_messages
.
pop
().
textContent
).
toBe
(
'
/nick: Change your nickname
'
);
...
...
This diff is collapsed.
Click to expand it.
src/converse-muc-views.js
View file @
b7c01993
...
...
@@ -912,7 +912,7 @@ converse.plugins.add('converse-muc-views', {
`<strong>/nick</strong>:
${
__
(
'
Change your nickname
'
)}
`
,
`<strong>/op</strong>:
${
__
(
'
Grant moderator role to user
'
)}
`
,
`<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>/subject</strong>:
${
__
(
'
Set groupchat subject
'
)}
`
,
`<strong>/topic</strong>:
${
__
(
'
Set groupchat subject (alias for /subject)
'
)}
`
,
...
...
This diff is collapsed.
Click to expand it.
src/templates/chatroom_destroyed.html
View file @
b7c01993
<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>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment