Merge lp:~ralsina/ubuntuone-control-panel/translate-all-the-dialogs into lp:ubuntuone-control-panel

[Roberto Alsina]

- Enabled Qt translation engine so standard dialogs are translated (LP: #951651).

- Enabled Qt translation engine so standard dialogs are translated (Fixes lp:951651).

To test it, run like this:

python setup.py clean build && U1_DEBUG=True LANG=es_ES.UTF-8 ./bin/ubuntuone-control-panel-qt

Make sure you have language-pack-es and language-pack-gnome-es installed, then click on "Add a new folder".

You should see somthing like this: https://bugs.launchpad.net/ubuntuone-control-panel/+bug/951651/+attachment/2846209/+files/12.png

[lp:~ralsina/ubuntuone-control-panel/translate-all-the-dialogs]

284. By Roberto Alsina on 2012-03-10

test case

[Diego Sarmentero (diegosarmentero)]

Good one!
+1

review: Approve

[Natalia Bidart (nataliabidart)]

Looks good, thanks!

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-03-08 16:40:50 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-03-10 18:41:18 +0000
@@ -65,6 +65,14 @@
 
     args = ['ubuntuone-installer'] + args[1:]
     app = UniqueApplication(args, "ubuntuone-control-panel")
+
+    # Install translator for standard dialogs.
+    locale = unicode(QtCore.QLocale.system().name())
+    translator = QtCore.QTranslator()
+    translator.load("qt_" + locale,
+        QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath))
+    app.installTranslator(translator)
+
     parser = parser_options()
     # Use only the arguments that are not recognized by Qt
     args = parser.parse_args(args=[unicode(x) for x in app.arguments()[1:]])

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-03-08 16:40:50 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-03-10 18:41:18 +0000
@@ -16,12 +16,24 @@
 
 """Tests for the control panel's Qt main."""
 
+from PyQt4 import QtCore
 from twisted.internet.defer import inlineCallbacks
 
 from ubuntuone.controlpanel.gui.qt import main
 from ubuntuone.controlpanel.tests import TestCase
 
 
+class FakeTranslator(object):
+
+    """A fake QTranslator."""
+
+    args = None
+
+    def load(self, *args, **kwargs):
+        """fake load."""
+        self.args = (args, kwargs)
+
+
 class FakeApplication(object):
 
     """A fake application."""
@@ -29,6 +41,7 @@
     def __init__(self):
         self.args = None
         self.style = None
+        self.translator = None
 
     def __call__(self, argv, *args, **kwargs):
         """Fake arg filtering function."""
@@ -41,6 +54,10 @@
     def setStyleSheet(self, *args, **kwargs):
         """Fake setStyleSheet."""
         self.style = (args, kwargs)
+
+    def installTranslator(self, translator):
+        """Fake installTranslator."""
+        self.translator = translator
     # pylint: enable=C0103
 
     def arguments(self):
@@ -90,9 +107,11 @@
     def setUp(self):
         yield super(MainTestCase, self).setUp()
         self.app = FakeApplication()
+        self.translator = FakeTranslator()
         self.start = FakeStart()
         self.patch(main, "UniqueApplication", self.app)
         self.patch(main, "start", self.start)
+        self.patch(QtCore, "QTranslator", lambda: self.translator)
 
     def test_wm_class(self):
         """Test that we set the 1st argument, used for WM_CLASS, correctly."""
@@ -126,3 +145,12 @@
         """Ensure the --switch-to option is parsed and passed correctly."""
         main.main(["foobar", "--switch-to", "folders"])
         self.assertEqual(self.start.window.tabname, "folders")
+
+    def test_translator(self):
+        """Ensure the Qt translator is loaded."""
+        main.main(["foo"])
+        locale = unicode(QtCore.QLocale.system().name())
+        self.assertEqual(self.app.translator, self.translator)
+        self.assertEqual(self.translator.args, (("qt_" + locale,
+            QtCore.QLibraryInfo.location(
+                QtCore.QLibraryInfo.TranslationsPath)), {}))