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

Proposed by Alexander Belchenko
Status: Merged
Approved by: Alexander Belchenko
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
lib/i18n.py (+5/-1)
To merge this branch: bzr merge lp:~mbp/bzr-explorer/585942-locale-dir
Reviewer Review Type Date Requested Status
Bazaar Explorer Developers Pending
Review via email: mp+26156@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/i18n.py'
--- lib/i18n.py 2009-06-28 17:11:46 +0000
+++ lib/i18n.py 2010-05-27 10:42:30 +0000
@@ -50,7 +50,11 @@
5050
5151
52def _get_locale_dir():52def _get_locale_dir():
53 return os.path.join(os.path.realpath(os.path.dirname(__file__)), '..', 'locale')53 localedir = os.path.join(os.path.realpath(os.path.dirname(__file__)), '..', 'locale')
54 if sys.platform.startswith('linux'):
55 if not os.access(localedir, os.R_OK | os.X_OK):
56 localedir = '/usr/share/locale'
57 return localedir
5458
5559
56def _check_win32_locale():60def _check_win32_locale():

Subscribers

People subscribed via source and target branches