changeset 9db52e975b8a in /home/hg/repos/gajim

author: Yann Leboulanger <aste...@lagaule.org>
branches: 
details:http://hg.gajim.org/gajim?cmd=changeset;node=9db52e975b8a
description: [gdr_gdr] Improve error message when a groupchat is in roster as a 
contact. Fixes #8380

diffstat:

 src/dialogs.py       |  4 +++-
 src/gui_interface.py |  4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 73696744a9c0 -r 9db52e975b8a src/dialogs.py
--- a/src/dialogs.py    Tue Sep 06 23:08:09 2016 +0200
+++ b/src/dialogs.py    Sun Sep 18 15:46:39 2016 +0200
@@ -2664,7 +2664,9 @@
         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
diff -r 73696744a9c0 -r 9db52e975b8a src/gui_interface.py
--- a/src/gui_interface.py      Tue Sep 06 23:08:09 2016 +0200
+++ b/src/gui_interface.py      Sun Sep 18 15:46:39 2016 +0200
@@ -2117,7 +2117,9 @@
         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:
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to