Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

cobble.lua

@@ -1,3 +1,6 @@
+-- Load support for translation.
+local S = minetest.get_translator("more_chests")
+
 local function has_locked_chest_privilege(meta, player)
 	if player:get_player_name() ~= meta:get_string("owner") then
 		return false
@@ -6,7 +9,7 @@ local function has_locked_chest_privilege(meta, player)
 end
 
 minetest.register_node("more_chests:cobble", {
-	description = "Cobble Chest",
+	description = S("Cobble Chest"),
 	tiles = {"default_cobble.png", "default_cobble.png", "default_cobble.png",
 		"default_cobble.png", "default_cobble.png", "cobblechest_front.png"},
 	paramtype2 = "facedir",
@@ -110,4 +113,3 @@ minetest.register_craft({
 		{'default:wood','default:cobble','default:wood'}
 	}
 })
-

depends.txt

@@ -1 +0,0 @@
-default

description.txt

@@ -1 +0,0 @@
-Adds several chests that behave differently, and can be used to donate items, share items, hide chests, make secret chests, and more.

dropbox.lua

@@ -1,3 +1,7 @@
+-- Load support for translation.
+local S = minetest.get_translator("more_chests")
+local DS = minetest.get_translator("default")
+
 local function has_locked_chest_privilege(meta, player)
 	if player:get_player_name() ~= meta:get_string("owner") then
 		return false
@@ -6,7 +10,7 @@ local function has_locked_chest_privilege(meta, player)
 end
 
 minetest.register_node("more_chests:dropbox", {
-	description = "Dropbox",
+	description = S("Dropbox"),
 	tiles = {"dropbox_top.png", "dropbox_top.png", "dropbox_side.png",
 		"dropbox_side.png", "dropbox_side.png", "dropbox_front.png"},
 	paramtype2 = "facedir",
@@ -31,8 +35,9 @@ minetest.register_node("more_chests:dropbox", {
 	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", "Dropbox (owned by "..
-				meta:get_string("owner")..")")
+		meta:set_string("infotext", S("@1 (owned by @2)",
+				S("Dropbox"),
+				meta:get_string("owner")))
 	end,
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
@@ -47,7 +52,7 @@ minetest.register_node("more_chests:dropbox", {
 				"listring[current_name;main]" ..
 				"listring[current_player;main]" ..
 				default.get_hotbar_bg(0,4.85))
-		meta:set_string("infotext", "Chest")
+		meta:set_string("infotext", DS("Chest"))
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8*4)
 	end,
@@ -106,4 +111,3 @@ minetest.register_craft({
 		{'default:wood','default:wood','default:wood'}
 	}
 })
-

locale/more_chests.fr.tr

@@ -0,0 +1,11 @@
+# textdomain: more_chests
+Cobble Chest=Coffre en pierre taillée
+Dropbox=Boîte de dépôt
+Secret Chest=Coffre secret
+Shared Chest=Coffre partagé
+Wifi Chest=Coffre wifi
+
+
+@1 (owned by @2)=@1 (appartient à @2)
+Shared with (separate names with spaces)=Partagé avec (séparez les noms avec des espaces)
+submit=valider

locale/more_chests.hu.tr

@@ -0,0 +1,12 @@
+# textdomain: more_chests
+
+# Translation by An0n3m0us
+
+Secret Chest=Titkos Láda
+Wifi Chest=Wifi Láda
+Cobble Chest=Zúzottkő Láda
+Shared Chest=Közös Láda
+
+@1 (owned by @2)=@1 (@2 tulajdonában van)
+Shared with (separate names with spaces)=Megosztva (válassza el a neveket szóközökkel)
+submit=előterjeszt

locale/template.txt

@@ -0,0 +1,6 @@
+# textdomain: more_chests
+Secret Chest=
+Wifi Chest=
+Cobble Chest=
+Shared Chest=
+Dropbox=

mod.conf

@@ -1 +1,3 @@
 name = more_chests
+description = Adds several chests that behave differently, and can be used to donate items, share items, hide chests, make secret chests, and more.
+depends = default

secret.lua

@@ -1,3 +1,6 @@
+-- Load support for translation.
+local S = minetest.get_translator("more_chests")
+
 local function has_locked_chest_privilege(meta, player)
 	if player:get_player_name() ~= meta:get_string("owner") then
 		return false
@@ -20,7 +23,7 @@ local closed = "size[2,1]"..
 	"button[0,0;2,1;open;open]"
 
 minetest.register_node("more_chests:secret", {
-	description = "Secret Chest",
+	description = S("Secret Chest"),
 	tiles = {"secret_top.png", "secret_top.png", "secret_side.png",
 		"secret_side.png", "secret_side.png", "secret_front.png"},
 	paramtype2 = "facedir",
@@ -45,13 +48,14 @@ minetest.register_node("more_chests:secret", {
 	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", "Secret Chest (owned by "..
-				meta:get_string("owner")..")")
+		meta:set_string("infotext", S("@1 (owned by @2)",
+				S("Secret Chest"),
+				meta:get_string("owner")))
 	end,
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec", open)
-		meta:set_string("infotext", "Secret Chest")
+		meta:set_string("infotext", S("Secret Chest"))
 		meta:set_string("owner", "")
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8*4)
@@ -126,4 +130,3 @@ minetest.register_craft({
 		{'default:wood','default:wood','default:wood'}
 	}
 })
-

shared.lua

@@ -1,3 +1,6 @@
+-- Load support for translation.
+local S = minetest.get_translator("more_chests")
+
 local function has_locked_chest_privilege(meta, player)
 	local name = player:get_player_name()
 	local shared = " "..meta:get_string("shared").." "
@@ -19,15 +22,15 @@ local function get_formspec(string)
 		"list[current_name;main;0,0.3;8,4;]"..
 		"list[current_player;main;0,4.85;8,1;]" ..
 		"list[current_player;main;0,6;8,3;8]" ..
-		"field[.25,9.5;6,1;shared;Shared with (separate names with spaces):;"..string.."]"..
-		"button[6,9.2;2,1;submit;submit]" ..
+		"field[.25,9.5;8,1;shared;"..S("Shared with (separate names with spaces)")..":;"..string.."]"..
+		"button[6,9.2;2,1;submit;"..S("submit").."]" ..
 		"listring[current_name;main]" ..
 		"listring[current_player;main]" ..
 		default.get_hotbar_bg(0,4.85)
 end
 
 minetest.register_node("more_chests:shared", {
-	description = "Shared Chest",
+	description = S("Shared Chest"),
 	tiles = {"shared_top.png", "shared_top.png", "shared_side.png",
 		"shared_side.png", "shared_side.png", "shared_front.png"},
 	paramtype2 = "facedir",
@@ -52,13 +55,14 @@ minetest.register_node("more_chests:shared", {
 	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", "Shared Chest (owned by "..
-				meta:get_string("owner")..")")
+		meta:set_string("infotext", S("@1 (owned by @2)",
+				S("Shared Chest"),
+				meta:get_string("owner")))
 	end,
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec", get_formspec(""))
-		meta:set_string("infotext", "Shared Chest")
+		meta:set_string("infotext", S("Shared Chest"))
 		meta:set_string("owner", "")
 		local inv = meta:get_inventory()
 		inv:set_size("main", 8*4)
@@ -132,4 +136,3 @@ minetest.register_craft({
 		{'default:wood','default:wood','default:wood'}
 	}
 })
-

wifi.lua

@@ -1,5 +1,8 @@
+-- Load support for translation.
+local S = minetest.get_translator("more_chests")
+
 minetest.register_node("more_chests:wifi", {
-	description = "Wifi Chest",
+	description = S("Wifi Chest"),
 	tiles = {"wifi_top.png", "wifi_top.png", "wifi_side.png",
 		"wifi_side.png", "wifi_side.png", "wifi_front.png"},
 	paramtype2 = "facedir",
@@ -20,7 +23,7 @@ minetest.register_node("more_chests:wifi", {
 				"listring[current_player;main]" ..
 				default.get_hotbar_bg(0,4.85))
 
-		meta:set_string("infotext", "Wifi Chest")
+		meta:set_string("infotext", S("Wifi Chest"))
 	end,
 	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
 		minetest.log("action", player:get_player_name()..
@@ -49,4 +52,3 @@ minetest.register_on_joinplayer(function(player)
 	local inv = player:get_inventory()
 	inv:set_size("more_chests:wifi", 8*4)
 end)
-