Changeset 2547

Timestamp:

Oct 3, 2016, 12:38:12 PM (3 years ago)

Author:

jrpelegrina

Message:

WIP in i18n compatibility and fix switch-user semi-light client

Location:

lliurex-session-manager/trunk/fuentes

Files:

• debian/rules (modified) (1 diff)
• install-files/usr/bin/lliurex-session-manager (modified) (12 diffs)
• lliurex-po/generate_po.sh (modified) (1 diff)
• lliurex-po/lliurex-session-manager/ca_ES.UTF-8@valencia (added)
• lliurex-po/lliurex-session-manager/ca_ES@valencia (added)
• lliurex-po/lliurex-session-manager/es.po (added)
• lliurex-po/lliurex-session-manager/lliurex-session-manager.pot (added)

lliurex-session-manager/trunk/fuentes/debian/rules

@@ -11 +11 @@
 
 %:
-        dh $@
+        dh $@ --with llxdev

lliurex-session-manager/trunk/fuentes/install-files/usr/bin/lliurex-session-manager

@@ -12 +12 @@
 import signal
 signal.signal(signal.SIGINT,signal.SIG_DFL)
+
+import gettext
+gettext.textdomain('lliurex-session-manager')
+_ = gettext.gettext
+
 
 
@@ -29 +34 @@
                 self.max_seconds=15.0
                 self.current_second=0
-                self.progress_txt="%s will %s in %s seconds..."
+                #self.progress_txt=_("%s will %s in %s seconds...")
                 self.can_suspend=True
                 self.can_hibernate=True
+                self.can_switch=True
                 
                 #DBUS INIT
@@ -47 +53 @@
                 self.sessman = self.session_bus.get_object("org.gnome.SessionManager","/org/gnome/SessionManager")
                 self.lockman = self.session_bus.get_object("org.mate.ScreenSaver","/org/mate/ScreenSaver")
-                display_obj = self.system_bus.get_object("org.freedesktop.DisplayManager","/org/freedesktop/DisplayManager/Seat0")
-                self.displayman = dbus.Interface(display_obj,"org.freedesktop.DisplayManager.Seat")
+                try:
+                        display_obj = self.system_bus.get_object("org.freedesktop.DisplayManager","/org/freedesktop/DisplayManager/Seat0")
+                        self.displayman = dbus.Interface(display_obj,"org.freedesktop.DisplayManager.Seat")
+                except:
+                        self.can_switch=False   
                 login_obj=self.system_bus.get_object("org.freedesktop.login1","/org/freedesktop/login1")
                 self.sysman=dbus.Interface(login_obj,"org.freedesktop.login1.Manager")
@@ -62 +71 @@
                 
                 builder=Gtk.Builder()
+                builder.set_translation_domain('lliurex-session-manager')
                 builder.add_from_file(GLADE_FILE)
                 
@@ -117 +127 @@
                 self.hibernate_button.set_visible(self.can_hibernate)
                 self.suspend_button.set_visible(self.can_suspend)
+                self.switch_button.set_visible(self.can_switch)
                 
                 
@@ -228 +239 @@
                 self.stack.set_visible_child_name("action")
                 self.current_action_image.set_from_file(LOGOUT_RSRC)
-                self.current_action_label.set_text("Log out now")
+                self.current_action_label.set_text(_("Log out now"))
                 self.execute_now_button.connect("clicked",self.execute_now,self.logout)
-                GLib.timeout_add(10,self.wait_to_execute,"Session","close",self.logout)
+                GLib.timeout_add(10,self.wait_to_execute,_("The session"),_("close"),self.logout)
                 self.cancel_button.set_visible(False)
                 self.back_button.set_visible(True)
@@ -249 +260 @@
                 self.stack.set_visible_child_name("action")
                 self.current_action_image.set_from_file(SUSPEND_RSRC)
-                self.current_action_label.set_text("Suspend now")
+                self.current_action_label.set_text(_("Suspend now"))
                 self.execute_now_button.connect("clicked",self.execute_now,self.suspend)
-                GLib.timeout_add(10,self.wait_to_execute,"System","suspend",self.suspend)
+                GLib.timeout_add(10,self.wait_to_execute,_("The system"),_("suspend"),self.suspend)
                 self.cancel_button.set_visible(False)
                 self.back_button.set_visible(True)
@@ -261 +272 @@
                 self.stack.set_visible_child_name("action")
                 self.current_action_image.set_from_file(HIBERNATE_RSRC)
-                self.current_action_label.set_text("Hibernate now")
+                self.current_action_label.set_text(_("Hibernate now"))
                 self.execute_now_button.connect("clicked",self.execute_now,self.hibernate)
-                GLib.timeout_add(10,self.wait_to_execute,"System","hibernate",self.hibernate)
+                GLib.timeout_add(10,self.wait_to_execute,_("The system"),_("hibernate"),self.hibernate)
                 self.cancel_button.set_visible(False)
                 self.back_button.set_visible(True)
@@ -274 +285 @@
                 self.stack.set_visible_child_name("action")
                 self.current_action_image.set_from_file(REBOOT_RSRC)
-                self.current_action_label.set_text("Reboot now")
+                self.current_action_label.set_text(_("Reboot now"))
                 self.execute_now_button.connect("clicked",self.execute_now,self.reboot)
-                GLib.timeout_add(10,self.wait_to_execute,"System","reboot",self.reboot)
+                GLib.timeout_add(10,self.wait_to_execute,_("The system"),_("reboot"),self.reboot)
                 self.cancel_button.set_visible(False)
                 self.back_button.set_visible(True)
@@ -286 +297 @@
                 self.stack.set_visible_child_name("action")
                 self.current_action_image.set_from_file(SHUTDOWN_RSRC)
-                self.current_action_label.set_text("Shutdown now")
+                self.current_action_label.set_text(_("Shutdown now"))
                 self.execute_now_button.connect("clicked",self.execute_now,self.shutdown)
-                GLib.timeout_add(10,self.wait_to_execute,"System","shutdown",self.shutdown)
+                GLib.timeout_add(10,self.wait_to_execute,_("The system"),_("shutdown"),self.shutdown)
                 self.cancel_button.set_visible(False)
                 self.back_button.set_visible(True)
@@ -300 +311 @@
                 
                 csecond=int(self.max_seconds+1-self.current_second)
-                self.progressbar.set_text(self.progress_txt%(what,how,csecond))
+                #self.progressbar.set_text(self.progress_txt%(what,how,csecond))
+                self.progressbar.set_text(_("%s will %s in %s seconds...")%(what,how,csecond))
                 self.progressbar.set_fraction(self.current_second/self.max_seconds)
                 self.current_second+=0.01
@@ -306 +318 @@
                 if self.current_second>=self.max_seconds:
                         print "Executing callback..."
-                        self.progressbar.set_text(self.progress_txt%(what,how,0))
+                        #self.progressbar.set_text(self.progress_txt%(what,how,0))
+                        self.progressbar.set_text(_("%s will %s in %s seconds...")%(what,how,0))
                         callback()
                         self.exit(None)

lliurex-session-manager/trunk/fuentes/lliurex-po/generate_po.sh

@@ -1 +1 @@
 #!/bin/bash
 
-cp ../install-files/usr/sbin/lliurex-owncloud-setup /tmp/lliurex-owncloud.py
+cp ../install-files/usr/bin/lliurex-session-manager /tmp/lliurex-session-manager.py
 
-xgettext ../install-files/usr/share/lliurex-owncloud/rsrc/lliurex-owncloud-setup.glade /tmp/lliurex-owncloud.py -o lliurex-owncloud/lliurex-owncloud.pot
+xgettext ../install-files/usr/share/lliurex-session-manager/rsrc/lliurex-session-manager.ui /tmp/lliurex-session-manager.py -o lliurex-session-manager/lliurex-session-manager.pot