Merge lp:~gz/bzr/sys_prefix_share_locale_940704 into lp:bzr/2.5

[Martin Packman]

Use sys.prefix not /usr when looking for installed .mo files

Change the fallback location to look for bzr translation files to be relative to the python installation, rather than hardcoded. For the common case, this is the same, but for user-installs and on windows, sys.prefix is something other than '/usr'. This means installing the translations separate from the bzrlib folder should now work in those situations.

[Vincent Ladeuil (vila)]

Since the locale_dir depends on the system, it's likely we'll fail on some platform sooner or later.

Can you add a config option so we know we can always work around any weird setup ?

Otherwise, just land.

review: Needs Fixing

[Martin Packman (gz)]

A config option at this level probably isn't useful, but the absolute fallback location may still want changing for some platforms indeed.

[Martin Packman (gz)]

sent to pqm by email

[Vincent Ladeuil (vila)]

> A config option at this level probably isn't useful, but the absolute fallback location may still want changing for some platforms indeed.

Having a config option *gives* a way to change the absolute fallback *manually* without the need to tweak any code, that's my point ;)

=== modified file 'bzrlib/i18n.py'
--- bzrlib/i18n.py	2011-12-19 13:23:58 +0000
+++ bzrlib/i18n.py	2012-03-29 18:00:29 +0000
@@ -136,19 +136,18 @@
 
     :param base: plugins can specify their own local directory
     """
-    if hasattr(sys, 'frozen'):
+    fs_enc = sys.getfilesystemencoding()
+    if getattr(sys, 'frozen', False):
         if base is None:
-            base = os.path.dirname(
-                unicode(sys.executable, sys.getfilesystemencoding()))
+            base = os.path.dirname(unicode(sys.executable, fs_enc))
         return os.path.join(base, u'locale')
     else:
         if base is None:
-            base = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
+            base = os.path.dirname(unicode(__file__, fs_enc))
         dirpath = os.path.realpath(os.path.join(base, u'locale'))
         if os.path.exists(dirpath):
             return dirpath
-        else:
-            return '/usr/share/locale'
+    return os.path.join(unicode(sys.prefix, fs_enc), u"share", u"locale")
 
 
 def _check_win32_locale():