Merge lp:~kelemeng/ubuntu-release-upgrader/bug1072828 into lp:ubuntu-release-upgrader

[Gabor Kelemen]

[Brian Murray (brian-murray)]

Thanks for working on this. My testing indicates that it is only necessary to move the gettext.textdomain() call from outside the if loop to resolve this issue, so I'll go ahead and do that. Feel free to test that though and let me know if it it misses something.

review: Disapprove

[Gabor Kelemen (kelemeng)]

Yeah, because in Python there is a clever default value for localedir:
http://hg.python.org/cpython/file/2.7/Lib/gettext.py

Unmerged revisions

2605. By Gabor Kelemen on 2012-12-30

Fix the localization by taking the bindtextdomain/textdomain
calls out of 'if' branch. LP: 1072828

=== modified file 'DistUpgrade/DistUpgradeMain.py'
--- DistUpgrade/DistUpgradeMain.py	2012-10-09 16:35:12 +0000
+++ DistUpgrade/DistUpgradeMain.py	2012-12-30 22:17:21 +0000
@@ -209,10 +209,12 @@
     from .DistUpgradeVersion import VERSION
     logging.info("release-upgrader version '%s' started" % VERSION)
     # ensure that DistUpgradeView translations are displayed
+    localedir = "/usr/share/locale/"
     if options.datadir is None or options.datadir == '.':
         localedir = os.path.join(os.getcwd(), "mo")
-        gettext.bindtextdomain("ubuntu-release-upgrader", localedir)
-        gettext.textdomain("ubuntu-release-upgrader")
+
+    gettext.bindtextdomain("ubuntu-release-upgrader", localedir)
+    gettext.textdomain("ubuntu-release-upgrader")
 
     # create view and app objects
     view = setup_view(options, config, logdir)