[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.4-9-gd1c4d7d

[X2Go dev team]

The branch, twofactorauth has been updated
       via  d1c4d7df3ad670f1c96361018e49c822e9b3f883 (commit)
      from  033a966df66de981678e0deda2f5c008c5d6f1d2 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 pyhoca-gui               |    2 +-
 pyhoca/wxgui/messages.py |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/pyhoca-gui b/pyhoca-gui
index 9ddab17..3723004 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -317,7 +317,7 @@ def main():
 
     if check_running(): 
         sys.stderr.write("\n###############################\n### %s: already running for user %s\n###############################\n" % (PROG_NAME, _CURRENT_LOCAL_USER))
-        m = messages.PyHoca_MessageWindow_Ok(wx.App(), custom_message=_(u'PyHoca-GUI is already running for user ,,%s\'\'!\n\nOnly one instance of PyHoca-GUI can be started per\nuser. The PyHoca-GUI icon can be found in your desktops\'s\nnotification area/systray.') % _CURRENT_LOCAL_USER, title=_(u'PyHoca-GUI (%s)...') % VERSION, icon='pyhoca-trayicon')
+        m = messages.PyHoca_MessageWindow_Ok(wx.App(), shortmsg='ALREADY_RUNNING', title=u'PyHoca-GUI (%s)...' % VERSION, icon='pyhoca-trayicon')
         m.ShowModal()
         version()
 
diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py
index 9fa0c5f..9ae8031 100644
--- a/pyhoca/wxgui/messages.py
+++ b/pyhoca/wxgui/messages.py
@@ -29,6 +29,8 @@ import gevent
 # PyHoca-GUI modules
 import basepath
 
+# X2go modules
+from x2go.defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER
 
 _icons_location = basepath.icons_basepath
 
@@ -49,12 +51,13 @@ class PyHoca_MessageWindow(wx.Dialog):
 
         self._pyhoca_messages = { 
             'REALLY_DELETE_PROFILE': _(u'Are you really sure you want to\ndelete the session profile ,,%s\'\'?') % profile_name,
+            'ALREADY_RUNNING': _(u'PyHoca-GUI is already running for user ,,%s\'\'!\n\nOnly one instance of PyHoca-GUI can be started per\nuser. The PyHoca-GUI icon can be found in your desktops\'s\nnotification area/systray.') % _CURRENT_LOCAL_USER
         }
 
 
         if shortmsg is None:
             show_message = custom_message
-        elif shortmsg in self._pyhoca_messages:
+        elif shortmsg in self._pyhoca_messages.keys():
             show_message = self._pyhoca_messages[shortmsg]
         else:
             show_message = 'No message has been given...'


hooks/post-receive
-- 
pyhoca-gui.git (Python X2Go Client (wxPython GUI))

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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).