magicicada gui

Merge lp:~facundo/magicicada-gui/fix-gettext into lp:magicicada-gui

  1. fix-gettext
  2. Merge into trunk
Proposed by Facundo Batista
Status: Merged
Merge reported by: Natalia Bidart
Merged at revision: not available
Proposed branch: lp:~facundo/magicicada-gui/fix-gettext
Merge into: lp:magicicada-gui
Diff against target: 28 lines (+7/-6)
1 file modified
magicicada/gui/gtk/main.py (+7/-6)
To merge this branch: bzr merge lp:~facundo/magicicada-gui/fix-gettext
Reviewer Review Type Date Requested Status
chicharreros Pending
Review via email: mp+136186@code.launchpad.net

Commit message

Install gettext before importing other modules, as it's used there.

Description of the change

Install gettext before importing other modules, as it's used there.

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 'magicicada/gui/gtk/main.py'
2--- magicicada/gui/gtk/main.py 2012-08-21 23:25:19 +0000
3+++ magicicada/gui/gtk/main.py 2012-11-26 14:33:24 +0000
4@@ -33,6 +33,13 @@
5 LAUNCHPAD_AVAILABLE = False
6 # pylint: enable=F0401
7
8+# install gettext before other modules
9+INSTALL_KWARGS = {}
10+if sys.version_info < (3,):
11+ INSTALL_KWARGS["unicode"] = True
12+
13+gettext.install('magicicada', **INSTALL_KWARGS)
14+
15 from magicicada import syncdaemon
16 from magicicada.helpers import log, NO_OP
17 from magicicada.gui.gtk.helpers import (
18@@ -43,12 +50,6 @@
19 from magicicada.gui.gtk.operations import Operations
20 from magicicada.gui.gtk.status import Status
21
22-
23-INSTALL_KWARGS = {}
24-if sys.version_info < (3,):
25- INSTALL_KWARGS["unicode"] = True
26-
27-gettext.install('ubuntu-sso-client', **INSTALL_KWARGS)
28 logger = logging.getLogger('magicicada.gui.gtk')
29
30

Subscribers

People subscribed via source and target branches