Merge lp:~mbp/bzr-explorer/585942-locale-dir into lp:bzr-explorer

Proposed by Alexander Belchenko on 2010-05-27
Status: Merged
Approved by: Alexander Belchenko on 2010-05-27
Approved revision: 469
Merged at revision: 469
Proposed branch: lp:~mbp/bzr-explorer/585942-locale-dir
Merge into: lp:bzr-explorer
Diff against target: 16 lines (+5/-1) 1 file modified
To merge this branch: bzr merge lp:~mbp/bzr-explorer/585942-locale-dir
Reviewer Review Type Date Requested Status
Bazaar Explorer Developers 2010-05-27 Pending
Review via email: mp+26156@code.launchpad.net
To post a comment you must log in.

Preview Diff

1=== modified file 'lib/i18n.py'
2--- lib/i18n.py 2009-06-28 17:11:46 +0000
3+++ lib/i18n.py 2010-05-27 10:42:30 +0000
4@@ -50,7 +50,11 @@
5
6
7 def _get_locale_dir():
8- return os.path.join(os.path.realpath(os.path.dirname(__file__)), '..', 'locale')
9+ localedir = os.path.join(os.path.realpath(os.path.dirname(__file__)), '..', 'locale')
10+ if sys.platform.startswith('linux'):
11+ if not os.access(localedir, os.R_OK | os.X_OK):
12+ localedir = '/usr/share/locale'
13+ return localedir
14
15
16 def _check_win32_locale():

Subscribers

People subscribed via source and target branches