Merge branch 'master' of https://github.com/minetest-mods/currency

Also removed 50 MG note, since it doesn't make much sense on my server.

1 files changed, 19 insertions, 23 deletions

diff --git a/safe.lua b/safe.lua
index 794e23a..b5c3c38 100644
--- a/safe.lua
+++ b/safe.lua
@@ -1,9 +1,15 @@
+-- internationalization boilerplate

+local MP = minetest.get_modpath(minetest.get_current_modname())

+local S, NS = dofile(MP.."/intllib.lua")

+

 function default.get_safe_formspec(pos)

 	local spos = pos.x .. "," .. pos.y .. "," ..pos.z

 	local formspec =

 		"size[8,9]"..

 		"list[nodemeta:".. spos .. ";main;1,1;6,2;]"..

-		"list[current_player;main;0,5;8,4;]"

+		"list[current_player;main;0,5;8,4;]"..

+		"listring[nodemeta:".. spos .. ";main]"..

+		"listring[current_player;main]"

 	return formspec

 end

 

@@ -22,12 +28,12 @@ local function has_safe_privilege(meta, player)
 end

 

 minetest.register_node("currency:safe", {

-        description = "Safe",

+	description = S("Safe"),

 	inventory_image = "safe_front.png",

 	paramtype = "light",

 	paramtype2 = "facedir",

 	tiles = {"safe_side.png",

-	                "safe_side.png",

+	        "safe_side.png",

 			"safe_side.png",

 			"safe_side.png",

 			"safe_side.png",

@@ -37,8 +43,7 @@ minetest.register_node("currency:safe", {
 	after_place_node = function(pos, placer)

 		local meta = minetest.get_meta(pos)

 		meta:set_string("owner", placer:get_player_name() or "")

-		meta:set_string("infotext", "Safe (owned by "..

-				meta:get_string("owner")..")")

+		meta:set_string("infotext", S("Safe (owned by @1)", meta:get_string("owner")))

 	end,

 	on_construct = function(pos)

 		local meta = minetest.get_meta(pos)

@@ -55,10 +60,8 @@ minetest.register_node("currency:safe", {
 	allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)

 		local meta = minetest.get_meta(pos)

 		if not has_safe_privilege(meta, player) then

-			minetest.log("action", player:get_player_name()..

-					" tried to access a safe belonging to "..

-					meta:get_string("owner").." at "..

-					minetest.pos_to_string(pos))

+			minetest.log("action", S("@1 tried to access a safe belonging to @2 at @3",

+				player:get_player_name(), meta:get_string("owner"),	minetest.pos_to_string(pos)))

 			return 0

 		end

 		return count

@@ -66,10 +69,8 @@ minetest.register_node("currency:safe", {
     allow_metadata_inventory_put = function(pos, listname, index, stack, player)

 		local meta = minetest.get_meta(pos)

 		if not has_safe_privilege(meta, player) then

-			minetest.log("action", player:get_player_name()..

-					" tried to access a safe belonging to "..

-					meta:get_string("owner").." at "..

-					minetest.pos_to_string(pos))

+			minetest.log("action", S("@1 tried to access a safe belonging to @2 at @3",

+				player:get_player_name(), meta:get_string("owner"), minetest.pos_to_string(pos)))

 			return 0

 		end

 		return stack:get_count()

@@ -77,25 +78,20 @@ minetest.register_node("currency:safe", {
     allow_metadata_inventory_take = function(pos, listname, index, stack, player)

 		local meta = minetest.get_meta(pos)

 		if not has_safe_privilege(meta, player) then

-			minetest.log("action", player:get_player_name()..

-					" tried to access a safe belonging to "..

-					meta:get_string("owner").." at "..

-					minetest.pos_to_string(pos))

+			minetest.log("action", S("@1 tried to access a safe belonging to @2 at @3",

+				player:get_player_name(), meta:get_string("owner"), minetest.pos_to_string(pos)))

 			return 0

 		end

 		return stack:get_count()

 	end,

 	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)

-		minetest.log("action", player:get_player_name()..

-				" moves stuff in safe at "..minetest.pos_to_string(pos))

+		minetest.log("action", S("@1 moves stuff in safe at @2", player:get_player_name(), minetest.pos_to_string(pos)))

 	end,

     on_metadata_inventory_put = function(pos, listname, index, stack, player)

-		minetest.log("action", player:get_player_name()..

-				" moves stuff to safe at "..minetest.pos_to_string(pos))

+		minetest.log("action", S("@1 moves stuff to safe at @2", player:get_player_name(), minetest.pos_to_string(pos)))

 	end,

     on_metadata_inventory_take = function(pos, listname, index, stack, player)

-		minetest.log("action", player:get_player_name()..

-				" takes stuff from safe at "..minetest.pos_to_string(pos))

+		minetest.log("action", S("@1 takes stuff from safe at @2", player:get_player_name(), minetest.pos_to_string(pos)))

 	end,

 	on_rightclick = function(pos, node, clicker)

 		local meta = minetest.get_meta(pos)