[gcalctool/gnome-2-32] Fix locale initialization



commit 491fa51eca606139816d388c5432285191bf81c6
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Oct 15 10:42:50 2010 +1100

    Fix locale initialization

 NEWS                |    1 +
 src/gcalctool.c     |    1 +
 src/math-equation.c |    2 --
 3 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index da1886d..1eed122 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Overview of changes in gcalctool 5.32.1
     * Fix crash when pasting with empty clipboard (Bug #629381)
     * Fix broken thousands separators code (Bug #628908)
     * Stop '*'+backspace+'*' being converted into '^'
+    * Fix locale initialization
 
 Overview of changes in gcalctool 5.32.0
 
diff --git a/src/gcalctool.c b/src/gcalctool.c
index 65d6a91..0ac85ec 100644
--- a/src/gcalctool.c
+++ b/src/gcalctool.c
@@ -213,6 +213,7 @@ main(int argc, char **argv)
 
     g_type_init();
 
+    setlocale(LC_ALL, "");
     bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
     textdomain(GETTEXT_PACKAGE);
diff --git a/src/math-equation.c b/src/math-equation.c
index 45cea52..bc1a6c4 100644
--- a/src/math-equation.c
+++ b/src/math-equation.c
@@ -1804,8 +1804,6 @@ math_equation_init(MathEquation *equation)
     }
     g_strfreev(digits);
 
-    setlocale(LC_NUMERIC, "");
-
     radix = nl_langinfo(RADIXCHAR);
     equation->priv->radix = radix ? g_utf8_get_char(g_locale_to_utf8(radix, -1, NULL, NULL, NULL)) : '.';
     tsep = nl_langinfo(THOUSEP);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]