From 8eae4eec38de0669623328049ebb873c18c3af1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Mart=C3=ADnez?= <kaeza@users.noreply.github.com>
Date: Fri, 27 Jan 2017 10:18:28 -0300
Subject: [PATCH] Logging fixes.

* Remove use of `rawget`.
* Fix code trying to concat a nil value in some cases.
* Prefix warnings with mod name.
---
 gettext.lua | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/gettext.lua b/gettext.lua
index 62524f5..38d515e 100644
--- a/gettext.lua
+++ b/gettext.lua
@@ -136,7 +136,7 @@ local function detect_languages()
 
 	local v
 
-	v = rawget(_G, "minetest") and minetest.setting_get("language")
+	v = minetest.setting_get("language")
 	if v and v~="" then
 		addlang(v)
 	end
@@ -157,11 +157,7 @@ local function detect_languages()
 end
 
 local function warn(msg)
-	if rawget(_G, "minetest") then
-		minetest.log("warning", msg)
-	else
-		io.stderr:write("WARNING: ", msg, "\n")
-	end
+	minetest.log("warning", "[intllib] "..msg)
 end
 
 -- hax!
@@ -224,7 +220,7 @@ local function load_catalog(filename)
 	local f, data, err
 
 	local function bail(msg)
-		warn(msg..(err and ": ")..(err or ""))
+		warn(msg..(err and ": " or "")..(err or ""))
 		return nil
 	end