Merge lp:~mikemc/ubuntuone-control-panel/use-translations-1074116 into lp:ubuntuone-control-panel

[Mike McCracken]

- Use new SSO API to get platform-appropriate translation function. (LP: 1074116)

- Use new SSO API to get platform-appropriate translation function. (LP: 1074116)

See notes on https://code.launchpad.net/~mikemc/ubuntu-sso-client/cross-platform-translations-1074116/+merge/139536 for howto test.

[Michał Karnicki (karni)]

review: Approve

[Brian Curtin (brian.curtin)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mikemc/ubuntuone-control-panel/use-translations-1074116 into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
 ...

=== modified file 'ubuntuone/controlpanel/__init__.py'
--- ubuntuone/controlpanel/__init__.py	2011-09-06 17:21:56 +0000
+++ ubuntuone/controlpanel/__init__.py	2012-12-12 19:05:28 +0000
@@ -30,4 +30,3 @@
 DBUS_PREFERENCES_IFACE = "com.ubuntuone.controlpanel.Preferences"
 
 WEBSERVICE_BASE_URL = u"https://one.ubuntu.com/api/"
-TRANSLATION_DOMAIN = 'ubuntuone-control-panel'

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-11-02 13:10:20 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-12-12 19:05:28 +0000
@@ -16,23 +16,21 @@
 
 """The control panel UI for Ubuntu One."""
 
-import gettext
-import sys
+import os
 
 # pylint: disable=W0611
 from ubuntuone.clientdefs import APP_NAME
 # pylint: enable=W0611
 
-from ubuntuone.controlpanel import TRANSLATION_DOMAIN
+from ubuntu_sso.utils.translation import get_gettext
+
 from ubuntuone.controlpanel.backend import UBUNTUONE_LINK
 
-
-TRANSLATION = gettext.translation(TRANSLATION_DOMAIN, fallback=True)
-if sys.version_info < (3,):
-    _ = TRANSLATION.ugettext
-else:
-    _ = TRANSLATION.gettext
-
+source_path = os.path.join(os.path.dirname(__file__),
+                           os.path.pardir, os.path.pardir,
+                           os.path.pardir, 'build', 'mo')
+_ = get_gettext('ubuntuone-control-panel',
+                fallback_path=os.path.abspath(source_path))
 
 ERROR_COLOR = u'red'
 KILOBYTES = 1024