Remove the support for the langpackdir. Signed-off-by: Simon Schampijer <si...@laptop.org> --- src/sugar/activity/activity.py | 6 ------ src/sugar/activity/i18n.py | 7 ------- 2 files changed, 13 deletions(-)
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py index 34e9729..affe9c9 100644 --- a/src/sugar/activity/activity.py +++ b/src/sugar/activity/activity.py @@ -261,12 +261,6 @@ class Activity(Window, gtk.Container): """ # Stuff that needs to be done early - - locale_path = i18n.get_locale_path(self.get_bundle_id()) - gettext.bindtextdomain(self.get_bundle_id(), locale_path) - gettext.bindtextdomain('sugar-toolkit', sugar.locale_path) - gettext.textdomain(self.get_bundle_id()) - icons_path = os.path.join(get_bundle_path(), 'icons') gtk.icon_theme_get_default().append_search_path(icons_path) diff --git a/src/sugar/activity/i18n.py b/src/sugar/activity/i18n.py index 1ddbd79..8b8e663 100644 --- a/src/sugar/activity/i18n.py +++ b/src/sugar/activity/i18n.py @@ -17,8 +17,6 @@ # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -import gconf - from gettext import gettext import locale import os @@ -135,11 +133,6 @@ def get_locale_path(bundle_id): if 'SUGAR_LOCALEDIR' in os.environ: candidate_dirs[os.environ['SUGAR_LOCALEDIR']] = 2 - gconf_client = gconf.client_get_default() - package_dir = gconf_client.get_string('/desktop/sugar/i18n/langpackdir') - if package_dir is not None and package_dir is not '': - candidate_dirs[package_dir] = 1 - candidate_dirs[os.path.join(sys.prefix, 'share', 'locale')] = 0 for candidate_dir in candidate_dirs.keys(): -- 1.7.10.2 _______________________________________________ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel