copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some "jep" -> "xep"

This commit is contained in:
Jean-Marie Traissard 2008-03-30 20:35:02 +00:00
parent 61be183c8e
commit 75983ff571
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/connection.py
View File

@ -1050,8 +1050,8 @@ class Connection(ConnectionHandlers):
lang = os.getenv('LANG') lang = os.getenv('LANG')
if lang is not None and lang != 'en': # we're not english if lang is not None and lang != 'en': # we're not english
# one in locale and one en # one in locale and one en
msgtxt = _('[This message is *encrypted* (See :JEP:`27`]') +\ msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') +\
' ([This message is *encrypted* (See :JEP:`27`])' ' ([This message is *encrypted* (See :XEP:`27`])'
else: else:
# Encryption failed, do not send message # Encryption failed, do not send message
tim = localtime() tim = localtime()
@ -1077,7 +1077,7 @@ class Connection(ConnectionHandlers):
if form_node: if form_node:
msg_iq.addChild(node=form_node) msg_iq.addChild(node=form_node)
# JEP-0172: user_nickname # XEP-0172: user_nickname
if user_nick: if user_nick:
msg_iq.setTag('nick', namespace = common.xmpp.NS_NICK).setData( msg_iq.setTag('nick', namespace = common.xmpp.NS_NICK).setData(
user_nick) user_nick)
@ -1098,7 +1098,7 @@ class Connection(ConnectionHandlers):
if not msg_id: # avoid putting 'None' in <id> tag if not msg_id: # avoid putting 'None' in <id> tag
msg_id = '' msg_id = ''
chatstate_node.setTagData('id', msg_id) chatstate_node.setTagData('id', msg_id)
# when msgtxt, requests JEP-0022 composing notification # when msgtxt, requests XEP-0022 composing notification
if chatstate is 'composing' or msgtxt: if chatstate is 'composing' or msgtxt:
chatstate_node.addChild(name = 'composing') chatstate_node.addChild(name = 'composing')
@ -1305,7 +1305,7 @@ class Connection(ConnectionHandlers):
self.connection.send(iq) self.connection.send(iq)
def get_settings(self): def get_settings(self):
''' Get Gajim settings as described in JEP 0049 ''' ''' Get Gajim settings as described in XEP 0049 '''
if not self.connection: if not self.connection:
return return
iq = common.xmpp.Iq(typ='get') iq = common.xmpp.Iq(typ='get')
@ -1314,7 +1314,7 @@ class Connection(ConnectionHandlers):
self.connection.send(iq) self.connection.send(iq)
def get_bookmarks(self): def get_bookmarks(self):
'''Get Bookmarks from storage as described in JEP 0048''' '''Get Bookmarks from storage as described in XEP 0048'''
self.bookmarks = [] #avoid multiple bookmarks when re-connecting self.bookmarks = [] #avoid multiple bookmarks when re-connecting
if not self.connection: if not self.connection:
return return
@ -1373,7 +1373,7 @@ class Connection(ConnectionHandlers):
def get_metacontacts(self): def get_metacontacts(self):
'''Get metacontacts list from storage as described in JEP 0049''' '''Get metacontacts list from storage as described in XEP 0049'''
if not self.connection: if not self.connection:
return return
iq = common.xmpp.Iq(typ='get') iq = common.xmpp.Iq(typ='get')

12
src/common/contacts.py
View File

@ -47,18 +47,18 @@ class Contact:
self.caps_ver = None self.caps_ver = None
self.caps_exts = None self.caps_exts = None
# please read jep-85 http://www.jabber.org/jeps/jep-0085.html # please read xep-85 http://www.xmpp.org/extensions/xep-0085.html
# we keep track of jep85 support with the peer by three extra states: # we keep track of xep85 support with the peer by three extra states:
# None, False and 'ask' # None, False and 'ask'
# None if no info about peer # None if no info about peer
# False if peer does not support jep85 # False if peer does not support xep85
# 'ask' if we sent the first 'active' chatstate and are waiting for reply # 'ask' if we sent the first 'active' chatstate and are waiting for reply
# this holds what WE SEND to contact (our current chatstate) # this holds what WE SEND to contact (our current chatstate)
self.our_chatstate = our_chatstate self.our_chatstate = our_chatstate
self.msg_id = msg_id self.msg_id = msg_id
# tell which JEP we're using for composing state # tell which XEP we're using for composing state
# None = have to ask, XEP-0022 = use this jep, # None = have to ask, XEP-0022 = use this xep,
# XEP-0085 = use this jep, False = no composing support # XEP-0085 = use this xep, False = no composing support
self.composing_xep = composing_xep self.composing_xep = composing_xep
# this is contact's chatstate # this is contact's chatstate
self.chatstate = chatstate self.chatstate = chatstate