Merge lp:~therve/landscape-client/i18n-settings into lp:~landscape/landscape-client/trunk

[Thomas Herve]

This adds i18n to the settings UI itself, including policy file, glade file, and desktop file. Most of the infrastructure being in place it was easier than the previous ones.

[Mike Milner (milner)]

Looks good! Can't make sense of your Parisian French though :) +1

review: Approve

[Alberto Donato (ack)]

Looks good! +1

review: Approve

=== renamed file 'applications/landscape-client-settings.desktop' => 'applications/landscape-client-settings.desktop.in'
--- applications/landscape-client-settings.desktop	2012-03-09 14:49:04 +0000
+++ applications/landscape-client-settings.desktop.in	2012-03-23 14:26:24 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=Management Service
-Comment=Management Service Preferences
+_Name=Management Service
+_Comment=Management Service Preferences
 Exec=landscape-client-ui-install
 Icon=preferences-management-service
 Terminal=False
@@ -13,5 +13,5 @@
 X-GNOME-Bugzilla-Component=sample
 X-GNOME-Bugzilla-Version=1.0.0
 X-GNOME-Settings-Panel=sample
-X-Ubuntu-Gettext-Domain=gnome-control-center-2.0
 X-GNOME-Keywords=device;system;information;memory;processor;version;default;application;fallback;preferred;
+X-Ubuntu-Gettext-Domain=landscape-client

=== modified file 'debian/rules'
--- debian/rules	2012-03-22 09:35:43 +0000
+++ debian/rules	2012-03-23 14:26:24 +0000
@@ -35,7 +35,6 @@
 	dh_testdir
 	sed -i -e "s/^DEBIAN_REVISION = \"\"/DEBIAN_REVISION = \"-$(revision)\"/g" landscape/__init__.py
 	python setup.py build
-	python setup.py build_i18n
 	make -C apt-update
 	touch build-stamp
 

=== modified file 'landscape/ui/controller/app.py'
--- landscape/ui/controller/app.py	2012-03-14 12:05:30 +0000
+++ landscape/ui/controller/app.py	2012-03-23 14:26:24 +0000
@@ -1,5 +1,7 @@
 import sys
 
+from gettext import gettext as _
+
 from gi.repository import Gio, Gtk, Notify
 
 from landscape.ui.model.configuration.proxy import ConfigurationProxy
@@ -42,18 +44,18 @@
 
     def on_succeed(self, action=None):
         if action:
-            message = "%s was successful." % action
+            message = action
         else:
-            message = "Success"
+            message = _("Success.")
         notification = Notify.Notification.new(NOTIFY_ID, message,
                                                "dialog-information")
         notification.show()
 
     def on_fail(self, action=None):
         if action:
-            message = "%s failed." % action
+            message = action
         else:
-            message = "Failure."
+            message = _("Failure.")
         notification = Notify.Notification.new(NOTIFY_ID, message,
                                                "dialog-information")
         notification.show()
@@ -85,5 +87,5 @@
             controller.exit(asynchronous=asynchronous)
             self.settings_dialog.destroy()
         else:
-            self.on_fail(action="Authentication")
+            self.on_fail(action=_("Authentication failed"))
             sys.stderr.write("Authentication failed.\n")

=== modified file 'landscape/ui/controller/configuration.py'
--- landscape/ui/controller/configuration.py	2012-03-14 13:48:18 +0000
+++ landscape/ui/controller/configuration.py	2012-03-23 14:26:24 +0000
@@ -1,5 +1,8 @@
+import logging
+
+from gettext import gettext as _
+
 from landscape.ui.constants import NOT_MANAGED, CANONICAL_MANAGED
-import logging
 
 from landscape.ui.model.registration.proxy import RegistrationProxy
 from landscape.ui.model.configuration.state import StateError
@@ -62,7 +65,7 @@
                          "changes to revert.")
 
     def persist(self, on_notify, on_error, on_succeed, on_fail):
-        "Persist settings via the configuration object."
+        """Persist settings via the configuration object."""
         try:
             self._configuration.persist()
         except StateError:
@@ -81,10 +84,10 @@
         """
 
         def registration_fail_wrapper():
-            fail_method(action="Registering client")
+            fail_method(action=_("Registering client failed"))
 
         def registration_succeed_wrapper():
-            succeed_method(action="Registering client")
+            succeed_method(action=_("Registering client was successful"))
 
         registration = RegistrationProxy(
             on_register_notify=notify_method,
@@ -92,10 +95,10 @@
             on_register_succeed=registration_succeed_wrapper,
             on_register_fail=registration_fail_wrapper)
         if self._configuration.management_type == CANONICAL_MANAGED:
-            notify_method("Attempting to register at %s" %
+            notify_method(_("Attempting to register at %s") %
                           self._configuration.hosted_landscape_host)
         else:
-            notify_method("Attempting to register at %s" %
+            notify_method(_("Attempting to register at %s") %
                           self._configuration.local_landscape_host)
         registration.register(self._configuration.get_config_filename())
         registration.exit()
@@ -106,14 +109,14 @@
         """
 
         def disabling_fail_wrapper():
-            fail_method(action="Disabling client")
+            fail_method(action=_("Disabling client failed"))
 
         def disabling_succeed_wrapper():
-            succeed_method(action="Disabling client")
+            succeed_method(action=_("Disabling client was successful"))
 
         registration = RegistrationProxy(
             on_disable_succeed=disabling_succeed_wrapper,
             on_disable_fail=disabling_fail_wrapper)
-        notify_method("Attempting to disable landscape client.")
+        notify_method(_("Attempting to disable landscape client."))
         registration.disable()
         registration.exit()

=== modified file 'landscape/ui/view/configuration.py'
--- landscape/ui/view/configuration.py	2012-03-16 14:57:32 +0000
+++ landscape/ui/view/configuration.py	2012-03-23 14:26:24 +0000
@@ -1,5 +1,7 @@
 import os
 
+from gettext import gettext as _
+
 from gi.repository import GObject, Gtk
 
 from landscape.ui.constants import (
@@ -14,15 +16,10 @@
     """
 
     GLADE_FILE = "landscape-client-settings.glade"
-    NO_SERVICE_TEXT = "None"
-    HOSTED_SERVICE_TEXT = "Landscape - hosted by Canonical"
-    LOCAL_SERVICE_TEXT = "Landscape - dedicated server"
-    REGISTER_BUTTON_TEXT = "Register"
-    DISABLE_BUTTON_TEXT = "Disable"
 
     def __init__(self, controller):
         super(ClientSettingsDialog, self).__init__(
-            title="Management Service",
+            title=_("Management Service"),
             flags=Gtk.DialogFlags.MODAL)
         self.set_default_icon_name("preferences-management-service")
         self.set_resizable(False)
@@ -33,6 +30,26 @@
         # One extra revert to reset after loading data
         self.controller.revert()
 
+    @property
+    def NO_SERVICE_TEXT(self):
+        return _("None")
+
+    @property
+    def HOSTED_SERVICE_TEXT(self):
+        return _("Landscape - hosted by Canonical")
+
+    @property
+    def LOCAL_SERVICE_TEXT(self):
+        return _("Landscape - dedicated server")
+
+    @property
+    def REGISTER_BUTTON_TEXT(self):
+        return _("Register")
+
+    @property
+    def DISABLE_BUTTON_TEXT(self):
+        return _("Disable")
+
     def _set_use_type_combobox_from_controller(self):
         """
         Load the persisted L{management_type} from the controller and set the
@@ -150,6 +167,7 @@
 
     def setup_ui(self):
         self._builder = Gtk.Builder()
+        self._builder.set_translation_domain("landscape-client")
         self._builder.add_from_file(
             os.path.join(
                 os.path.dirname(__file__), "ui", self.GLADE_FILE))

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-03-22 09:11:31 +0000
+++ po/POTFILES.in	2012-03-23 14:26:24 +0000
@@ -1,2 +1,8 @@
 [encoding: UTF-8]
+landscape/ui/controller/app.py
+landscape/ui/controller/configuration.py
+landscape/ui/view/configuration.py
+landscape/ui/view/ui/landscape-client-settings.glade
+applications/landscape-client-settings.desktop.in
+polkit-1/com.canonical.LandscapeClientSettings.policy.in
 scripts/landscape-client-ui-install

=== modified file 'po/fr.po'
--- po/fr.po	2012-03-22 15:11:27 +0000
+++ po/fr.po	2012-03-23 14:26:24 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-22 10:33+0100\n"
-"PO-Revision-Date: 2012-03-22 15:32+0100\n"
+"POT-Creation-Date: 2012-03-23 11:12+0100\n"
+"PO-Revision-Date: 2012-03-23 11:25+0100\n"
 "Last-Translator: Thomas Hervé <[e-mail]>\n"
 "Language-Team: français <>\n"
 "Language: \n"
@@ -18,27 +18,135 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../scripts/landscape-client-ui-install:49
+#: ../landscape/ui/controller/app.py:49
+msgid "Success."
+msgstr "Réussi."
+
+#: ../landscape/ui/controller/app.py:58
+msgid "Failure."
+msgstr "Echoué."
+
+#: ../landscape/ui/controller/app.py:90
+msgid "Authentication failed"
+msgstr "L'authentification a échoué"
+
+#: ../landscape/ui/controller/configuration.py:87
+msgid "Registering client failed"
+msgstr "L'enregistrement du client a échoué"
+
+#: ../landscape/ui/controller/configuration.py:90
+msgid "Registering client was successful"
+msgstr "L'enregistrement du client a réussi"
+
+#: ../landscape/ui/controller/configuration.py:98
+#: ../landscape/ui/controller/configuration.py:101
+#, python-format
+msgid "Attempting to register at %s"
+msgstr "Tentative d'enregistrement sur %s"
+
+#: ../landscape/ui/controller/configuration.py:112
+msgid "Disabling client failed"
+msgstr "Le client n'a pas pu être désactivé"
+
+#: ../landscape/ui/controller/configuration.py:115
+msgid "Disabling client was successful"
+msgstr "Le client a été désactivé avec succès"
+
+#: ../landscape/ui/controller/configuration.py:120
+msgid "Attempting to disable landscape client."
+msgstr "Tentative de désactivation du client Landscape."
+
+#: ../landscape/ui/view/configuration.py:19
+msgid "None"
+msgstr "Aucun"
+
+#: ../landscape/ui/view/configuration.py:20
+msgid "Landscape - hosted by Canonical"
+msgstr "Landscape - hébergé par Canonical"
+
+#: ../landscape/ui/view/configuration.py:21
+msgid "Landscape - dedicated server"
+msgstr "Landscape - serveur dédié"
+
+#: ../landscape/ui/view/configuration.py:22
+msgid "Register"
+msgstr "S'enregistrer"
+
+#: ../landscape/ui/view/configuration.py:23
+msgid "Disable"
+msgstr "Désactiver"
+
+#: ../landscape/ui/view/configuration.py:27
+#: ../applications/landscape-client-settings.desktop.in.h:1
+msgid "Management Service"
+msgstr "Service de gestion"
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:1
+msgid "Account name:"
+msgstr "Nom du compte:"
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:2
+msgid "Don't have an account?"
+msgstr "Vous n'avez pas de compte?"
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:3
+#: ../scripts/landscape-client-ui-install:52
 msgid "Find out more..."
 msgstr "En apprendre plus..."
 
-#: ../scripts/landscape-client-ui-install:52
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:4
+msgid "If you click \"Disable\" the Landscape client on this machine will be disabled.  You can reenable it later by revisiting this dialog."
+msgstr "Si vous cliquez sur \"Désactiver\" le client Landscape sera désactivé sur cette machine. Vous pouvez le réactiver plus tard en rouvrant cette fenêtre de dialogue."
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:5
+msgid "Landscape is a remote administration service from Canonical.  If you allow it, a Landcape server can monitor this computer's performance and send administration commands."
+msgstr "Landscape est un service de gestion à distance de Canonical. Si vous l'autorisez, un serveur Landscape peut surveiller les performance de cette machine et envoyer des commandes administratives."
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:6
+msgid "Landscape server hostname:"
+msgstr "Nom d'hôte du serveur Landscape:"
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:7
+msgid "Management service:"
+msgstr "Service de gestion:"
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:8
+msgid "Password:"
+msgstr "Mot de passe:"
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:9
+msgid "Sign up..."
+msgstr "S'inscrire..."
+
+#: ../applications/landscape-client-settings.desktop.in.h:2
+msgid "Management Service Preferences"
+msgstr "Préférences du service de gestion"
+
+#: ../polkit-1/com.canonical.LandscapeClientSettings.policy.in.h:1
+msgid "Allow the user to read and write Landscape Client settings."
+msgstr "Autorise l'utilisateur à lire et écrire la configuration du client Landscape."
+
+#: ../polkit-1/com.canonical.LandscapeClientSettings.policy.in.h:2
+msgid "System policy prevents you from reading and writing Landscape Client Settings."
+msgstr "Politique système vous empêchant de lire et d'écrire la configuration du client Landscape."
+
+#: ../scripts/landscape-client-ui-install:55
 msgid "Landscape client"
 msgstr "Client Landscape"
 
-#: ../scripts/landscape-client-ui-install:53
+#: ../scripts/landscape-client-ui-install:56
 msgid "Landscape is an easy to use systems management and monitoring service offered by Canonical that helps administrators manage multiple machines efficiently."
 msgstr "Landscape est un système de gestion et de surveillance proposé en tant que service par Canonical, qui aide les administrateurs à gérer plusieurs machine efficacement."
 
-#: ../scripts/landscape-client-ui-install:56
+#: ../scripts/landscape-client-ui-install:59
 msgid "You need to install Landscape client to be able to configure it. Do you want to install it now?"
 msgstr "Il faut installer le client Landscape pour le configurer. Voulez-vous l'installer maintenant?"
 
-#: ../scripts/landscape-client-ui-install:58
+#: ../scripts/landscape-client-ui-install:61
 msgid "Install Landscape client?"
 msgstr "Installer le client Landscape?"
 
-#: ../scripts/landscape-client-ui-install:59
+#: ../scripts/landscape-client-ui-install:62
 msgid "Install"
 msgstr "Installer"
 

=== modified file 'po/landscape-client.pot'
--- po/landscape-client.pot	2012-03-22 15:11:27 +0000
+++ po/landscape-client.pot	2012-03-23 14:26:24 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-22 16:08+0100\n"
+"POT-Creation-Date: 2012-03-23 11:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,10 +17,125 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../landscape/ui/controller/app.py:49
+msgid "Success."
+msgstr ""
+
+#: ../landscape/ui/controller/app.py:58
+msgid "Failure."
+msgstr ""
+
+#: ../landscape/ui/controller/app.py:90
+msgid "Authentication failed"
+msgstr ""
+
+#: ../landscape/ui/controller/configuration.py:87
+msgid "Registering client failed"
+msgstr ""
+
+#: ../landscape/ui/controller/configuration.py:90
+msgid "Registering client was successful"
+msgstr ""
+
+#: ../landscape/ui/controller/configuration.py:98
+#: ../landscape/ui/controller/configuration.py:101
+#, python-format
+msgid "Attempting to register at %s"
+msgstr ""
+
+#: ../landscape/ui/controller/configuration.py:112
+msgid "Disabling client failed"
+msgstr ""
+
+#: ../landscape/ui/controller/configuration.py:115
+msgid "Disabling client was successful"
+msgstr ""
+
+#: ../landscape/ui/controller/configuration.py:120
+msgid "Attempting to disable landscape client."
+msgstr ""
+
+#: ../landscape/ui/view/configuration.py:19
+msgid "None"
+msgstr ""
+
+#: ../landscape/ui/view/configuration.py:20
+msgid "Landscape - hosted by Canonical"
+msgstr ""
+
+#: ../landscape/ui/view/configuration.py:21
+msgid "Landscape - dedicated server"
+msgstr ""
+
+#: ../landscape/ui/view/configuration.py:22
+msgid "Register"
+msgstr ""
+
+#: ../landscape/ui/view/configuration.py:23
+msgid "Disable"
+msgstr ""
+
+#: ../landscape/ui/view/configuration.py:27
+#: ../applications/landscape-client-settings.desktop.in.h:1
+msgid "Management Service"
+msgstr ""
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:1
+msgid "Account name:"
+msgstr ""
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:2
+msgid "Don't have an account?"
+msgstr ""
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:3
 #: ../scripts/landscape-client-ui-install:52
 msgid "Find out more..."
 msgstr ""
 
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:4
+msgid ""
+"If you click \"Disable\" the Landscape client on this machine will be "
+"disabled.  You can reenable it later by revisiting this dialog."
+msgstr ""
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:5
+msgid ""
+"Landscape is a remote administration service from Canonical.  If you allow "
+"it, a Landcape server can monitor this computer's performance and send "
+"administration commands."
+msgstr ""
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:6
+msgid "Landscape server hostname:"
+msgstr ""
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:7
+msgid "Management service:"
+msgstr ""
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:8
+msgid "Password:"
+msgstr ""
+
+#: ../landscape/ui/view/ui/landscape-client-settings.glade.h:9
+msgid "Sign up..."
+msgstr ""
+
+#: ../applications/landscape-client-settings.desktop.in.h:2
+msgid "Management Service Preferences"
+msgstr ""
+
+#: ../polkit-1/com.canonical.LandscapeClientSettings.policy.in.h:1
+msgid "Allow the user to read and write Landscape Client settings."
+msgstr ""
+
+#: ../polkit-1/com.canonical.LandscapeClientSettings.policy.in.h:2
+msgid ""
+"System policy prevents you from reading and writing Landscape Client "
+"Settings."
+msgstr ""
+
 #: ../scripts/landscape-client-ui-install:55
 msgid "Landscape client"
 msgstr ""

=== renamed file 'polkit-1/com.canonical.LandscapeClientSettings.policy' => 'polkit-1/com.canonical.LandscapeClientSettings.policy.in'
--- polkit-1/com.canonical.LandscapeClientSettings.policy	2012-01-19 14:06:45 +0000
+++ polkit-1/com.canonical.LandscapeClientSettings.policy.in	2012-03-23 14:26:24 +0000
@@ -9,8 +9,8 @@
   <icon_name>preferences-management-service</icon_name>
 
   <action id="com.canonical.LandscapeClientSettings.configure">
-    <description>Allow the user to read and write Landscape Client settings.</description>
-    <message>System policy prevents you from reading and writing Landscape Client Settings.</message>
+    <_description>Allow the user to read and write Landscape Client settings.</_description>
+    <_message>System policy prevents you from reading and writing Landscape Client Settings.</_message>
     <defaults>
       <allow_any>auth_admin_keep</allow_any>
       <allow_inactive>auth_admin_keep</allow_inactive>

=== modified file 'scripts/landscape-client-settings-ui'
--- scripts/landscape-client-settings-ui	2012-03-21 14:14:06 +0000
+++ scripts/landscape-client-settings-ui	2012-03-23 14:26:24 +0000
@@ -2,6 +2,8 @@
 import os
 import sys
 
+from gettext import bindtextdomain, textdomain
+
 script_dir = os.path.abspath("scripts")
 if os.path.dirname(os.path.abspath(sys.argv[0])) == script_dir:
     sys.path.insert(0, "./")
@@ -22,6 +24,8 @@
                          "running.\n")
         sys.exit(1)
     else:
+        bindtextdomain("landscape-client", "/usr/share/locale")
+        textdomain("landscape-client")
         app = SettingsApplicationController(args=sys.argv[1:])
         try:
             app.run(None)

=== modified file 'setup.cfg'
--- setup.cfg	2012-03-22 09:11:31 +0000
+++ setup.cfg	2012-03-23 14:26:24 +0000
@@ -1,2 +1,7 @@
+[build]
+i18n=True
+
 [build_i18n]
 domain=landscape-client
+xml_files=[("share/polkit-1/actions/", ["polkit-1/com.canonical.LandscapeClientSettings.policy.in"])]
+desktop_files=[("share/applications", ["applications/landscape-client-settings.desktop.in"])]

=== modified file 'setup.py'
--- setup.py	2012-03-22 15:11:27 +0000
+++ setup.py	2012-03-23 14:26:24 +0000
@@ -36,13 +36,9 @@
           ("/usr/share/dbus-1/system-services/",
            ["dbus-1/com.canonical.LandscapeClientSettings.service",
           "dbus-1/com.canonical.LandscapeClientRegistration.service"]),
-          ("/usr/share/polkit-1/actions",
-           ["polkit-1/com.canonical.LandscapeClientSettings.policy"]),
           ("/etc/dbus-1/system.d/",
            ["dbus-1/com.canonical.LandscapeClientSettings.conf",
             "dbus-1/com.canonical.LandscapeClientRegistration.conf"]),
-          ("/usr/share/applications/",
-           ["applications/landscape-client-settings.desktop"]),
           ("/usr/share/icons/hicolor/scalable/apps/",
            ["icons/preferences-management-service.svg"]),
           ("/usr/share/glib-2.0/schemas/",