Merge lp:~schwuk/checkbox/bug-347038 into lp:checkbox

[David Murphy]

[David Murphy (schwuk)]

Contains Gabor Kelemen's patches (with some tweaks) for bug 347038 and an updated translation template.

[Marc Tardif (cr3)]

A few problems which have been fixed in lp:~cr3/checkbox/bug-347038:

- The _ function was not being imported
- Exceptions were being internationalized, which is not necessary
- Signal strings were only being partially internationalized
- Added comment for hack around calling gettext.textdomain

The above branch will be submitted for approval.

review: Disapprove

Unmerged revisions

=== modified file 'backend/com.ubuntu.checkbox.policy.in'
--- backend/com.ubuntu.checkbox.policy.in	2009-02-19 04:34:51 +0000
+++ backend/com.ubuntu.checkbox.policy.in	2009-03-23 14:50:21 +0000
@@ -15,8 +15,8 @@
   <icon_name>checkbox</icon_name>
 
   <action id="com.ubuntu.checkbox.test">
-    <description>Run system tests</description>
-    <message>System policy prevents running system tests</message>
+    <_description>Run system tests</_description>
+    <_message>System policy prevents running system tests</_message>
     <defaults>
       <allow_any>yes</allow_any>
       <allow_inactive>yes</allow_inactive>
@@ -25,8 +25,8 @@
   </action>
 
   <action id="com.ubuntu.checkbox.info">
-    <description>Get system information</description>
-    <message>System policy prevents getting system information</message>
+    <_description>Get system information</_description>
+    <_message>System policy prevents getting system information</_message>
     <defaults>
       <allow_any>yes</allow_any>
       <allow_inactive>yes</allow_inactive>

=== modified file 'checkbox/test.py'
--- checkbox/test.py	2009-02-19 04:40:40 +0000
+++ checkbox/test.py	2009-03-23 15:37:34 +0000
@@ -80,7 +80,7 @@
 
     def _set_status(self, status):
         if status not in ALL_STATUS:
-            raise Exception, "Invalid status: %s" % status
+            raise Exception, _("Invalid status: %s") % status
 
         self._status = status
 
@@ -110,18 +110,18 @@
                     data = result.stderr
             elif exit_status == 127:
                 status = SKIP
-                data = "Command failed, skipping."
+                data = _("Command failed, skipping.")
             else:
                 status = FAIL
                 data = result.stderr
         elif result.if_signaled:
             status = SKIP
             term_signal = result.term_signal
-            data = "Received terminate signal %s: %s" % \
+            data = _("Received terminate signal %s: %s") % \
                 (signal_to_name(term_signal),
                  signal_to_description(term_signal))
         else:
-            raise Exception, "Command not terminated: %s" \
+            raise Exception, _("Command not terminated: %s") \
                 % self.get_command()
 
         duration = result.duration

=== modified file 'plugins/user_interface.py'
--- plugins/user_interface.py	2009-02-19 04:40:40 +0000
+++ plugins/user_interface.py	2009-03-23 14:42:22 +0000
@@ -21,14 +21,18 @@
 from checkbox.properties import Path, String
 from checkbox.plugin import Plugin
 
+import gettext
+from gettext import gettext as _
 
 class UserInterface(Plugin):
 
     interface_module = String()
     interface_class = String()
 
+    gettext.textdomain("checkbox")
+
     # Title of the user interface
-    title = String(default="System Testing")
+    title = String(default=_("System Testing"))
 
     # Path where data files are stored.
     data_path = Path(required=False)

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2008-12-23 22:35:09 +0000
+++ po/POTFILES.in	2009-03-23 15:37:34 +0000
@@ -1,17 +1,21 @@
 [encoding: UTF-8]
+backend/com.ubuntu.checkbox.policy.in
 gtk/checkbox-gtk.glade
 gtk/checkbox-gtk.desktop.in
 [type: gettext/rfc822deb] suites/manual.txt.in
 checkbox/application.py
+checkbox/test.py
 checkbox_cli/cli_interface.py
 checkbox_gtk/gtk_interface.py
 checkbox/user_interface.py
 plugins/shell_prompt.py
 plugins/category_prompt.py
 plugins/exchange_prompt.py
+plugins/final_prompt.py
 plugins/gather_prompt.py
 plugins/intro_prompt.py
 plugins/launchpad_exchange.py
+plugins/lock_prompt.py
 plugins/manual_prompt.py
 plugins/report_prompt.py
 plugins/user_interface.py

=== modified file 'po/checkbox.pot'
--- po/checkbox.pot	2009-03-17 19:23:33 +0000
+++ po/checkbox.pot	2009-03-23 15:37:34 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-17 14:23-0400\n"
+"POT-Creation-Date: 2009-03-23 15:09+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,6 +16,22 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../backend/com.ubuntu.checkbox.policy.in.h:1
+msgid "Get system information"
+msgstr ""
+
+#: ../backend/com.ubuntu.checkbox.policy.in.h:2
+msgid "Run system tests"
+msgstr ""
+
+#: ../backend/com.ubuntu.checkbox.policy.in.h:3
+msgid "System policy prevents getting system information"
+msgstr ""
+
+#: ../backend/com.ubuntu.checkbox.policy.in.h:4
+msgid "System policy prevents running system tests"
+msgstr ""
+
 #: ../gtk/checkbox-gtk.glade.h:1 ../checkbox_cli/cli_interface.py:234
 msgid "Further information:"
 msgstr ""
@@ -24,8 +40,10 @@
 msgid "Ne_xt"
 msgstr ""
 
+#. Title of the user interface
 #: ../gtk/checkbox-gtk.glade.h:3 ../gtk/checkbox-gtk.desktop.in.h:1
 #: ../checkbox_cli/cli_interface.py:184 ../checkbox_cli/cli_interface.py:224
+#: ../plugins/user_interface.py:35
 msgid "System Testing"
 msgstr ""
 
@@ -168,6 +186,25 @@
 msgid "Missing configuration file as argument.\n"
 msgstr ""
 
+#: ../checkbox/test.py:83
+#, python-format
+msgid "Invalid status: %s"
+msgstr ""
+
+#: ../checkbox/test.py:113
+msgid "Command failed, skipping."
+msgstr ""
+
+#: ../checkbox/test.py:120
+#, python-format
+msgid "Received terminate signal %s: %s"
+msgstr ""
+
+#: ../checkbox/test.py:124
+#, python-format
+msgid "Command not terminated: %s"
+msgstr ""
+
 #: ../checkbox_cli/cli_interface.py:114
 msgid "Press any key to continue..."
 msgstr ""
@@ -266,6 +303,10 @@
 msgid "Exchanging information with the server..."
 msgstr ""
 
+#: ../plugins/final_prompt.py:31
+msgid "Successfully sent information!"
+msgstr ""
+
 #: ../plugins/gather_prompt.py:34
 msgid "Gathering information from your system..."
 msgstr ""
@@ -309,6 +350,14 @@
 msgid "Information not posted to Launchpad."
 msgstr ""
 
+#: ../plugins/lock_prompt.py:51
+msgid "Another checkbox is running"
+msgstr ""
+
+#: ../plugins/lock_prompt.py:52
+msgid "There is another checkbox running. Please close it first."
+msgstr ""
+
 #: ../plugins/report_prompt.py:34
 msgid "Building report..."
 msgstr ""