Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2017-08-28 09:28:02 +02:00
commit da2502ca17
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -5,6 +5,7 @@
### Bugfixes ### Bugfixes
- Various IE11 fixes. - Various IE11 fixes.
- Translations written as template literals [aren't parsed properly by xgettext](https://savannah.gnu.org/bugs/?50920). - Translations written as template literals [aren't parsed properly by xgettext](https://savannah.gnu.org/bugs/?50920).
- Fix regarding ChatRoomView.getDefaultNickName() and muc_nickname_from_jid
## 3.2.0 (2017-08-09) ## 3.2.0 (2017-08-09)

2
src/converse-muc.js
View File

@ -1571,7 +1571,7 @@
if (_converse.muc_nickname_from_jid) { if (_converse.muc_nickname_from_jid) {
// We try to enter the room with the node part of // We try to enter the room with the node part of
// the user's JID. // the user's JID.
this.join(Strophe.unescapeNode(Strophe.getNodeFromJid(_converse.bare_jid))); this.join(this.getDefaultNickName());
} else { } else {
this.renderNicknameForm(message); this.renderNicknameForm(message);
} }