From f32caef40c6eb0a1a634906244f3389c77d2f5ab Mon Sep 17 00:00:00 2001 From: Sebastian Hoogen Date: Tue, 9 Dec 2014 17:24:34 +0100 Subject: [PATCH] respect locale environment except for LC_NUMERIC fixes #1852 --- src/Main/MainCmd.cpp | 6 +----- src/Main/MainGui.cpp | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Main/MainCmd.cpp b/src/Main/MainCmd.cpp index b35683f7a..b70d5259f 100644 --- a/src/Main/MainCmd.cpp +++ b/src/Main/MainCmd.cpp @@ -67,12 +67,8 @@ const char sBanner[] = "(c) Juergen Riegel, Werner Mayer, Yorik van Havre 2001-2 int main( int argc, char ** argv ) { // Make sure that we use '.' as decimal point -#if defined(FC_OS_LINUX) - putenv("LANG=C"); - putenv("LC_ALL=C"); -#else + setlocale(LC_ALL, ""); setlocale(LC_NUMERIC, "C"); -#endif // Name and Version of the Application App::Application::Config()["ExeName"] = "FreeCAD"; diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp index 558480ee2..26d96d11c 100644 --- a/src/Main/MainGui.cpp +++ b/src/Main/MainGui.cpp @@ -191,13 +191,11 @@ int main( int argc, char ** argv ) QFile::setDecodingFunction(myDecoderFunc); // Make sure that we use '.' as decimal point. See also // http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559846 - putenv("LANG=C"); - putenv("LC_ALL=C"); + putenv("LC_NUMERIC=C"); putenv("PYTHONPATH="); #elif defined(FC_OS_MACOSX) (void)QLocale::system(); - putenv("LANG=C"); - putenv("LC_ALL=C"); + putenv("LC_NUMERIC=C"); putenv("PYTHONPATH="); #else setlocale(LC_NUMERIC, "C");