Merge lp:~nataliabidart/ubuntuone-control-panel/unicode-gettext into lp:ubuntuone-control-panel

[Natalia Bidart]

- Make gettext return unicode so we can format strings
  with unicode variables (LP: #937809).

[Roman Yepishev (rye)]

Tested with spanish an russian locales - works properly.

review: Approve (fieldtest)

[Manuel de la Peña (mandel)]

+1 for this.

review: Approve

=== modified file 'bin/ubuntuone-control-panel-gtk'
--- bin/ubuntuone-control-panel-gtk	2012-01-18 14:09:16 +0000
+++ bin/ubuntuone-control-panel-gtk	2012-02-22 12:15:22 +0000
@@ -21,15 +21,10 @@
 
 # Invalid name "ubuntuone-control-panel-gtk", pylint: disable=C0103
 
-import gettext
 import sys
 
 from optparse import OptionParser
 
-from ubuntuone.controlpanel import TRANSLATION_DOMAIN
-
-gettext.textdomain(TRANSLATION_DOMAIN)
-# import the GUI after the translation domain has been set
 from ubuntuone.controlpanel.gui.gtk import main
 
 

=== modified file 'bin/ubuntuone-control-panel-qt'
--- bin/ubuntuone-control-panel-qt	2012-01-18 14:09:16 +0000
+++ bin/ubuntuone-control-panel-qt	2012-02-22 12:15:22 +0000
@@ -1,8 +1,5 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-
-# Authors: Natalia B Bidart <[e-mail]>
-#          Eric Casteleijn <[e-mail]>
 #
 # Copyright 2010 Canonical Ltd.
 #
@@ -17,19 +14,15 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 """Execute the graphical interface for the Ubuntu One control panel."""
 
 # Invalid name "ubuntuone-control-panel-qt", pylint: disable=C0103
 
-import gettext
 import sys
 
 from optparse import OptionParser
 
-from ubuntuone.controlpanel import TRANSLATION_DOMAIN
-
-gettext.textdomain(TRANSLATION_DOMAIN)
-# import the GUI after the translation domain has been set
 from ubuntuone.controlpanel.gui.qt import main
 
 

=== modified file 'setup.py'
--- setup.py	2012-02-10 17:10:56 +0000
+++ setup.py	2012-02-22 12:15:22 +0000
@@ -160,7 +160,6 @@
 
     def run(self):
         """Execute the command."""
-        self._wrapuic()
         basepath = os.path.join('data',  'qt')
         # TODO: build the resource files so that we can include them
         #self.build_rc(os.path.join(basepath, 'icons_rc.py'),
@@ -175,40 +174,6 @@
 
         build_extra.build_extra.run(self)
 
-    # pylint: disable=E1002
-    _wrappeduic = False
-
-    @classmethod
-    def _wrapuic(cls):
-        """Wrap uic to use gettext's _() in place of tr()"""
-        if cls._wrappeduic:
-            return
-
-        from PyQt4.uic.Compiler import compiler, qtproxies, indenter
-
-        # pylint: disable=C0103
-        class _UICompiler(compiler.UICompiler):
-            """Speciallized compiler for qt .ui files."""
-            def createToplevelWidget(self, classname, widgetname):
-                o = indenter.getIndenter()
-                o.level = 0
-                o.write('from gettext import gettext as _')
-                return super(_UICompiler, self).createToplevelWidget(classname,
-                    widgetname)
-        compiler.UICompiler = _UICompiler
-
-        class _i18n_string(qtproxies.i18n_string):
-            """Provide a translated text."""
-
-            def __str__(self):
-                return "_('%s')" % self.string.encode('string-escape')
-
-        qtproxies.i18n_string = _i18n_string
-
-        cls._wrappeduic = True
-        # pylint: enable=C0103
-    # pylint: enable=E1002
-
 
 class ControlPanelClean(DistUtilsExtra.auto.clean_build_tree):
     """Class to clean up after the build."""

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-02-17 16:03:00 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-02-22 12:15:22 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+#
 # Copyright 2011-2012 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
@@ -18,10 +18,11 @@
 
 import gettext
 
+from ubuntuone.controlpanel import TRANSLATION_DOMAIN
 from ubuntuone.controlpanel.backend import UBUNTUONE_LINK
 
 
-_ = gettext.gettext
+gettext.install(TRANSLATION_DOMAIN, unicode=True)
 
 
 ERROR_COLOR = u'red'
@@ -72,6 +73,8 @@
 RESET_PASSWORD_LINK = EDIT_PROFILE_LINK + u'+forgot_password'
 TWITTER_LINK = u'http://twitter.com/ubuntuone/'
 
+# Undefined variable '_', pylint: disable=E0602
+
 ALWAYS_SUBSCRIBED = _('Always in sync')
 CONNECT_BUTTON_LABEL = _('Connect to Ubuntu One')
 CONTACTS = _('Thunderbird plug-in')
@@ -168,6 +171,8 @@
 VALUE_ERROR = _('Value could not be retrieved.')
 UNKNOWN_ERROR = _('Unknown error')
 
+# pylint: enable=E0602
+
 
 def humanize(int_bytes):
     """Return a human readable representation of 'int_bytes'.