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

User messages with subject

Browse Source 
darcs-hash:20060131233729-86b55-ac256a03268081156ed970a467c92e244146d452.gz
This commit is contained in:
David Rousselie
2006-02-01 00:37:29 +01:00
parent 06b67f48c0
commit 453d986f8d
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jabber/component.py
View File

@@ -653,14 +653,18 @@ class MailComponent(Component):
if self.__storage.has_key((base_from_jid, name)): if self.__storage.has_key((base_from_jid, name)):
m = Message(from_jid = self.jid, to_jid = from_jid, \ m = Message(from_jid = self.jid, to_jid = from_jid, \
stanza_type = "message", \ stanza_type = "message", \
body = lang_class.update_account_message \ subject = lang_class.update_account_message_subject \
% (type, name, login, password, socket)) % (type, name), \
body = lang_class.update_account_message_body \
% (login, password, socket))
self.stream.send(m) self.stream.send(m)
else: else:
m = Message(from_jid = self.jid, to_jid = from_jid, \ m = Message(from_jid = self.jid, to_jid = from_jid, \
stanza_type = "message", \ stanza_type = "message", \
body = lang_class.new_account_message \ subject = lang_class.new_account_message_subject \
% (type, name, login, password, socket)) % (type, name), \
body = lang_class.new_account_message_body \
% (login, password, socket))
self.stream.send(m) self.stream.send(m)
p = Presence(from_jid = name + "@" + unicode(self.jid), \ p = Presence(from_jid = name + "@" + unicode(self.jid), \
to_jid = base_from_jid, \ to_jid = base_from_jid, \

16
jabber/lang.py
View File

@@ -48,9 +48,11 @@ class Lang:
update_title = u"Jabber mail connection update" update_title = u"Jabber mail connection update"
update_instructions = u"Modifying connection '%s'" update_instructions = u"Modifying connection '%s'"
connection_label = u"%s connection '%s'" connection_label = u"%s connection '%s'"
update_account_message = u"Updated %s connection '%s': Registered with "\ update_account_message_subject = u"Updated %s connection '%s'"
"username '%s' and password '%s' on '%s'" update_account_message_body = u"Registered with username '%s' and " \
new_account_message = u"New %s connection '%s': Registered with " \ "password '%s' on '%s'"
new_account_message_subject = u"New %s connection '%s' created"
new_account_message_body = u"Registered with " \
"username '%s' and password '%s' on '%s'" "username '%s' and password '%s' on '%s'"
ask_password_subject = u"Password request" ask_password_subject = u"Password request"
ask_password_body = u"Reply to this message with the password " \ ask_password_body = u"Reply to this message with the password " \
@@ -87,10 +89,10 @@ class Lang:
update_title = u"Mise à jour du compte JMC" update_title = u"Mise à jour du compte JMC"
update_instructions = u"Modification de la connexion '%s'" update_instructions = u"Modification de la connexion '%s'"
connection_label = u"Connexion %s '%s'" connection_label = u"Connexion %s '%s'"
update_account_message = u"La connexion %s '%s' a été mise à jour : \n"\ update_account_message_subject = u"La connexion %s '%s' a été mise à jour"
"Nom d'utilisateur : '%s'\nMot de passe : '%s'\nsur : '%s'" update_account_message_body = u"Nom d'utilisateur : '%s'\nMot de passe : '%s'\nsur : '%s'"
new_account_message = u"La connexion %s '%s' a été créée : \n" \ new_account_message_subject = u"La connexion %s '%s' a été créée"
"Nom d'utilisateur : '%s'\nMot de passe : '%s'\nsur : '%s'" new_account_message_body = u"Nom d'utilisateur : '%s'\nMot de passe : '%s'\nsur : '%s'"
ask_password_subject = u"Demande de mot de passe" ask_password_subject = u"Demande de mot de passe"
ask_password_body = u"Répondre à ce message avec le mot de passe du " \ ask_password_body = u"Répondre à ce message avec le mot de passe du " \
"compte suivant : \n" \ "compte suivant : \n" \