1 |
blino |
21273 |
From a48ad6f0fd61584b39960c3c16cbc959a011abb8 Mon Sep 17 00:00:00 2001 |
2 |
|
|
From: Frederic Crozat <fcrozat@mandriva.com> |
3 |
|
|
Date: Wed, 12 May 2010 17:52:28 +0200 |
4 |
|
|
Subject: [PATCH] fix for non-UTF8 locale |
5 |
|
|
|
6 |
|
|
--- |
7 |
|
|
src/Applet/Applet.cpp | 1 + |
8 |
|
|
src/Daemon/Daemon.cpp | 1 + |
9 |
|
|
src/Gui/abrt_utils.py | 2 +- |
10 |
|
|
3 files changed, 3 insertions(+), 1 deletions(-) |
11 |
|
|
|
12 |
|
|
diff --git a/src/Applet/Applet.cpp b/src/Applet/Applet.cpp |
13 |
|
|
index ccd6f39..281c931 100644 |
14 |
|
|
--- a/src/Applet/Applet.cpp |
15 |
|
|
+++ b/src/Applet/Applet.cpp |
16 |
|
|
@@ -195,6 +195,7 @@ int main(int argc, char** argv) |
17 |
|
|
#if ENABLE_NLS |
18 |
|
|
bindtextdomain(PACKAGE, LOCALEDIR); |
19 |
|
|
textdomain(PACKAGE); |
20 |
|
|
+ bind_textdomain_codeset(PACKAGE, "UTF-8"); |
21 |
|
|
#endif |
22 |
|
|
|
23 |
|
|
/* Need to be thread safe */ |
24 |
|
|
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp |
25 |
|
|
index b75af52..e4d1bad 100644 |
26 |
|
|
--- a/src/Daemon/Daemon.cpp |
27 |
|
|
+++ b/src/Daemon/Daemon.cpp |
28 |
|
|
@@ -700,6 +700,7 @@ int main(int argc, char** argv) |
29 |
|
|
#if ENABLE_NLS |
30 |
|
|
bindtextdomain(PACKAGE, LOCALEDIR); |
31 |
|
|
textdomain(PACKAGE); |
32 |
|
|
+ bind_textdomain_codeset(PACKAGE,"UTF-8"); |
33 |
|
|
#endif |
34 |
|
|
|
35 |
|
|
if (getuid() != 0) |
36 |
|
|
diff --git a/src/Gui/abrt_utils.py b/src/Gui/abrt_utils.py |
37 |
|
|
index 701d477..e6ec901 100644 |
38 |
|
|
--- a/src/Gui/abrt_utils.py |
39 |
|
|
+++ b/src/Gui/abrt_utils.py |
40 |
|
|
@@ -20,8 +20,8 @@ def init_logging(progname, v): |
41 |
|
|
import os |
42 |
|
|
os.environ['LC_ALL'] = 'C' |
43 |
|
|
locale.setlocale(locale.LC_ALL, "") |
44 |
|
|
- gettext.bind_textdomain_codeset(GETTEXT_PROGNAME, locale.nl_langinfo(locale.CODESET)) |
45 |
|
|
gettext.bindtextdomain(GETTEXT_PROGNAME, '/usr/share/locale') |
46 |
|
|
+ gettext.bind_textdomain_codeset(GETTEXT_PROGNAME, "UTF-8") |
47 |
|
|
gtk.glade.bindtextdomain(GETTEXT_PROGNAME, '/usr/share/locale') |
48 |
|
|
gtk.glade.textdomain(GETTEXT_PROGNAME) |
49 |
|
|
gettext.textdomain(GETTEXT_PROGNAME) |
50 |
|
|
-- |
51 |
|
|
1.7.1 |
52 |
|
|
|