← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/i18n.py

(vila) Revise legal option names to be less drastic. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/i18n.py
22
22
 
23
23
"""i18n and l10n support for Bazaar."""
24
24
 
 
25
from __future__ import absolute_import
 
26
 
25
27
import gettext as _gettext
26
28
import os
27
29
import sys
134
136
 
135
137
    :param base: plugins can specify their own local directory
136
138
    """
137
 
    if hasattr(sys, 'frozen'):
 
139
    fs_enc = sys.getfilesystemencoding()
 
140
    if getattr(sys, 'frozen', False):
138
141
        if base is None:
139
 
            base = os.path.dirname(
140
 
                unicode(sys.executable, sys.getfilesystemencoding()))
 
142
            base = os.path.dirname(unicode(sys.executable, fs_enc))
141
143
        return os.path.join(base, u'locale')
142
144
    else:
143
145
        if base is None:
144
 
            base = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
 
146
            base = os.path.dirname(unicode(__file__, fs_enc))
145
147
        dirpath = os.path.realpath(os.path.join(base, u'locale'))
146
148
        if os.path.exists(dirpath):
147
149
            return dirpath
148
 
        else:
149
 
            return '/usr/share/locale'
 
150
    return os.path.join(unicode(sys.prefix, fs_enc), u"share", u"locale")
150
151
 
151
152
 
152
153
def _check_win32_locale():