diff options
| author | Santiago Collazo <scollazo@activitycentral.com> | 2013-03-09 11:40:11 (GMT) |
|---|---|---|
| committer | Santiago Collazo <scollazo@activitycentral.com> | 2013-03-09 11:40:11 (GMT) |
| commit | 609d1e191b755a5d81a60bfca5eb760ae5e442d0 (patch) | |
| tree | d65dc3aa35fb691696d4d44d58bd4e9be0c370a5 | |
| parent | 4040df1e03f746abc7d67562d6acf9925fc10bc2 (diff) | |
| parent | a0195f9433033719fd66a4d9ce88ef7f7ff98e1e (diff) | |
Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel
| -rw-r--r-- | bin/sugar-activity | 7 | ||||
| -rw-r--r-- | src/sugar3/activity/i18n.py | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/bin/sugar-activity b/bin/sugar-activity index abaa091..7cec4c4 100644 --- a/bin/sugar-activity +++ b/bin/sugar-activity @@ -107,9 +107,10 @@ def main(): # must be done early, some activities set translations globally, SL #3654 locale_path = i18n.get_locale_path(bundle.get_bundle_id()) - gettext.bindtextdomain(bundle.get_bundle_id(), locale_path) - gettext.bindtextdomain('sugar-toolkit', sugar3.locale_path) - gettext.textdomain(bundle.get_bundle_id()) + if locale_path: + gettext.bindtextdomain(bundle.get_bundle_id(), locale_path) + gettext.bindtextdomain('sugar-toolkit', sugar3.locale_path) + gettext.textdomain(bundle.get_bundle_id()) splitted_module = args[0].rsplit('.', 1) module_name = splitted_module[0] diff --git a/src/sugar3/activity/i18n.py b/src/sugar3/activity/i18n.py index 8b8e663..fe0d968 100644 --- a/src/sugar3/activity/i18n.py +++ b/src/sugar3/activity/i18n.py @@ -119,7 +119,8 @@ def get_locale_path(bundle_id): @type bundle_id: string @param bundle_id: The bundle id of the activity in question @rtype: string - @return: the preferred locale path + @return: the preferred locale path or None in the + case of an error """ # Note: We pre-assign weights to the directories so that if no translations @@ -135,10 +136,14 @@ def get_locale_path(bundle_id): candidate_dirs[os.path.join(sys.prefix, 'share', 'locale')] = 0 + default_locale = locale.getdefaultlocale()[0] + if not default_locale: + return None + for candidate_dir in candidate_dirs.keys(): if os.path.exists(candidate_dir): full_path = os.path.join(candidate_dir, \ - locale.getdefaultlocale()[0], 'LC_MESSAGES', \ + default_locale, 'LC_MESSAGES', \ bundle_id + '.mo') if os.path.exists(full_path): try: |