Commits September 2011

commits@gajim.org

2 participants
107 discussions

gajim: Try to import kerberos now, not waiting ofr demandimport....
by Yann Leboulanger 13 Sep '11

13 Sep '11

changeset 3813e4548503 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3813e4548503 description: Try to import kerberos now, not waiting ofr demandimport. Fixes #6975 diffstat: src/common/xmpp/auth_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 38025da2ee91 -r 3813e4548503 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Mon Sep 12 23:52:22 2011 +0200 +++ b/src/common/xmpp/auth_nb.py Tue Sep 13 08:46:47 2011 +0200 @@ -42,7 +42,7 @@ def C(some): return ':'.join(some) try: - import kerberos + kerberos = __import__('kerberos') have_kerberos = True except ImportError: have_kerberos = False

1 0

gajim: fix dll detection under windows. Fixes #5968
by Yann Leboulanger 12 Sep '11

12 Sep '11

changeset 38025da2ee91 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=38025da2ee91 description: fix dll detection under windows. Fixes #5968 diffstat: src/gajim.py | 56 +++++++++++++++++++++++++++----------------------------- 1 files changed, 27 insertions(+), 29 deletions(-) diffs (80 lines): diff -r eaf03bb31026 -r 38025da2ee91 src/gajim.py --- a/src/gajim.py Fri Sep 09 14:49:40 2011 +0200 +++ b/src/gajim.py Mon Sep 12 23:52:22 2011 +0200 @@ -35,6 +35,33 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import os +import sys +import warnings + +if os.name == 'nt': + log_path = os.path.join(os.environ['APPDATA'], 'Gajim') + if not os.path.exists(log_path): + os.mkdir(log_path, 0700) + log_file = os.path.join(log_path, 'gajim.log') + fout = open(log_file, 'a') + sys.stdout = fout + sys.stderr = fout + + warnings.filterwarnings(action='ignore') + + if os.path.isdir('gtk'): + # Used to create windows installer with GTK included + paths = os.environ['PATH'] + list_ = paths.split(';') + new_list = [] + for p in list_: + if p.find('gtk') < 0 and p.find('GTK') < 0: + new_list.append(p) + new_list.insert(0, os.path.join(os.getcwd(), 'gtk', 'lib')) + new_list.insert(0, os.path.join(os.getcwd(), 'gtk', 'bin')) + os.environ['PATH'] = ';'.join(new_list) + from common import demandimport demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', @@ -42,9 +69,6 @@ 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic'] -import os -import sys - if os.name == 'nt': import locale import gettext @@ -70,32 +94,6 @@ libintl.bindtextdomain(APP, DIR) libintl.bind_textdomain_codeset(APP, 'UTF-8') -import warnings - -if os.name == 'nt': - log_path = os.path.join(os.environ['APPDATA'], 'Gajim') - if not os.path.exists(log_path): - os.mkdir(log_path, 0700) - log_file = os.path.join(log_path, 'gajim.log') - fout = open(log_file, 'a') - sys.stdout = fout - sys.stderr = fout - - warnings.filterwarnings(action='ignore') - - if os.path.isdir('gtk'): - # Used to create windows installer with GTK included - paths = os.environ['PATH'] - list_ = paths.split(';') - new_list = [] - for p in list_: - if p.find('gtk') < 0 and p.find('GTK') < 0: - new_list.append(p) - new_list.insert(0, 'gtk/lib') - new_list.insert(0, 'gtk/bin') - os.environ['PATH'] = ';'.join(new_list) - os.environ['GTK_BASEPATH'] = 'gtk' - if os.name == 'nt': # needed for docutils sys.path.append('.')

1 0

gajim: increase defaultroster window width. Fixes #6967
by Yann Leboulanger 09 Sep '11

09 Sep '11

changeset eaf03bb31026 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=eaf03bb31026 description: increase defaultroster window width. Fixes #6967 diffstat: data/gui/roster_window.ui | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (17 lines): diff -r e01a1a963cfe -r eaf03bb31026 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Thu Sep 08 08:29:03 2011 +0200 +++ b/data/gui/roster_window.ui Fri Sep 09 14:49:40 2011 +0200 @@ -3,11 +3,11 @@ <requires lib="gtk+" version="2.16"/>  <object class="GtkWindow" id="roster_window"> - <property name="width_request">85</property> + <property name="width_request">250</property> <property name="height_request">200</property> <property name="title" translatable="yes">Gajim</property> <property name="role">roster</property> - <property name="default_width">200</property> + <property name="default_width">250</property> <property name="default_height">400</property> <accel-groups> <group name="accelgroup1"/>

1 0

gajim: updated ja and zh_tw translations
by Yann Leboulanger 08 Sep '11

08 Sep '11

changeset 502ac321657d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=502ac321657d description: updated ja and zh_tw translations diffstat: po/ja.po | 5600 +++++++++++++++++++++++++++------------------------------- po/zh_TW.po | 4118 +++++++++++++++++++++--------------------- 2 files changed, 4641 insertions(+), 5077 deletions(-) diffs (truncated from 19792 to 300 lines): diff -r 89fae73f3ee0 -r 502ac321657d po/ja.po --- a/po/ja.po Thu Sep 08 19:18:53 2011 +0200 +++ b/po/ja.po Thu Sep 08 19:19:23 2011 +0200 @@ -2,19 +2,15 @@ # Copyright (C) 2009 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package. # -#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228 -#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255 -#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262 -#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264 -msgid "" -msgstr "" -"Project-Id-Version: Gajim 0.13.3\n" +msgid "" +msgstr "" +"Project-Id-Version: Gajim 0.15 ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-01 20:39+0200\n" -"PO-Revision-Date: 2010-03-10 17:59+0900\n" -"Last-Translator: Mako N. <mako(a)pasero.net>\n" +"POT-Creation-Date: 2011-09-08 19:14+0200\n" +"PO-Revision-Date: 2011-09-02 19:09+0900\n" +"Last-Translator: Mako N <mako(a)pasero.net>\n" "Language-Team: Japanese\n" -"Language: \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,11 +21,10 @@ msgstr "グループチャットに参加する (_G)..." #: ../data/gui/account_context_menu.ui.h:2 -#, fuzzy msgid "_Add Contact..." -msgstr "相手先リストに追加する (_C)..." - -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18 +msgstr "相手先リストに追加する (_A)..." + +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19 msgid "_Discover Services" msgstr "サービスを探索する (_D)" @@ -119,12 +114,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:17 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694 -#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344 -#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688 -#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514 -#: ../src/dialogs.py:527 ../src/roster_window.py:2956 -#: ../src/roster_window.py:2962 ../src/roster_window.py:2967 +#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703 +#: ../src/config.py:1708 ../src/config.py:2284 ../src/config.py:2363 +#: ../src/config.py:2376 ../src/config.py:3655 ../src/config.py:3730 +#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 +#: ../src/dialogs.py:532 ../src/roster_window.py:3092 +#: ../src/roster_window.py:3098 ../src/roster_window.py:3103 msgid "None" msgstr "なし" @@ -152,7 +147,7 @@ msgstr "Jabber ネットワークに接続するには、アカウントが必要です。" #: ../data/gui/account_creation_wizard_window.ui.h:24 -#: ../data/gui/roster_window.ui.h:16 +#: ../data/gui/roster_window.ui.h:17 msgid "_Advanced" msgstr "拡張 (_A)" @@ -165,12 +160,13 @@ msgstr "ホスト名 (_H):" #: ../data/gui/account_creation_wizard_window.ui.h:27 -#: ../data/gui/accounts_window.ui.h:62 +#: ../data/gui/accounts_window.ui.h:61 msgid "_Jabber ID:" msgstr "Jabber ID (_J):" #: ../data/gui/account_creation_wizard_window.ui.h:28 -#: ../data/gui/accounts_window.ui.h:64 +#: ../data/gui/accounts_window.ui.h:63 +#: ../data/gui/manage_bookmarks_window.ui.h:8 msgid "_Password:" msgstr "パスワード (_P):" @@ -179,6 +175,7 @@ msgstr "ポート番号 (_P):" #: ../data/gui/account_creation_wizard_window.ui.h:30 +#: ../data/gui/manage_bookmarks_window.ui.h:9 msgid "_Server:" msgstr "サーバー (_S):" @@ -223,19 +220,23 @@ msgstr "切断したら自動で再接続する" #: ../data/gui/accounts_window.ui.h:11 -#, fuzzy msgid "Browse..." -msgstr "一覧 (_B)" +msgstr "参照..." #: ../data/gui/accounts_window.ui.h:12 msgid "C_onnect on Gajim startup" msgstr "Gajim 起動時に接続する (_o)" #: ../data/gui/accounts_window.ui.h:13 +#, fuzzy +msgid "Certificate is e_ncrypted" +msgstr "証明書は暗号化される (_e)" + +#: ../data/gui/accounts_window.ui.h:14 msgid "Chan_ge Password" msgstr "パスワードを変更する (_g)" -#: ../data/gui/accounts_window.ui.h:14 +#: ../data/gui/accounts_window.ui.h:15 msgid "" "Check this so Gajim will ask you before sending your password over an " "insecure connection." @@ -243,11 +244,6 @@ "チェックをつけると、安全でない接続の前にパスワードを聞いてくるようになりま" "す。" -#: ../data/gui/accounts_window.ui.h:15 -#, fuzzy -msgid "Choose Client Cert" -msgstr "転送するファイルを選択..." - #: ../data/gui/accounts_window.ui.h:16 msgid "Choose _Key..." msgstr "鍵の選択 (_K)..." @@ -261,9 +257,8 @@ msgstr "別アカウントのすべての相手先に承認を求めるにはクリック" #: ../data/gui/accounts_window.ui.h:19 -#, fuzzy msgid "Client certificate" -msgstr "自己署名証明書" +msgstr "クライアントの証明書" #: ../data/gui/accounts_window.ui.h:20 msgid "Co_nnect on Gajim startup" @@ -285,18 +280,19 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5 -#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 -#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600 -#: ../src/notify.py:616 +#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160 +#: ../src/notify.py:311 ../src/notify.py:334 ../src/notify.py:383 +#: ../src/notify.py:399 msgid "Gajim" msgstr "Gajim" #. FIXME: Ugly workaround. -#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General) +#. FIXME: Ugly workaround. +#. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57 -#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122 -#: ../src/roster_window.py:2898 ../src/roster_window.py:5451 +#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56 +#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124 +#: ../src/roster_window.py:3034 ../src/roster_window.py:5652 msgid "General" msgstr "全般" @@ -355,8 +351,8 @@ msgstr "サーバに格納する、あなたに関する情報です" #: ../data/gui/accounts_window.ui.h:35 -#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817 -#: ../src/dialogs.py:831 +#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826 +#: ../src/dialogs.py:837 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -369,8 +365,8 @@ msgid "Mer_ge accounts" msgstr "アカウントの統合 (_g)" -#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790 -#: ../src/config.py:2358 +#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799 +#: ../src/config.py:2377 msgid "No key selected" msgstr "鍵が選択されていません" @@ -397,7 +393,7 @@ msgstr "優先順位は、在席状況に応じて自動的に変わります。" #. Rename -#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401 +#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5602 msgid "Re_name" msgstr "名前の変更 (_n)" @@ -437,58 +433,54 @@ #: ../data/gui/accounts_window.ui.h:52 #: ../data/gui/synchronise_select_account_dialog.ui.h:2 msgid "Synchronise contacts" -msgstr "相手先の同期" +msgstr "相手先を合わせる" #: ../data/gui/accounts_window.ui.h:53 -msgid "The path to the client certificate and key in PKCS#12 format" -msgstr "" - -#: ../data/gui/accounts_window.ui.h:54 msgid "Use G_PG Agent" msgstr "GPG エージェントを使う (_P)" -#: ../data/gui/accounts_window.ui.h:55 +#: ../data/gui/accounts_window.ui.h:54 msgid "Use cust_om hostname/port" msgstr "別のホスト名/ポート番号を使う (_o)" -#: ../data/gui/accounts_window.ui.h:56 +#: ../data/gui/accounts_window.ui.h:55 msgid "Use cust_om port:" msgstr "別のポート番号を使う (_o):" -#: ../data/gui/accounts_window.ui.h:57 +#: ../data/gui/accounts_window.ui.h:56 msgid "Use file transfer proxies" msgstr "ファイル転送のプロキシを使う" +#: ../data/gui/accounts_window.ui.h:57 +msgid "_Client Cert File:" +msgstr "クライアントの証明書ファイル (_C):" + #: ../data/gui/accounts_window.ui.h:58 -msgid "_Client Cert File:" -msgstr "" - -#: ../data/gui/accounts_window.ui.h:59 msgid "_Edit Personal Information..." msgstr "個人情報を編集する (_E)..." #. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:59 ../data/gui/xml_console_window.ui.h:11 msgid "_Enable" msgstr "有効 (_E)" -#: ../data/gui/accounts_window.ui.h:61 +#: ../data/gui/accounts_window.ui.h:60 msgid "_Hostname: " msgstr "ホスト名 (_H):" -#: ../data/gui/accounts_window.ui.h:63 +#: ../data/gui/accounts_window.ui.h:62 msgid "_Manage..." msgstr "管理 (_M)..." -#: ../data/gui/accounts_window.ui.h:65 +#: ../data/gui/accounts_window.ui.h:64 msgid "_Port: " msgstr "ポート番号 (_P):" -#: ../data/gui/accounts_window.ui.h:66 +#: ../data/gui/accounts_window.ui.h:65 msgid "_Warn before using an insecure connection" msgstr "安全でない接続の前には警告する (_W)" -#: ../data/gui/accounts_window.ui.h:67 +#: ../data/gui/accounts_window.ui.h:66 msgid "_use HTTP__PROXY environment variable" msgstr "環境変数 HTTP__PROXY を使う (_u)" @@ -532,6 +524,7 @@ msgstr "グループ (_G):" #: ../data/gui/add_new_contact_window.ui.h:12 +#: ../data/gui/manage_bookmarks_window.ui.h:7 msgid "_Nickname:" msgstr "ニックネーム (_N):" @@ -544,9 +537,8 @@ msgstr "登録 (_R)" #: ../data/gui/add_new_contact_window.ui.h:15 -#, fuzzy msgid "_Save subscription message" -msgstr "在席通知の申し込み (_S)" +msgstr "在席通知申込のメッセージを保存 (_S)" #: ../data/gui/add_new_contact_window.ui.h:16 msgid "_User ID:" @@ -573,9 +565,8 @@ msgstr "エラーの説明..."

1 0

gajim: www.gajim.org -> gajim.org
by Yann Leboulanger 08 Sep '11

08 Sep '11

changeset efb52ad64f9c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=efb52ad64f9c description: www.gajim.org -> gajim.org diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 63c883a8791b -r efb52ad64f9c src/dialogs.py --- a/src/dialogs.py Wed Sep 07 10:31:34 2011 +0300 +++ b/src/dialogs.py Wed Sep 07 18:04:24 2011 +0200 @@ -1273,7 +1273,7 @@ dlg.set_comments('%s\n%s %s\n%s %s' % (_('A GTK+ Jabber/XMPP client'), _('GTK+ Version:'), self.tuple2str(gtk.gtk_version), \ _('PyGTK Version:'), self.tuple2str(gtk.pygtk_version))) - dlg.set_website('http://www.gajim.org/') + dlg.set_website('http://gajim.org/') authors_file_path = self.get_path('AUTHORS') if authors_file_path:

1 0

gajim: add zh_tw to LINGUAS file
by Yann Leboulanger 08 Sep '11

08 Sep '11

changeset 89fae73f3ee0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=89fae73f3ee0 description: add zh_tw to LINGUAS file diffstat: po/LINGUAS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r efb52ad64f9c -r 89fae73f3ee0 po/LINGUAS --- a/po/LINGUAS Wed Sep 07 18:04:24 2011 +0200 +++ b/po/LINGUAS Thu Sep 08 19:18:53 2011 +0200 @@ -31,3 +31,4 @@ uk ja kk +zh_TW

1 0

gajim: pluginmanager.better exception handling when importing mo...
by Fomin Denis 08 Sep '11

08 Sep '11

changeset 63c883a8791b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=63c883a8791b description: pluginmanager.better exception handling when importing modules diffstat: src/plugins/pluginmanager.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (27 lines): diff -r acb49650cf22 -r 63c883a8791b src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Mon Sep 05 22:00:23 2011 +0200 +++ b/src/plugins/pluginmanager.py Wed Sep 07 10:31:34 2011 +0300 @@ -415,9 +415,9 @@ try: module = __import__(module_name) except ValueError, value_error: - pass + log.debug(value_error) except ImportError, import_error: - pass + log.debug(import_error) elif os.path.isdir(file_path) and scan_dirs: module_name = elem_name @@ -425,9 +425,9 @@ try: module = __import__(module_name) except ValueError, value_error: - pass + log.debug(value_error) except ImportError, import_error: - pass + log.debug(import_error) if module is None:

1 0

gajim: [Kamil Paral & I] upower support. Fixes #1962
by Yann Leboulanger 08 Sep '11

08 Sep '11

changeset acb49650cf22 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=acb49650cf22 description: [Kamil Paral & I] upower support. Fixes #1962 diffstat: src/features_window.py | 4 ++++ src/gui_interface.py | 3 +++ src/upower_listener.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 0 deletions(-) diffs (82 lines): diff -r 896a2c1fd3b8 -r acb49650cf22 src/features_window.py --- a/src/features_window.py Sun Sep 04 23:23:38 2011 +0300 +++ b/src/features_window.py Mon Sep 05 22:00:23 2011 +0200 @@ -111,6 +111,10 @@ _('Ability to request your router to forward port for file transfer.'), _('Requires python-gupnp-igd.'), _('Feature not available under Windows.')), + _('UPower'): (self.gupnp_igd_available, + _('Ability to disconnect properly just before suspending the machine.'), + _('Requires upower and python-dbus.'), + _('Feature not available under Windows.')), } # name, supported diff -r 896a2c1fd3b8 -r acb49650cf22 src/gui_interface.py --- a/src/gui_interface.py Sun Sep 04 23:23:38 2011 +0300 +++ b/src/gui_interface.py Mon Sep 05 22:00:23 2011 +0200 @@ -2723,6 +2723,9 @@ dbus_support.supported: import network_manager_listener + if dbus_support.supported: + import upower_listener + # Handle gnome screensaver if dbus_support.supported: def gnome_screensaver_ActiveChanged_cb(active): diff -r 896a2c1fd3b8 -r acb49650cf22 src/upower_listener.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/upower_listener.py Mon Sep 05 22:00:23 2011 +0200 @@ -0,0 +1,50 @@ +## src/upower_listener.py +## +## Copyright (C) 2006-2011 Yann Leboulanger <asterix AT lagaule.org> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + + +supported = False + +from common import dbus_support +from common import gajim + +def on_suspend(*args, **kwargs): + for name, conn in gajim.connections.items(): + if gajim.account_is_connected(name): + conn.old_show = gajim.SHOW_LIST[conn.connected] + st = conn.status + conn.change_status('offline', _('Machine going to sleep')) + conn.status = st + conn.time_to_reconnect = 5 + +if dbus_support.supported: + import dbus + import dbus.glib + + try: + from common.dbus_support import system_bus + bus = system_bus.bus() + if 'org.freedesktop.UPower' in bus.list_names(): + up_object = bus.get_object('org.freedesktop.UPower', + '/org/freedesktop/UPower') + bus.add_signal_receiver(on_suspend, 'Sleeping', + 'org.freedesktop.UPower', 'org.freedesktop.UPower', + '/org/freedesktop/UPower') + supported = True + except Exception: + pass \ No newline at end of file

1 0

gajim: add script to build plugins translations
by Yann Leboulanger 08 Sep '11

08 Sep '11

changeset 9e2b200b0a65 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9e2b200b0a65 description: add script to build plugins translations diffstat: scripts/dev/plugins_translate | 95 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diffs (99 lines): diff -r e41a7e01a5dc -r 9e2b200b0a65 scripts/dev/plugins_translate --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/dev/plugins_translate Sat Sep 03 22:56:37 2011 +0200 @@ -0,0 +1,95 @@ +#!/bin/sh + +PYFILES=$(find -L ./ -type f -name "*.py") +GLADEFILES=$(find -L ./ -type f -name "*.ui") + + +check_args() +{ + if [ $# -ne 2 ]; then + echo "Missing lang argument" >&2 + exit 4 + fi +} + +init_ln() +{ + if [ -e "core_plugins" ] && [ ! -L "core_plugins" ]; then + echo "core_plugins must be a symbolic link" >&2 + exit 1 + fi + if [ ! -e "core_plugins" ]; then + ln -s ../../plugins core_plugins + fi + if [ ! -L "community_plugins" ]; then + echo "community_plugins should be a symbolic link to gajim-plugins repository, else they won't be in po files" + fi +} + +make_pot() +{ + # Generate .ui.h + find -L ./ -type f -name "*.ui" -exec intltool-extract --type="gettext/glade" {} \; + GLADEHFILES=$(find -L ./ -type f -name "*.ui.h") + xgettext -k_ -kN_ -o plugins_translations.pot $PYFILES $GLADEHFILES --from-code=utf-8 + rm $GLADEHFILES +} + +make_po() +{ + if [ -f $1.po ]; then + echo "Updating '$1' language"; + msgmerge -U $1.po plugins_translations.pot; + else + msginit -l $1.UTF-8 -o $1.po; + fi +} + +make_mo() +{ + if [ ! -f $1.po ]; then + echo "$1.po doesn't existe. Use plugins_translation make_po $1 to create it."; + exit 3 + fi + mkdir -p locale/$1/LC_MESSAGES + msgfmt -o $1.mo $1.po +} + +install_mo() +{ + if [ -L community_plugins ]; then + cp $1.mo community_plugins/plugins_translate/ + fi + mkdir -p ~/.local/share/gajim/plugins/locale/$1/LC_MESSAGES/ + cp $1.mo ~/.local/share/gajim/plugins/locale/$1/LC_MESSAGES/gajim_plugins.mo +} + + +case "$1" in + make_po) + check_args $@ + init_ln + make_pot + make_po $2 + ;; + make_mo) + check_args $@ + make_mo $2 + ;; + install_mo) + install_mo + ;; + all) + check_args $@ + init_ln + make_pot + make_po $2 + make_mo $2 + install_mo $2 + ;; + *) + echo "Usage: plugins_translation {all|make_po|make_mo|install_mo}" >&2 + echo "example: plugins_translation make_po fr_FR" + exit 2 + ;; +esac

1 0

gajim: translate all modules in the plugin dir(whiteboard plugin...
by Fomin Denis 08 Sep '11

08 Sep '11

changeset 896a2c1fd3b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=896a2c1fd3b8 description: translate all modules in the plugin dir(whiteboard plugin for example. translate plugin.py and whiteboard_widget.py) diffstat: plugins/whiteboard/plugin.py | 7 ++++--- src/plugins/pluginmanager.py | 6 ++---- 2 files changed, 6 insertions(+), 7 deletions(-) diffs (37 lines): diff -r 9e2b200b0a65 -r 896a2c1fd3b8 plugins/whiteboard/plugin.py --- a/plugins/whiteboard/plugin.py Sat Sep 03 22:56:37 2011 +0200 +++ b/plugins/whiteboard/plugin.py Sun Sep 04 23:23:38 2011 +0300 @@ -120,11 +120,12 @@ if control.contact.supports(NS_JINGLE_SXE) and \ control.contact.supports(NS_SXE): base.button.set_sensitive(True) - base.button.set_tooltip_text(_('Show whiteboard')) + tooltip_text = _('Show whiteboard') else: base.button.set_sensitive(False) - base.button.set_tooltip_text(_('Client on the other side ' - 'does not support the whiteboard')) + tooltip_text = _('Client on the other side ' + 'does not support the whiteboard') + base.button.set_tooltip_text(tooltip_text) @log_calls('WhiteboardPlugin') def show_request_dialog(self, account, fjid, jid, sid, content_types): diff -r 9e2b200b0a65 -r 896a2c1fd3b8 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sat Sep 03 22:56:37 2011 +0200 +++ b/src/plugins/pluginmanager.py Sun Sep 04 23:23:38 2011 +0300 @@ -461,12 +461,10 @@ conf.remove_section('info') plugins_found.append(module_attr) - # set plugin localization - plugin_module = dir(module)[-1] - getattr(module, plugin_module)._ = _ except TypeError, type_error: - pass + # set plugin localization + module_attr._ = _ except ConfigParser.NoOptionError, type_error: # all fields are required log.debug('%s : %s' % (module_attr_name,

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2011