From 650bbdca395a0fd6598de857afd626dfb42375dd Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Sat, 3 Sep 2005 17:18:07 +0000
Subject: [PATCH] catch all error codes for MUC JEP and issue translatable
strings so non english user does not see english.
---
src/common/connection.py | 29 +++++++++++++++++++++++++----
src/gajim.py | 2 +-
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/common/connection.py b/src/common/connection.py
index 7f0886aec1..fe4cd6cf54 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -355,16 +355,37 @@ def _presenceCB(self, con, prs):
elif ptype == 'error':
errmsg = prs.getError()
errcode = prs.getErrorCode()
- if errcode == '409': #conflict: Nick Conflict
- self.dispatch('ERROR', (_('Unable to join room'),
- _('Server response:') + '\n' + errmsg))
- elif errcode == '502': # Internal Timeout:
+ if errcode == '502': # Internal Timeout:
self.dispatch('NOTIFY', (prs.getFrom().getStripped(),
'error', errmsg, prs.getFrom().getResource(),
prio, keyID, prs.getRole(), prs.getAffiliation(), prs.getJid(),
prs.getReason(), prs.getActor(), prs.getStatusCode(),
prs.getNewNick()))
+ elif errcode == '401': # password required to join
+ self.dispatch('ERROR', (_('Unable to join room'),
+ _('A password is required to join this room.')))
+ elif errcode == '403': # we are banned
+ self.dispatch('ERROR', (_('Unable to join room'),
+ _('You are banned from this room.')))
+ elif errcode == '404': # room does not exist
+ self.dispatch('ERROR', (_('Unable to join room'),
+ _('Such room does not exist.')))
+ elif errcode == '405':
+ self.dispatch('ERROR', (_('Unable to join room'),
+ _('Room creation is restricted,')))
+ elif errcode == '406':
+ self.dispatch('ERROR', (_('Unable to join room'),
+ _('Your registered nickname must be used.')))
+ elif errcode == '407':
+ self.dispatch('ERROR', (_('Unable to join room'),
+ _('You are not in the members list.')))
+ elif errcode == '409': # nick conflict
+ self.dispatch('ERROR', (_('Unable to join room'),
+ _('Your desired nickname is in use or registered by another user.')))
else:
+ #FIXME: wtf is ERROR_ANSWER? maybe I should handle there?
+ #some comments in the code ARE VITAL ppl :( :( :(
+ #other ppl read your code. do not make their life miserable
self.dispatch('ERROR_ANSWER', ('', prs.getFrom().getStripped(),
errmsg, errcode))
if not ptype or ptype == 'unavailable':
diff --git a/src/gajim.py b/src/gajim.py
index d8885b809e..5e90a13551 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -188,7 +188,7 @@ def handle_event_error_answer(self, account, array):
#('ERROR_ANSWER', account, (id, jid_from. errmsg, errcode))
if jid_from in self.windows[account]['gc']:
self.windows[account]['gc'][jid_from].print_conversation(
- 'Error %s: %s' % (array[2], array[1]), jid_from)
+ _('Error %s: %s') % (array[2], array[1]), jid_from)
def handle_event_con_type(self, account, con_type):
# ('CON_TYPE', account, con_type) which can be 'ssl', 'tls', 'tcp'
--
GitLab