From c2ecde3df3a41b353f48bba0ddfb9058bcfa4831 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Sat, 29 Oct 2011 13:44:45 +0000
Subject: Move i18n setting from sugar-activity into activity class

i18n imports gconf static bindings, can't do it with GConf dynamic
bindings loaded.
---
diff --git a/bin/sugar-activity b/bin/sugar-activity
index 2d09eda..b4f345f 100644
--- a/bin/sugar-activity
+++ b/bin/sugar-activity
@@ -27,7 +27,6 @@ import dbus.glib
 
 import sugar
 from sugar.activity import activityhandle
-from sugar.activity import i18n
 from sugar.bundle.activitybundle import ActivityBundle
 from sugar import logger
 
@@ -99,12 +98,6 @@ def main():
     os.environ['SUGAR_BUNDLE_NAME'] = bundle.get_name()
     os.environ['SUGAR_BUNDLE_VERSION'] = str(bundle.get_activity_version())
 
-    locale_path = i18n.get_locale_path(bundle.get_bundle_id())
-
-    gettext.bindtextdomain(bundle.get_bundle_id(), locale_path)
-    gettext.bindtextdomain('sugar-toolkit', sugar.locale_path)
-    gettext.textdomain(bundle.get_bundle_id())
-
     splitted_module = args[0].rsplit('.', 1)
     module_name = splitted_module[0]
     class_name = splitted_module[1]
--
cgit v0.9.1