respect locale environment except for LC_NUMERIC

fixes #1852
FreeCAD · Jan 24, 2015 · f32caef · f32caef
1 parent be38772
commit f32caef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git 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
@@ -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");