summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2006-08-15 20:23:12 +0000
committerFederico Mena Quintero <federico@src.gnome.org>2006-08-15 20:23:12 +0000
commit806b7fb7b4305faaf845f067d1b30611c2f2b558 (patch)
treebc739df0e3864b272a6e79a37bd187a45d611e5b
parent79924a157bffa7304abb7f62edf04496104d8763 (diff)
downloadnautilus-806b7fb7b4305faaf845f067d1b30611c2f2b558.tar.gz
Call setlocale() before we try to obtain any translations. Fixes bug
2006-08-15 Federico Mena Quintero <federico@novell.com> * src/nautilus-main.c (main): Call setlocale() before we try to obtain any translations. Fixes bug #342147. Patch by Stanislav Brabec <sbrabec@suse.cz>.
-rw-r--r--ChangeLog6
-rw-r--r--src/nautilus-main.c5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index afdd3ba93..3ec8a4ec1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-15 Federico Mena Quintero <federico@novell.com>
+
+ * src/nautilus-main.c (main): Call setlocale() before we try to
+ obtain any translations. Fixes bug #342147. Patch by Stanislav
+ Brabec <sbrabec@suse.cz>.
+
2006-08-15 Kjartan Maraas <kmaraas@gnome.org>
* configure.in: Fix intltool req.
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 94ce7da2e..f58e9e70d 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -53,6 +53,9 @@
#include <libnautilus-private/nautilus-global-preferences.h>
#include <libnautilus-private/nautilus-lib-self-check-functions.h>
#include <libxml/parser.h>
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -224,6 +227,8 @@ main (int argc, char *argv[])
{ NULL }
};
+ setlocale (LC_ALL, "");
+
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger ();
}