From 0729e342f17baab6775a23de6591294ca6dc1cee Mon Sep 17 00:00:00 2001 From: David Paleino Date: Mon, 16 Apr 2012 22:44:15 +0200 Subject: [PATCH] =?UTF-8?q?Better=20fix=20for=20the=20curses=20UTF-8=20bug?= =?UTF-8?q?,=20thanks=20to=20Konrad=20Sch=C3=B6bel!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- curses/wicd-curses.py | 5 +---- wicd/translations.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py index 71b5d3c..4d8b35e 100755 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -76,13 +76,10 @@ CURSES_REV=wpath.curses_revision # Fix strings in wicd-curses from wicd.translations import language -from wicd.translations import _ as orig_ +from wicd.translations import _ for i in language.keys(): language[i] = language[i].decode('utf8') -def _(s): - return orig_(s).decode('utf8') - ######################################## ##### SUPPORT CLASSES ######################################## diff --git a/wicd/translations.py b/wicd/translations.py index ee84ab8..c560e01 100644 --- a/wicd/translations.py +++ b/wicd/translations.py @@ -52,7 +52,7 @@ def get_gettext(): langs += ["en_US"] lang = gettext.translation('wicd', local_path, languages=langs, fallback=True) - _ = lang.gettext + _ = lang.ugettext return _ _ = get_gettext()