[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.4-219-g10d5af9

X2Go dev team git-admin at x2go.org
Thu Apr 19 22:36:13 CEST 2012


The branch, master has been updated
       via  10d5af9a27e7f4819780fa623573e7e38795e7df (commit)
      from  f232adfff9b9c87dfdd85692e6b3dbdf337e9192 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 10d5af9a27e7f4819780fa623573e7e38795e7df
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 19 22:35:48 2012 +0200

    Try to derive language information from X2goClient instance.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 x2go/client.py   |    3 +++
 x2go/session.py  |    2 ++
 3 files changed, 6 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index bcb30b9..6c4e4a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -113,6 +113,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - On unused port detection bind to 127.0.0.1 by default.
     - Provide X2goSession.get_session_type() method.
     - Do not call HOOK method if self.allow_share_local_folders is False.
+    - Try to derive language information from X2goClient instance.
   * Depend on python-xlib.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/client.py b/x2go/client.py
index e371471..2e217b8 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -176,6 +176,9 @@ class X2goClient(object):
     use these methods: L{X2goClient.register_session()} and L{X2goClient.connect_session()}.
 
     """
+
+    lang = 'en'
+
     def __init__(self, 
                  control_backend=control.X2goControlSession,
                  terminal_backend=terminal.X2goTerminalSession,
diff --git a/x2go/session.py b/x2go/session.py
index 06a41a9..501b082 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1358,6 +1358,8 @@ class X2goSession(object):
         @rtype: C{list}
 
         """
+        if self.client_instance and hasattr(self.client_instance, 'lang'):
+            lang = self.client_instance.lang
         return self.control_session.get_published_applications(lang=lang, refresh=refresh, raw=raw, very_raw=very_raw, max_no_submenus=max_no_submenus)
 
     def exec_published_application(self, exec_name):


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list