From ffc40970bc4f106446194863772935627a8a9b91 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Thu, 25 Sep 2008 18:19:05 +0000
Subject: Set the correct locale path for system activities

---
diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py
index 90f55cd..02caa84 100644
--- a/src/sugar/activity/activityfactory.py
+++ b/src/sugar/activity/activityfactory.py
@@ -116,6 +116,9 @@ def get_environment(activity):
     environ['PATH'] = bin_path + ':' + environ['PATH']
     #environ['RAINBOW_STRACE_LOG'] = '1'
 
+    if activity.path.startswith(env.get_user_activities_path()):
+        environ['SUGAR_LOCALEDIR'] = os.path.join(activity.path, 'locale')
+
     if activity.bundle_id in [ 'org.laptop.WebActivity', 
                                'org.laptop.GmailActivity',
                                'org.laptop.WikiBrowseActivity'
diff --git a/src/sugar/activity/main.py b/src/sugar/activity/main.py
index 2175ff3..6ece927 100644
--- a/src/sugar/activity/main.py
+++ b/src/sugar/activity/main.py
@@ -89,8 +89,11 @@ def main():
 
     gtk.icon_theme_get_default().append_search_path(bundle.get_icons_path())
 
-    gettext.bindtextdomain(bundle.get_bundle_id(),
-                           bundle.get_locale_path())
+    locale_path = None
+    if 'SUGAR_LOCALEDIR' in os.environ:
+        locale_path = os.environ['SUGAR_LOCALEDIR']
+
+    gettext.bindtextdomain(bundle.get_bundle_id(), locale_path)
     gettext.textdomain(bundle.get_bundle_id())
 
     splitted_module = args[0].rsplit('.', 1)
--
cgit v0.9.1