Commits April 2010

commits@gajim.org

7 participants
72 discussions

gajim: More whitespace fixes.
by Éric Araujo 09 Apr '10

09 Apr '10

changeset 1dc7fe252dec in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1dc7fe252dec description: More whitespace fixes. diffstat: scripts/dev/run-pylint.py | 1 - setup_win32.py | 3 +- src/common/dataforms.py | 1 - src/common/dh.py | 41 ++++++++++++++++---------------- src/common/xmpp/c14n.py | 1 - src/common/xmpp/idlequeue.py | 1 - src/common/zeroconf/zeroconf_bonjour.py | 1 - src/dialogs.py | 1 - src/ipython_view.py | 1 - src/search_window.py | 1 - test/lib/mock.py | 3 -- 11 files changed, 22 insertions(+), 33 deletions(-) diffs (139 lines): diff -r 0d440eb6cb90 -r 1dc7fe252dec scripts/dev/run-pylint.py --- a/scripts/dev/run-pylint.py Wed Feb 10 17:59:17 2010 +0100 +++ b/scripts/dev/run-pylint.py Thu Apr 08 01:20:22 2010 +0200 @@ -8,4 +8,3 @@ os.chdir('../../src/') # we were in scripts/dev os.system("pylint --indent-string='\t' --additional-builtins='_' --disable-msg=C0111,C0103,C0111,C0112 --disable-checker=design " + "".join(sys.argv[1:])) - diff -r 0d440eb6cb90 -r 1dc7fe252dec setup_win32.py --- a/setup_win32.py Wed Feb 10 17:59:17 2010 +0100 +++ b/setup_win32.py Thu Apr 08 01:20:22 2010 +0200 @@ -52,7 +52,8 @@ opts = { 'py2exe': { # ConfigParser,UserString,roman are needed for docutils - 'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,ConfigParser,UserString', + 'includes': ('pango,atk,gobject,cairo,pangocairo,gtk.keysyms,' + 'encodings,encodings.*,ConfigParser,UserString'), 'dll_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll', 'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll', diff -r 0d440eb6cb90 -r 1dc7fe252dec src/common/dataforms.py --- a/src/common/dataforms.py Wed Feb 10 17:59:17 2010 +0100 +++ b/src/common/dataforms.py Thu Apr 08 01:20:22 2010 +0200 @@ -555,4 +555,3 @@ # record.setName('reported') # self.addChild(node=record) # return locals() - diff -r 0d440eb6cb90 -r 1dc7fe252dec src/common/dh.py --- a/src/common/dh.py Wed Feb 10 17:59:17 2010 +0100 +++ b/src/common/dh.py Thu Apr 08 01:20:22 2010 +0200 @@ -27,28 +27,27 @@ ''' import string -generators = [ None, # one to get the right offset - 2, - 2, - None, - None, - 2, - None, - None, - None, - None, - None, - None, - None, - None, - 2, # group 14 - 2, - 2, - 2, - 2, - ] +generators = [None, # one to get the right offset + 2, + 2, + None, + None, + 2, + None, + None, + None, + None, + None, + None, + None, + None, + 2, # group 14 + 2, + 2, + 2, + 2] -hex_primes = [ None, +hex_primes = [None, # group 1 '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 diff -r 0d440eb6cb90 -r 1dc7fe252dec src/common/xmpp/c14n.py --- a/src/common/xmpp/c14n.py Wed Feb 10 17:59:17 2010 +0100 +++ b/src/common/xmpp/c14n.py Thu Apr 08 01:20:22 2010 +0200 @@ -54,4 +54,3 @@ def normalise_text(val): return val.replace('&', '&').replace('<', '<').replace('>', '>').replace('\r', '') - diff -r 0d440eb6cb90 -r 1dc7fe252dec src/common/xmpp/idlequeue.py --- a/src/common/xmpp/idlequeue.py Wed Feb 10 17:59:17 2010 +0100 +++ b/src/common/xmpp/idlequeue.py Thu Apr 08 01:20:22 2010 +0200 @@ -511,4 +511,3 @@ def process(self): self._check_time_events() - diff -r 0d440eb6cb90 -r 1dc7fe252dec src/common/zeroconf/zeroconf_bonjour.py --- a/src/common/zeroconf/zeroconf_bonjour.py Wed Feb 10 17:59:17 2010 +0100 +++ b/src/common/zeroconf/zeroconf_bonjour.py Thu Apr 08 01:20:22 2010 +0200 @@ -330,4 +330,3 @@ except pybonjour.BonjourError: return False return True - diff -r 0d440eb6cb90 -r 1dc7fe252dec src/dialogs.py --- a/src/dialogs.py Wed Feb 10 17:59:17 2010 +0100 +++ b/src/dialogs.py Thu Apr 08 01:20:22 2010 +0200 @@ -5123,4 +5123,3 @@ session.reject_content(content) dialog.destroy() - diff -r 0d440eb6cb90 -r 1dc7fe252dec src/ipython_view.py --- a/src/ipython_view.py Wed Feb 10 17:59:17 2010 +0100 +++ b/src/ipython_view.py Thu Apr 08 01:20:22 2010 +0200 @@ -533,4 +533,3 @@ if rv: rv = rv.strip('\n') self.showReturned(rv) self.cout.truncate(0) - diff -r 0d440eb6cb90 -r 1dc7fe252dec src/search_window.py --- a/src/search_window.py Wed Feb 10 17:59:17 2010 +0100 +++ b/src/search_window.py Thu Apr 08 01:20:22 2010 +0200 @@ -230,4 +230,3 @@ if self.data_form_widget.title: self.window.set_title('%s - Search - Gajim' % \ self.data_form_widget.title) - diff -r 0d440eb6cb90 -r 1dc7fe252dec test/lib/mock.py --- a/test/lib/mock.py Wed Feb 10 17:59:17 2010 +0100 +++ b/test/lib/mock.py Thu Apr 08 01:20:22 2010 +0200 @@ -461,6 +461,3 @@ return testFn CALLABLE = callable - - -

1 0

gajim: More whitespace mini fixes.
by Éric Araujo 09 Apr '10

09 Apr '10

changeset c3e2c08b5782 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c3e2c08b5782 description: More whitespace mini fixes. diffstat: scripts/dev/run-pylint.py | 1 - setup_win32.py | 4 +- src/common/dataforms.py | 1 - src/common/dh.py | 41 ++++++++++++++++---------------- src/common/multimedia_helpers.py | 1 - src/common/xmpp/auth_nb.py | 2 +- src/common/xmpp/c14n.py | 1 - src/common/xmpp/idlequeue.py | 1 - src/common/zeroconf/zeroconf_bonjour.py | 1 - src/dialogs.py | 1 - src/ipython_view.py | 1 - test/lib/mock.py | 3 -- 12 files changed, 23 insertions(+), 35 deletions(-) diffs (159 lines): diff -r 179ca9915658 -r c3e2c08b5782 scripts/dev/run-pylint.py --- a/scripts/dev/run-pylint.py Wed Apr 07 04:09:58 2010 +0300 +++ b/scripts/dev/run-pylint.py Thu Apr 08 01:10:17 2010 +0200 @@ -8,4 +8,3 @@ os.chdir('../../src/') # we were in scripts/dev os.system("pylint --include-ids=y --additional-builtins='_' --disable-msg=C0103,C0111,W0703,W0511,W0142,W0613,R0201 --disable-checker=design " + "".join(sys.argv[1:])) - diff -r 179ca9915658 -r c3e2c08b5782 setup_win32.py --- a/setup_win32.py Wed Apr 07 04:09:58 2010 +0300 +++ b/setup_win32.py Thu Apr 08 01:10:17 2010 +0200 @@ -52,7 +52,8 @@ opts = { 'py2exe': { # ConfigParser,UserString,roman are needed for docutils - 'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,ConfigParser,UserString', + 'includes': ('pango,atk,gobject,cairo,pangocairo,gtk.keysyms,' + 'encodings,encodings.*,ConfigParser,UserString'), 'dll_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll', 'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll', @@ -78,7 +79,6 @@ url='http://www.gajim.org/', download_url='http://www.gajim.org/downloads.php', license='GPL', - windows=[{'script': 'src/gajim.py', 'icon_resources': [(1, 'data/pixmaps/gajim.ico')]}, {'script': 'src/history_manager.py', diff -r 179ca9915658 -r c3e2c08b5782 src/common/dataforms.py --- a/src/common/dataforms.py Wed Apr 07 04:09:58 2010 +0300 +++ b/src/common/dataforms.py Thu Apr 08 01:10:17 2010 +0200 @@ -615,4 +615,3 @@ # record.setName('reported') # self.addChild(node=record) # return locals() - diff -r 179ca9915658 -r c3e2c08b5782 src/common/dh.py --- a/src/common/dh.py Wed Apr 07 04:09:58 2010 +0300 +++ b/src/common/dh.py Thu Apr 08 01:10:17 2010 +0200 @@ -28,28 +28,27 @@ import string -generators = [ None, # one to get the right offset - 2, - 2, - None, - None, - 2, - None, - None, - None, - None, - None, - None, - None, - None, - 2, # group 14 - 2, - 2, - 2, - 2, - ] +generators = [None, # one to get the right offset + 2, + 2, + None, + None, + 2, + None, + None, + None, + None, + None, + None, + None, + None, + 2, # group 14 + 2, + 2, + 2, + 2] -hex_primes = [ None, +hex_primes = [None, # group 1 '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 diff -r 179ca9915658 -r c3e2c08b5782 src/common/multimedia_helpers.py --- a/src/common/multimedia_helpers.py Wed Apr 07 04:09:58 2010 +0300 +++ b/src/common/multimedia_helpers.py Thu Apr 08 01:10:17 2010 +0200 @@ -97,4 +97,3 @@ # ximagesink self.detect_element('ximagesink', _('X Window System (without Xv)')) self.detect_element('autovideosink', _('Autodetect')) - diff -r 179ca9915658 -r c3e2c08b5782 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Wed Apr 07 04:09:58 2010 +0300 +++ b/src/common/xmpp/auth_nb.py Thu Apr 08 01:10:17 2010 +0200 @@ -438,7 +438,7 @@ self.scram_soup = 'n=' + self.username + ',r=' + nonce self.scram_gs2 = 'n,,' # No CB yet. sasl_data = (self.scram_gs2 + self.scram_soup).encode('base64').\ - replace('\n','') + replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': self.mechanism}, payload=[sasl_data]) elif self.mechanism == 'DIGEST-MD5': diff -r 179ca9915658 -r c3e2c08b5782 src/common/xmpp/c14n.py --- a/src/common/xmpp/c14n.py Wed Apr 07 04:09:58 2010 +0300 +++ b/src/common/xmpp/c14n.py Thu Apr 08 01:10:17 2010 +0200 @@ -57,4 +57,3 @@ def normalise_text(val): return val.replace('&', '&').replace('<', '<').replace('>', '>').replace('\r', '') - diff -r 179ca9915658 -r c3e2c08b5782 src/common/xmpp/idlequeue.py --- a/src/common/xmpp/idlequeue.py Wed Apr 07 04:09:58 2010 +0300 +++ b/src/common/xmpp/idlequeue.py Thu Apr 08 01:10:17 2010 +0200 @@ -543,4 +543,3 @@ def process(self): self._check_time_events() - diff -r 179ca9915658 -r c3e2c08b5782 src/common/zeroconf/zeroconf_bonjour.py --- a/src/common/zeroconf/zeroconf_bonjour.py Wed Apr 07 04:09:58 2010 +0300 +++ b/src/common/zeroconf/zeroconf_bonjour.py Thu Apr 08 01:10:17 2010 +0200 @@ -330,4 +330,3 @@ except pybonjour.BonjourError: return False return True - diff -r 179ca9915658 -r c3e2c08b5782 src/dialogs.py --- a/src/dialogs.py Wed Apr 07 04:09:58 2010 +0300 +++ b/src/dialogs.py Thu Apr 08 01:10:17 2010 +0200 @@ -4956,4 +4956,3 @@ session.reject_content(content) dialog.destroy() - diff -r 179ca9915658 -r c3e2c08b5782 src/ipython_view.py --- a/src/ipython_view.py Wed Apr 07 04:09:58 2010 +0300 +++ b/src/ipython_view.py Thu Apr 08 01:10:17 2010 +0200 @@ -534,4 +534,3 @@ if rv: rv = rv.strip('\n') self.showReturned(rv) self.cout.truncate(0) - diff -r 179ca9915658 -r c3e2c08b5782 test/lib/mock.py --- a/test/lib/mock.py Wed Apr 07 04:09:58 2010 +0300 +++ b/test/lib/mock.py Thu Apr 08 01:10:17 2010 +0200 @@ -461,6 +461,3 @@ return testFn CALLABLE = callable - - -

1 0

gajim: [Gabriel] add <confirm> tag when we reply to XEP-0070 req...
by Yann Leboulanger 09 Apr '10

09 Apr '10

changeset 9fd207639cc3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9fd207639cc3 description: [Gabriel] add <confirm> tag when we reply to XEP-0070 request when it's a message. Fixes #5690 diffstat: src/common/connection_handlers.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (20 lines): diff -r 9c7128886a69 -r 9fd207639cc3 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Apr 07 21:34:57 2010 +0200 +++ b/src/common/connection_handlers.py Fri Apr 09 15:11:04 2010 +0200 @@ -990,10 +990,14 @@ if not self.connection or self.connected < 2: return if answer == 'yes': - self.connection.send(iq_obj.buildReply('result')) + confirm = iq_obj.getTag('confirm') + reply = iq_obj.buildReply('result') + if iq_obj.getType() == 'message': + reply.addChild(node=confirm) + self.connection.send(reply) elif answer == 'no': err = common.xmpp.Error(iq_obj, - common.xmpp.protocol.ERR_NOT_AUTHORIZED) + common.xmpp.protocol.ERR_NOT_AUTHORIZED) self.connection.send(err) def _HttpAuthCB(self, con, iq_obj):

1 0

gajim: we require pyopenssl >= 0.9
by Yann Leboulanger 07 Apr '10

07 Apr '10

changeset 9c7128886a69 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9c7128886a69 description: we require pyopenssl >= 0.9 diffstat: README.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 179ca9915658 -r 9c7128886a69 README.html --- a/README.html Wed Apr 07 04:09:58 2010 +0300 +++ b/README.html Wed Apr 07 21:34:57 2010 +0200 @@ -23,7 +23,7 @@ <h2>Optional Runtime Requirements</h2> <ul> -<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> +<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.9) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> <li>python-crypto to enable End to end encryption</li> <li>For idle module, libxss library</li> <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>

1 0

gajim-website: link to new windows installer
by Yann Leboulanger 07 Apr '10

07 Apr '10

changeset bcf1241c8e2b in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=bcf1241c8e2b description: link to new windows installer diffstat: downloads.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d5c114d2d625 -r bcf1241c8e2b downloads.php --- a/downloads.php Tue Apr 06 19:33:05 2010 +0200 +++ b/downloads.php Wed Apr 07 21:29:58 2010 +0200 @@ -140,7 +140,7 @@ print _(" Windows installer\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-1.exe\">"._("Gajim installer")."</a>.\n"; +print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-2.exe\">"._("Gajim installer")."</a>.\n"; print (" <br/>\n"); #print _(" Here is a")." <a href=\"downloads/0.13/gajim-0.13-rc5.exe\">"._("Gajim installer")."</a> "; #printf(_("for %s version "), "0.13-rc5");

1 0

gajim: Refactored the Q_ translation function
by Alexander Cherniuk 07 Apr '10

07 Apr '10

changeset 179ca9915658 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=179ca9915658 description: Refactored the Q_ translation function diffstat: src/common/i18n.py | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diffs (43 lines): diff -r 5724fd1f28bd -r 179ca9915658 src/common/i18n.py --- a/src/common/i18n.py Tue Apr 06 18:05:06 2010 +0000 +++ b/src/common/i18n.py Wed Apr 07 04:09:58 2010 +0300 @@ -67,20 +67,25 @@ else: _translation = gettext.NullTranslations() -def Q_(s): - # Qualified translatable strings - # Some strings are too ambiguous to be easily translated. - # so we must use as: - # s = Q_('?vcard:Unknown') - # widget.set_text(s) - # Q_() removes the ?vcard: - # but gettext while parsing the file detects ?vcard:Unknown as a whole string. - # translator can either put the ?vcard: part or no (easier for him or her to no) - # nothing fails - s = _(s) - if s[0] == '?': - s = s[s.find(':')+1:] # remove ?abc: part - return s +def Q_(text): + """ + Translate the given text, optionally qualified with a special + construction, which will help translators to disambiguate between + same terms, but in different contexts. + + When translated text is returned - this rudimentary construction + will be stripped off, if it's present. + + Here is the construction to use: + Q_("?vcard:Unknown") + + Everything between ? and : - is the qualifier to convey the context + to the translators. Everything after : - is the text itself. + """ + text = _(text) + if text.startswith('?'): + qualifier, text = text.split(':', 1) + return text def ngettext(s_sing, s_plural, n, replace_sing = None, replace_plural = None): """

1 0

gajim: l10n: Updates to French (fr) translation
by asterix 06 Apr '10

06 Apr '10

changeset 5724fd1f28bd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5724fd1f28bd description: l10n: Updates to French (fr) translation Transmitted-via: Transifex (www.transifex.net) diffstat: po/fr.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 296673c94281 -r 5724fd1f28bd po/fr.po --- a/po/fr.po Mon Apr 05 19:58:40 2010 +0000 +++ b/po/fr.po Tue Apr 06 18:05:06 2010 +0000 @@ -605,9 +605,8 @@ msgstr "N'ai pas" #: ../data/gui/advanced_notifications_window.ui.h:13 -#, fuzzy msgid "File Transfer Finished" -msgstr "Transfert de fichiers" +msgstr "Transfert de fichier terminé" #: ../data/gui/advanced_notifications_window.ui.h:14 #, fuzzy

1 0

gajim-website: add transifex tocken
by Yann Leboulanger 06 Apr '10

06 Apr '10

changeset d5c114d2d625 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=d5c114d2d625 description: add transifex tocken diffstat: README.transifex | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diffs (15 lines): diff -r c98d6e4eac15 -r d5c114d2d625 README.transifex --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.transifex Tue Apr 06 19:33:05 2010 +0200 @@ -0,0 +1,11 @@ +Transifex.net Token Verification +================================= + +The list of tokens bellow guarantee the respective users to be able to enable +submission on components using the following repository url: + +ssh://hg.gajim.org/gajim-website + +Tokens: + +KaESWWjjs3mZzdFePMZVyHZyFnYcbtMB / asterix

1 0

gajim-website: [chrishalliwellperry] fix a space in polish websi...
by Yann Leboulanger 06 Apr '10

06 Apr '10

changeset c98d6e4eac15 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=c98d6e4eac15 description: [chrishalliwellperry] fix a space in polish website translation diffstat: locale/pl_PL/LC_MESSAGES/msg.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8e113d972e93 -r c98d6e4eac15 locale/pl_PL/LC_MESSAGES/msg.po --- a/locale/pl_PL/LC_MESSAGES/msg.po Fri Apr 02 11:06:38 2010 +0200 +++ b/locale/pl_PL/LC_MESSAGES/msg.po Tue Apr 06 19:12:54 2010 +0200 @@ -478,7 +478,7 @@ #: downloads.php:156 msgid " The tarball version of Gajim is " -msgstr " Spakowana wersja Gajima jest" +msgstr " Spakowana wersja Gajima jest " #: downloads.php:156 msgid "For information on how to build Gajim,"

1 0

gajim: Apply some cosmetics to the GCTooltip as well
by Alexander Cherniuk 03 Apr '10

03 Apr '10

changeset 9c95d2d15663 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9c95d2d15663 description: Apply some cosmetics to the GCTooltip as well diffstat: src/tooltips.py | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diffs (63 lines): diff -r b79c7c573a8a -r 9c95d2d15663 src/tooltips.py --- a/src/tooltips.py Sat Apr 03 21:08:09 2010 +0300 +++ b/src/tooltips.py Sat Apr 03 21:38:54 2010 +0300 @@ -200,6 +200,23 @@ status = formatted % ('#555753', status) return status + @staticmethod + def colorize_affiliation(affiliation): + """ + Color the affiliation of a MUC participant inside the tooltip by + it's semantics. Color palette is the Tango. + """ + formatted = "<span foreground='%s'>%s</span>" + if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")): + affiliation = formatted % ('#555753', affiliation) + elif affiliation.startswith(_("Member")): + affiliation = formatted % ('#73D216', affiliation) + elif affiliation.startswith(_("Administrator")): + affiliation = formatted % ('#F57900', affiliation) + elif affiliation.startswith(_("Owner")): + affiliation = formatted % ('#CC0000', affiliation) + return affiliation + class StatusTable: """ Contains methods for creating status table. This is used in Roster and @@ -371,18 +388,20 @@ show = self.colorize_status(show) properties.append((show, None)) - if contact.jid.strip() != '': - properties.append((_('Jabber ID: '), contact.jid)) + if contact.jid.strip(): + properties.append((_('Jabber ID: '), "<b>%s</b>" % contact.jid)) - if hasattr(contact, 'resource') and contact.resource.strip() != '': + if hasattr(contact, 'resource') and contact.resource.strip(): properties.append((_('Resource: '), - gobject.markup_escape_text(contact.resource) )) + gobject.markup_escape_text(contact.resource))) + if contact.affiliation != 'none': uf_affiliation = helpers.get_uf_affiliation(contact.affiliation) - affiliation_str = \ + uf_affiliation =\ _('%(owner_or_admin_or_member)s of this group chat') %\ {'owner_or_admin_or_member': uf_affiliation} - properties.append((affiliation_str, None)) + uf_affiliation = self.colorize_affiliation(uf_affiliation) + properties.append((uf_affiliation, None)) # Add avatar puny_name = helpers.sanitize_filename(contact.name) @@ -582,7 +601,7 @@ self._append_pep_info(contact, properties) - properties.append((_('Jabber ID: '), "<b>%s</b>" % prim_contact.jid )) + properties.append((_('Jabber ID: '), "<b>%s</b>" % prim_contact.jid)) # contact has only one ressource if num_resources == 1 and contact.resource:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2010