Merge lp:~rafalcieslak256/ubuntu-accomplishments-daemon/gettext-paths-fix into lp:ubuntu-accomplishments-daemon

Proposed by Rafał Cieślak
Status: Merged
Merge reported by: Jono Bacon
Merged at revision: not available
Proposed branch: lp:~rafalcieslak256/ubuntu-accomplishments-daemon/gettext-paths-fix
Merge into: lp:ubuntu-accomplishments-daemon
Diff against target: 27 lines (+6/-2)
2 files modified
accomplishments/daemon/api.py (+4/-1)
accomplishments/util/__init__.py (+2/-1)
To merge this branch: bzr merge lp:~rafalcieslak256/ubuntu-accomplishments-daemon/gettext-paths-fix
Reviewer Review Type Date Requested Status
Jono Bacon Pending
Review via email: mp+102941@code.launchpad.net

Description of the change

Fixes 983356 in daemon. Uses gettext.bindtextdomain(...) to specify the path to locale files.

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
1=== modified file 'accomplishments/daemon/api.py'
2--- accomplishments/daemon/api.py 2012-04-15 16:12:53 +0000
3+++ accomplishments/daemon/api.py 2012-04-20 21:26:19 +0000
4@@ -42,7 +42,10 @@
5 from accomplishments import exceptions
6 from accomplishments.daemon import dbusapi
7 from accomplishments.util import get_data_file, SubprocessReturnCodeProtocol
8-from accomplishments.util.paths import media_dir, module_dir1, module_dir2, installed
9+from accomplishments.util.paths import media_dir, module_dir1, module_dir2, installed, locale_dir
10+
11+gettext.bindtextdomain('accomplishments-daemon',locale_dir)
12+gettext.textdomain('accomplishments-daemon')
13
14 os.environ["PYTHONPATH"] = "$PYTHONPATH:."
15 # The directories with accomplishment.* modules, that are being used by scripts,
16
17=== modified file 'accomplishments/util/__init__.py'
18--- accomplishments/util/__init__.py 2012-04-15 16:16:49 +0000
19+++ accomplishments/util/__init__.py 2012-04-20 21:26:19 +0000
20@@ -14,7 +14,8 @@
21 from accomplishments import config
22 from accomplishments import exceptions
23
24-
25+from accomplishments.util.paths import locale_dir
26+gettext.bindtextdomain('accomplishments-daemon',locale_dir)
27 gettext.textdomain('accomplishments-daemon')
28
29

Subscribers

People subscribed via source and target branches