Merge branch 'master' into 'master'
Fix #8749: Misleading error message when joining a room Closes #8749 See merge request gajim/gajim!150
This commit is contained in:
commit
54f4c36fe3
1 changed files with 6 additions and 1 deletions
|
@ -326,8 +326,13 @@ class Interface:
|
|||
obj.room_jid)
|
||||
elif (obj.errcode == '404') or (obj.errcon in ('item-not-found',
|
||||
'remote-server-not-found')):
|
||||
# remote server does not exist
|
||||
if (obj.errcon == 'remote-server-not-found'):
|
||||
self.handle_gc_error(gc_control, _('Unable to join group chat'),
|
||||
_('Remote server <b>%s</b> does not exist.') % obj.room_jid)
|
||||
# group chat does not exist
|
||||
self.handle_gc_error(gc_control, _('Unable to join group chat'),
|
||||
else:
|
||||
self.handle_gc_error(gc_control, _('Unable to join group chat'),
|
||||
_('Group chat <b>%s</b> does not exist.') % obj.room_jid)
|
||||
elif (obj.errcode == '405') or (obj.errcon == 'not-allowed'):
|
||||
self.handle_gc_error(gc_control, _('Unable to join group chat'),
|
||||
|
|
Loading…
Add table
Reference in a new issue