Merge branch 'master' into route_prog_rework

1 files changed, 14 insertions, 7 deletions

diff --git a/advtrains_luaautomation/pcnaming.lua b/advtrains_luaautomation/pcnaming.lua
index 71f4d9a..0089ae7 100644
--- a/advtrains_luaautomation/pcnaming.lua
+++ b/advtrains_luaautomation/pcnaming.lua
@@ -2,6 +2,8 @@
 --a.k.a Passive component naming
 --Allows to assign names to passive components, so they can be called like:
 --setstate("iamasignal", "green")
+local S = atltrans
+
 atlatc.pcnaming={name_map={}}
 function atlatc.pcnaming.load(stuff)
 	if type(stuff)=="table" then
@@ -22,8 +24,11 @@ function atlatc.pcnaming.resolve_pos(pos, func_name)
 	error("Invalid position supplied to " .. (func_name or "???")..": " .. dump(pos))
 end
 
+
+local pcrename = {}
+
 minetest.register_craftitem("advtrains_luaautomation:pcnaming",{
-	description = attrans("Passive Component Naming Tool\n\nRight-click to name a passive component."),
+	description = S("Passive Component Naming Tool\n\nRight-click to name a passive component."),
 	groups = {cracky=1}, -- key=name, value=rating; rating=1..3.
 	inventory_image = "atlatc_pcnaming.png",
 	wield_image = "atlatc_pcnaming.png",
@@ -34,7 +39,7 @@ minetest.register_craftitem("advtrains_luaautomation:pcnaming",{
 			return
 		end
 		if not minetest.check_player_privs(pname, {atlatc=true}) then
-			minetest.chat_send_player(pname, "Missing privilege: atlatc")
+			minetest.chat_send_player(pname, S("You are not allowed to name LuaATC passive components without the @1 privilege.", "atlatc"))
 			return
 		end
 		if pointed_thing.type=="node" then
@@ -43,6 +48,7 @@ minetest.register_craftitem("advtrains_luaautomation:pcnaming",{
 				minetest.record_protection_violation(pos, pname)
 				return
 			end
+
 			local node = advtrains.ndb.get_node(pos)
 			local ndef = minetest.registered_nodes[node.name]
 			if node.name and (
@@ -57,16 +63,17 @@ minetest.register_craftitem("advtrains_luaautomation:pcnaming",{
 						pn=name
 					end
 				end
-				minetest.show_formspec(pname, "atlatc_naming_"..minetest.pos_to_string(pos), "field[pn;Set name of component (empty to clear);"..minetest.formspec_escape(pn).."]")
+				pcrename[pname] = pos
+				minetest.show_formspec(pname, "atlatc_naming", "field[pn;"..S("Set name of component (empty to clear)")..";"..minetest.formspec_escape(pn).."]")
 			end
 		end
 	end,
 })
 minetest.register_on_player_receive_fields(function(player, formname, fields)
-	local pts=string.match(formname, "^atlatc_naming_(.+)")
-	if pts then
-		local pos=minetest.string_to_pos(pts)
-		if fields.pn then
+	if formname == "atlatc_naming" then
+		local pname = player:get_player_name()
+		local pos=pcrename[pname]
+		if fields.pn and pos then
 			--first remove all occurences
 			for name, npos in pairs(atlatc.pcnaming.name_map) do
 				if vector.equals(npos, pos) then