Move setlocale from Lua to C++.

minetest · Feb 8, 2018 · 1e94a7f · 1e94a7f
1 parent 0e4c467
commit 1e94a7f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -261,8 +261,7 @@ void ScriptApiSecurity::initializeSecurityClient()
 		"clock",
 		"date",
 		"difftime",
-		"time",
-		"setlocale",
+		"time"
 	};
 	static const char *debug_whitelist[] = {
 		"getinfo",