david/jmc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change lang parameter to lang_class

Browse Source 
darcs-hash:20070605193128-86b55-e2c941adaa098a662e1598d8a37f5aa53636ab79.gz
This commit is contained in:
David Rousselie
2007-06-05 21:31:28 +02:00
parent 7827cfb6b2
commit fce4a74e9b
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/jmc/jabber/component.py
View File

@@ -198,7 +198,7 @@ class MailHandler(Handler):
Handler.__init__(self) Handler.__init__(self)
self.dest_jid_regexp = re.compile(".*%.*") self.dest_jid_regexp = re.compile(".*%.*")
def filter(self, stanza, lang): def filter(self, stanza, lang_class):
"""Return empty array if JID match '.*%.*@componentJID'""" """Return empty array if JID match '.*%.*@componentJID'"""
if self.dest_jid_regexp.match(stanza.get_to().node): if self.dest_jid_regexp.match(stanza.get_to().node):
bare_from_jid = unicode(stanza.get_from().bare()) bare_from_jid = unicode(stanza.get_from().bare())
@@ -220,19 +220,19 @@ class SendMailMessageHandler(MailHandler):
self.__logger = logging.getLogger(\ self.__logger = logging.getLogger(\
"jmc.jabber.component.SendMailMessageHandler") "jmc.jabber.component.SendMailMessageHandler")
def send_mail_result(self, message, lang, to_email): def send_mail_result(self, message, lang_class, to_email):
return [Message(from_jid=message.get_to(), return [Message(from_jid=message.get_to(),
to_jid=message.get_from(), to_jid=message.get_from(),
subject=lang.send_mail_ok_subject, subject=lang_class.send_mail_ok_subject,
body=lang.send_mail_ok_body % (to_email))] body=lang_class.send_mail_ok_body % (to_email))]
def handle(self, message, lang, accounts): def handle(self, message, lang_class, accounts):
to_node = message.get_to().node to_node = message.get_to().node
to_email = to_node.replace('%', '@', 1) to_email = to_node.replace('%', '@', 1)
accounts[0].send_email(to_email, accounts[0].send_email(to_email,
message.get_subject(), message.get_subject(),
message.get_body()) message.get_body())
return self.send_mail_result(message, lang, to_email) return self.send_mail_result(message, lang_class, to_email)
class RootSendMailMessageHandler(SendMailMessageHandler): class RootSendMailMessageHandler(SendMailMessageHandler):
def __init__(self): def __init__(self):
@@ -241,7 +241,7 @@ class RootSendMailMessageHandler(SendMailMessageHandler):
self.__logger = logging.getLogger(\ self.__logger = logging.getLogger(\
"jmc.jabber.component.RootSendMailMessageHandler") "jmc.jabber.component.RootSendMailMessageHandler")
def filter(self, message, lang): def filter(self, message, lang_class):
name = message.get_to().node name = message.get_to().node
bare_from_jid = unicode(message.get_from().bare()) bare_from_jid = unicode(message.get_from().bare())
accounts = Account.select(\ accounts = Account.select(\
@@ -252,7 +252,7 @@ class RootSendMailMessageHandler(SendMailMessageHandler):
bare_from_jid + " must be uniq") bare_from_jid + " must be uniq")
return accounts return accounts
def handle(self, message, lang, accounts): def handle(self, message, lang_class, accounts):
to_email = None to_email = None
lines = message.get_body().split('\n') lines = message.get_body().split('\n')
message_body = [] message_body = []
@@ -268,13 +268,13 @@ class RootSendMailMessageHandler(SendMailMessageHandler):
if to_email is not None: if to_email is not None:
accounts[0].send_email(to_email, message.get_subject(), accounts[0].send_email(to_email, message.get_subject(),
"\n".join(message_body)) "\n".join(message_body))
return self.send_mail_result(message, lang, to_email) return self.send_mail_result(message, lang_class, to_email)
else: else:
return [Message(from_jid=message.get_to(), return [Message(from_jid=message.get_to(),
to_jid=message.get_from(), to_jid=message.get_from(),
stanza_type="error", stanza_type="error",
subject=lang.send_mail_error_no_to_header_subject, subject=lang_class.send_mail_error_no_to_header_subject,
body=lang.send_mail_error_no_to_header_body)] body=lang_class.send_mail_error_no_to_header_body)]
class MailSubscribeHandler(DefaultSubscribeHandler, MailHandler): class MailSubscribeHandler(DefaultSubscribeHandler, MailHandler):
"""Use DefaultSubscribeHandler handle method and MailHandler filter""" """Use DefaultSubscribeHandler handle method and MailHandler filter"""
@@ -283,11 +283,11 @@ class MailSubscribeHandler(DefaultSubscribeHandler, MailHandler):
DefaultSubscribeHandler.__init__(self) DefaultSubscribeHandler.__init__(self)
MailHandler.__init__(self) MailHandler.__init__(self)
def filter(self, stanza, lang): def filter(self, stanza, lang_class):
return MailHandler.filter(self, stanza, lang) return MailHandler.filter(self, stanza, lang_class)
def handle(self, stanza, lang, accounts): def handle(self, stanza, lang_class, accounts):
return DefaultSubscribeHandler.handle(self, stanza, lang, accounts) return DefaultSubscribeHandler.handle(self, stanza, lang_class, accounts)
class MailUnsubscribeHandler(DefaultUnsubscribeHandler, MailHandler): class MailUnsubscribeHandler(DefaultUnsubscribeHandler, MailHandler):
"""Use DefaultUnsubscribeHandler handle method and MailHandler filter""" """Use DefaultUnsubscribeHandler handle method and MailHandler filter"""
@@ -296,8 +296,8 @@ class MailUnsubscribeHandler(DefaultUnsubscribeHandler, MailHandler):
DefaultUnsubscribeHandler.__init__(self) DefaultUnsubscribeHandler.__init__(self)
MailHandler.__init__(self) MailHandler.__init__(self)
def filter(self, stanza, lang): def filter(self, stanza, lang_class):
return MailHandler.filter(self, stanza, lang) return MailHandler.filter(self, stanza, lang_class)
def handle(self, stanza, lang, accounts): def handle(self, stanza, lang, accounts):
return DefaultUnsubscribeHandler.handle(self, stanza, lang, accounts) return DefaultUnsubscribeHandler.handle(self, stanza, lang, accounts)