From 318439ab274a3f920f0e7a267d07f2613e635e35 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sun, 25 Mar 2007 11:42:26 +0200 Subject: [PATCH] Fix for #1157. Thanks to leejc. --- sugar/activity/bundlebuilder.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/sugar/activity/bundlebuilder.py b/sugar/activity/bundlebuilder.py index 49c93893..c6ae593b 100644 --- a/sugar/activity/bundlebuilder.py +++ b/sugar/activity/bundlebuilder.py @@ -143,6 +143,18 @@ def _get_file_list(manifest): else: return _DefaultFileList() +def _include_mo_in_bundle(bundle_zip): + for langdir in os.listdir('locale'): + if os.path.isdir(os.path.join('locale', langdir)): + for filename in os.listdir(os.path.join('locale', langdir, 'LC_MESSAGES')): + if filename.endswith('.mo'): + arcname = os.path.join(_get_bundle_name() + '.activity', + 'locale', langdir, 'LC_MESSAGES', + filename) + bundle_zip.write( + os.path.join('locale', langdir, 'LC_MESSAGES', filename), + arcname) + def cmd_dist(manifest): cmd_genmo(manifest) file_list = _get_file_list(manifest) @@ -154,16 +166,8 @@ def cmd_dist(manifest): arcname = os.path.join(_get_bundle_name() + '.activity', filename) bundle_zip.write(filename, arcname) - for langdir in os.listdir('locale'): - if os.path.isdir(os.path.join('locale', langdir)): - for filename in os.listdir(os.path.join('locale', langdir, 'LC_MESSAGES')): - if filename.endswith('.mo'): - arcname = os.path.join(_get_bundle_name() + '.activity', - 'locale', langdir, 'LC_MESSAGES', - filename) - bundle_zip.write( - os.path.join('locale', langdir, 'LC_MESSAGES', filename), - arcname) + if os.path.exists('locale'): + _include_mo_in_bundle(bundle_zip) bundle_zip.close()