From cd65ed093032afe0e32a71b587d9f119dafe3954 Mon Sep 17 00:00:00 2001
From: Calinou <calinou@opmbx.org>
Date: Sat, 27 Dec 2014 20:30:19 +0100
Subject: [PATCH] Big cleanup. Fix intllib support.

---
 LICENSE.txt      |  5 +++--
 README.txt       |  2 +-
 circular_saw.lua |  3 ++-
 init.lua         | 22 ++++++++++++----------
 nodes.lua        |  2 +-
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 726257d..76c1791 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,7 @@
-+---- zlib/libpng license ----+
+zlib license
+============
 
-Copyright (c) 2013-2014 Calinou and contributors
+Copyright (c) 2011-2014 Calinou and contributors
 
 This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
 
diff --git a/README.txt b/README.txt
index aa99eda..ac2654f 100644
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,5 @@
 More Blocks
-==========
+===========
 
 More Blocks for Minetest (http://minetest.net), a free and open source infinite
 world block sandbox game.
diff --git a/circular_saw.lua b/circular_saw.lua
index 2af5972..361eee5 100644
--- a/circular_saw.lua
+++ b/circular_saw.lua
@@ -1,4 +1,5 @@
-local S = moreblocks.gettext
+local S = moreblocks.intllib
+
 circular_saw = {}
 
 circular_saw.known_stairs = setmetatable({}, {
diff --git a/init.lua b/init.lua
index 8180251..7e3b4d9 100644
--- a/init.lua
+++ b/init.lua
@@ -1,19 +1,22 @@
 --[[
--- More Blocks (moreblocks) by Calinou
--- Licensed under the zlib/ license for code and CC BY-SA 3.0 for textures, see LICENSE.txt for info.
+======================================================================
+** More Blocks **
+By Calinou, with the help of ShadowNinja and VanessaE.
+
+Copyright (c) 2011-2014 Calinou and contributors.
+Licensed under the zlib license. See LICENSE.txt for more information.
+======================================================================
 --]]
 
 moreblocks = {}
 
--- Load translation library if intllib is installed
-
-local S -- Load translation library if intllib is installed:
-if intllib then
-	S = intllib.Getter(minetest.get_current_modname())
+local S
+if minetest.get_modpath("intllib") then
+	S = intllib.Getter()
 else
 	S = function(s) return s end
 end
-moreblocks.gettext = S
+moreblocks.intllib = S
 
 local modpath = minetest.get_modpath("moreblocks")
 
@@ -26,6 +29,5 @@ dofile(modpath .. "/crafting.lua")
 dofile(modpath .. "/aliases.lua")
 
 if minetest.setting_getbool("log_mods") then
-	print(S("[moreblocks] loaded."))
+	minetest.log("action", S("[moreblocks] loaded."))
 end
-
diff --git a/nodes.lua b/nodes.lua
index 04159fd..ad411be 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -1,4 +1,4 @@
-local S = moreblocks.gettext
+local S = moreblocks.intllib
 
 local sound_wood = default.node_sound_wood_defaults()
 local sound_stone = default.node_sound_stone_defaults()