Move `setlocale` from Lua to C++.

diff --git a/builtin/init.lua b/builtin/init.lua
index e94f3213a41fe679dc50c8a3deaa9482d1349106..f76174be7d5c727fe85b5b20a9a83a584e39646d 100644 (file)
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -21,7 +21,6 @@ if core.print then
        core.print = nil -- don't pollute our namespace
 end
 math.randomseed(os.time())
-os.setlocale("C", "numeric")
 minetest = core
 
 -- Load other files
@@ -47,7 +46,6 @@ elseif INIT == "mainmenu" then
 elseif INIT == "async" then
        dofile(asyncpath .. "init.lua")
 elseif INIT == "client" then
-       os.setlocale = nil
        dofile(clientpath .. "init.lua")
 else
        error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT)))

diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp
index 59107b3ff7d23cbf42dd03ee0246b8839e658921..f451156bdac1e1aaafef11dcdda2d0b785c5a1fd 100644 (file)
--- a/src/script/cpp_api/s_base.cpp
+++ b/src/script/cpp_api/s_base.cpp
@@ -118,6 +118,9 @@ ScriptApiBase::ScriptApiBase(ScriptingType type):
 
        lua_pushstring(m_luastack, porting::getPlatformName());
        lua_setglobal(m_luastack, "PLATFORM");
+
+       // Make sure Lua uses the right locale
+       setlocale(LC_NUMERIC, "C");
 }
 
 ScriptApiBase::~ScriptApiBase()

diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp
index 690a3b47fa7da9a35dafca3557090f366b7e85ae..6c50218d31ef71d3113e7ec80c3a505714f5dbc9 100644 (file)
--- a/src/script/cpp_api/s_security.cpp
+++ b/src/script/cpp_api/s_security.cpp
@@ -261,8 +261,7 @@ void ScriptApiSecurity::initializeSecurityClient()
                "clock",
                "date",
                "difftime",
-               "time",
-               "setlocale",
+               "time"
        };
        static const char *debug_whitelist[] = {
                "getinfo",