copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[gdr_gdr] Improve error message when a groupchat is in roster as a contact. Fixes #8380

This commit is contained in:
Yann Leboulanger 2016-09-18 15:46:39 +02:00
parent 7cf654cdb3
commit b51b633d2a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dialogs.py
View File

@ -2664,7 +2664,9 @@ class JoinGroupchatWindow:
if gajim.contacts.get_contact(self.account, room_jid) and \
not gajim.contacts.get_contact(self.account, room_jid).is_groupchat():
ErrorDialog(_('This is not a group chat'),
_('%s is not the name of a group chat.') % room_jid)
_('%s is already in your roster. Please check if %s is a '
'correct group chat name. If it is, delete it from your roster '
'and try joining the group chat again.') % (room_jid, room_jid))
return
full_jid = room_jid + '/' + nickname

4
src/gui_interface.py
View File

@ -2117,7 +2117,9 @@ class Interface:
if gajim.contacts.get_contact(account, room_jid) and \
not gajim.contacts.get_contact(account, room_jid).is_groupchat():
dialogs.ErrorDialog(_('This is not a group chat'),
_('%s is not the name of a group chat.') % room_jid)
_('%s is already in your roster. Please check if %s is a '
'correct group chat name. If it is, delete it from your roster '
'and try joining the group chat again.') % (room_jid, room_jid))
return
if not nick: