Use own translator for remaining mods

4 files changed, 34 insertions, 27 deletions

diff --git a/advtrains_interlocking/init.lua b/advtrains_interlocking/init.lua
index a22abf3..c30a22f 100644
--- a/advtrains_interlocking/init.lua
+++ b/advtrains_interlocking/init.lua
@@ -6,7 +6,7 @@ advtrains.interlocking = {}
 -- Initialize internationalization (using ywang's poconvert)
 advtrains.poconvert.from_flat("advtrains_interlocking")
 -- ask engine for translator instance, this will load the translation files
-advtrains.interlocking.translate = core.get_translator("advtrains")
+advtrains.interlocking.translate = core.get_translator("advtrains_interlocking")
 
 -- Get current translator
 local S = advtrains.interlocking.translate
diff --git a/advtrains_signals_japan/init.lua b/advtrains_signals_japan/init.lua
index 728a91f..914a139 100644
--- a/advtrains_signals_japan/init.lua
+++ b/advtrains_signals_japan/init.lua
@@ -260,7 +260,8 @@ do
 	end
 end
 
-local S = attrans
+-- ask engine for translator instance, this will load the translation files
+local S = core.get_translator("advtrains_signals_japan")
 
 minetest.register_node("advtrains_signals_japan:pole_0", {
 	description = S("Japanese signal pole"),
@@ -398,7 +399,7 @@ for _, rtab in ipairs {
 		local lightcount = siginfo.lightcount
 		for asp, texture in pairs(siginfo.textures) do
 			minetest.register_node("advtrains_signals_japan:"..sigtype.."_"..asp.."_"..rot, {
-				description = attrans(string.format("Japanese%s signal (type %s)", siginfo.isdst and " repeating" or "", siginfo.desc)),
+				description = S(string.format("Japanese%s signal (type %s)", siginfo.isdst and " repeating" or "", siginfo.desc)),
 				drawtype = "mesh",
 				mesh = string.format("advtrains_signals_japan_%d_%s.obj", lightcount, rot),
 				tiles = {pole_texture, signal_face_texture, texture},
diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua
index 97d5e44..3b4bebb 100644
--- a/advtrains_signals_ks/init.lua
+++ b/advtrains_signals_ks/init.lua
@@ -1,6 +1,9 @@
 -- Ks signals
 -- Can display main aspects (no Zs) + Sht
 
+-- ask engine for translator instance, this will load the translation files
+local S = core.get_translator("advtrains_signals_ks")
+
 -- Note that the group value of advtrains_signal is 2, which means "step 2 of signal capabilities"
 -- advtrains_signal=1 is meant for signals that do not implement set_aspect.
 
@@ -86,38 +89,38 @@ end
 local mainaspects_main = {
 	{
 		name = "proceed",
-		description = "Proceed",
+		description = S("Proceed"),
 		zs3 = "off"
 	},
 	{
 		name = "shunt",
-		description = "Shunt",
+		description = S("Shunt"),
 		zs3 = "off",
 		shunt = true,
 	},
 	{
 		name = "proceed_16",
-		description = "Proceed (speed 16)",
+		description = S("Proceed (speed 16)"),
 		zs3 = "16",
 	},
 	{
 		name = "proceed_12",
-		description = "Proceed (speed 12)",
+		description = S("Proceed (speed 12)"),
 		zs3 = "12",
 	},
 	{
 		name = "proceed_8",
-		description = "Proceed (speed 8)",
+		description = S("Proceed (speed 8)"),
 		zs3 = "8",
 	},
 	{
 		name = "proceed_6",
-		description = "Proceed (speed 6)",
+		description = S("Proceed (speed 6)"),
 		zs3 = "6",
 	},
 	{
 		name = "proceed_4",
-		description = "Proceed (speed 4)",
+		description = S("Proceed (speed 4)"),
 		zs3 = "4",
 	},
 }
@@ -151,7 +154,7 @@ end
 local mainaspects_dst = {
 	{
 		name = "expectclear",
-		description = "Expect Clear",
+		description = S("Expect Clear"),
 	},
 }
 
@@ -173,7 +176,7 @@ end
 local mainaspects_ra = {
 	{
 		name = "shunt",
-		description = "Shunt",
+		description = S("Shunt"),
 		shunt = true,
 	},
 }
@@ -226,7 +229,7 @@ for _, rtab in ipairs({
 			}
 		end
 		minetest.register_node("advtrains_signals_ks:hs_"..typ.."_"..rot, {
-			description = "Ks Main Signal",
+			description = S("Ks Main Signal"),
 			drawtype = "mesh",
 			mesh = "advtrains_signals_ks_main_smr"..rot..".obj",
 			tiles = {"advtrains_signals_ks_mast.png", "advtrains_signals_ks_head.png", "advtrains_signals_ks_head.png", tile},
@@ -298,7 +301,7 @@ for _, rtab in ipairs({
 			}
 		end
 		minetest.register_node("advtrains_signals_ks:vs_"..typ.."_"..rot, {
-			description = "Ks Distant Signal",
+			description = S("Ks Distant Signal"),
 			drawtype = "mesh",
 			mesh = "advtrains_signals_ks_distant_smr"..rot..".obj",
 			tiles = {"advtrains_signals_ks_mast.png", "advtrains_signals_ks_head.png", "advtrains_signals_ks_head.png", tile},
@@ -350,7 +353,7 @@ for _, rtab in ipairs({
 			afunc = function() return prts.asp end
 		end
 		minetest.register_node("advtrains_signals_ks:ra_"..typ.."_"..rot, {
-			description = "Ks Shunting Signal",
+			description = S("Ks Shunting Signal"),
 			drawtype = "mesh",
 			mesh = "advtrains_signals_ks_sht_smr"..rot..".obj",
 			tiles = {"advtrains_signals_ks_mast.png", "advtrains_signals_ks_head.png", "advtrains_signals_ks_head.png", "advtrains_signals_ks_ltm_"..typ..".png"},
@@ -465,7 +468,7 @@ for _, rtab in ipairs({
 		if typ == "e" then
 			tile2 = "advtrains_signals_ks_sign_zs10.png"
 		end
-		register_sign("sign", typ, prts.n, "Permanent local speed restriction sign", "sign"..mesh, tile2, "8", "advtrains_signals_ks_sign_8.png^[invert:rgb", prts.asp)
+		register_sign("sign", typ, prts.n, S("Permanent local speed restriction sign"), "sign"..mesh, tile2, "8", "advtrains_signals_ks_sign_8.png^[invert:rgb", prts.asp)
 	end
 
 	for typ, prts in pairs {
@@ -478,7 +481,7 @@ for _, rtab in ipairs({
 	} do
 		local tile2 = "advtrains_signals_ks_sign_lf7.png^(advtrains_signals_ks_sign_"..typ..".png^[makealpha:255,255,255)^[multiply:orange"
 		local inv = "advtrains_signals_ks_sign_lf7.png^(advtrains_signals_ks_sign_8.png^[makealpha:255,255,255)^[multiply:orange"
-		register_sign("sign_lf", typ, prts.n, "Temporary local speed restriction sign", "sign", tile2, "8", inv, {main = prts.main, shunt = true, type = "temp"})
+		register_sign("sign_lf", typ, prts.n, S("Temporary local speed restriction sign"), "sign", tile2, "8", inv, {main = prts.main, shunt = true, type = "temp"})
 	end
 
 	for typ, prts in pairs {
@@ -491,7 +494,7 @@ for _, rtab in ipairs({
 	} do
 		local tile2 = "advtrains_signals_ks_sign_lf7.png^(advtrains_signals_ks_sign_"..typ..".png^[makealpha:255,255,255)"
 		local inv = "advtrains_signals_ks_sign_lf7.png^(advtrains_signals_ks_sign_8.png^[makealpha:255,255,255)"
-		register_sign("sign_lf7", typ, prts.n, "Line speed restriction sign", "sign", tile2, "8", inv, {main = prts.main, shunt = true, type = "line"})
+		register_sign("sign_lf7", typ, prts.n, S("Line speed restriction sign"), "sign", tile2, "8", inv, {main = prts.main, shunt = true, type = "line"})
 	end
 	
 	-- Geschwindigkeits(vor)anzeiger für Ks-Signale
@@ -525,7 +528,7 @@ for _, rtab in ipairs({
 
 		-- Zs 3
 		local t = table.copy(def)
-		t.description = "Ks speed limit indicator"
+		t.description = S("Ks speed limit indicator")
 		t.mesh = "advtrains_signals_ks_zs_top_smr"..rot..".obj"
 		t.drop = "advtrains_signals_ks:zs3_off_0"
 		t.selection_box.fixed[1][5] = 0
@@ -538,7 +541,7 @@ for _, rtab in ipairs({
 
 		-- Zs 3v
 		local t = table.copy(def)
-		t.description = "Ks distant speed limit indicator"
+		t.description = S("Ks distant speed limit indicator")
 		t.mesh = "advtrains_signals_ks_zs_bottom_smr"..rot..".obj"
 		t.drop = "advtrains_signals_ks:zs3v_off_0"
 		t.tiles[3] = t.tiles[3] .. "^[multiply:yellow"
@@ -551,7 +554,7 @@ for _, rtab in ipairs({
 	end
 	
 	minetest.register_node("advtrains_signals_ks:mast_mast_"..rot, {
-		description = "Ks Mast",
+		description = S("Ks Mast"),
 		drawtype = "mesh",
 		mesh = "advtrains_signals_ks_mast_smr"..rot..".obj",
 		tiles = {"advtrains_signals_ks_mast.png"},
@@ -663,4 +666,4 @@ minetest.register_craft{ -- Line Speed Restriction Sign
 minetest.register_craft{ -- Permanent Local Speed Restriction Sign
 	output = "advtrains_signals_ks:sign_8_0",
 	recipe = {{"advtrains_signals_ks:sign_lf7_8_0"}}
-}
\ No newline at end of file
+}
diff --git a/advtrains_signals_muc_ubahn/init.lua b/advtrains_signals_muc_ubahn/init.lua
index a8eb445..49642ef 100644
--- a/advtrains_signals_muc_ubahn/init.lua
+++ b/advtrains_signals_muc_ubahn/init.lua
@@ -6,6 +6,9 @@
 -- Hp4 and Hp5 are not implemented because they do not make sense.
 -- Also the speed signals are not yet added (they will be added later)
 
+-- ask engine for translator instance, this will load the translation files
+local S = core.get_translator("advtrains_signals_muc_ubahn")
+
 local all_sigs = {
 	hp0 = { asp = { main = 0 }, crea = true }, -- halt
 	hp1 = { asp = { main = -1, proceed_as_main = true } }, -- free full speed
@@ -16,9 +19,9 @@ local all_sigs = {
 }
 
 local mainaspects = {
-	{ name = "hp1", description = "Hp1: Full speed" },
-	{ name = "hp2", description = "Hp2: Reduced Speed" },
-	{ name = "hp3", description = "Hp3: Shunt" },
+	{ name = "hp1", description = S("Hp1: Full speed") },
+	{ name = "hp2", description = S("Hp2: Reduced Speed") },
+	{ name = "hp3", description = S("Hp3: Shunt") },
 }
 local dstaspects = {
 	{ name = "vr1", description = "Vr1: Expect Full speed" },
@@ -62,7 +65,7 @@ for r,f in pairs(all_sigs) do
 			mesh = "advtrains_signals_muc_ubahn_wsig_"..loc..".obj",
 			tiles = {"advtrains_signals_muc_ubahn_"..r..".png"},
 			drop = f.distant and "advtrains_signals_muc_ubahn:signal_wall_"..loc.."_vr0" or "advtrains_signals_muc_ubahn:signal_wall_"..loc.."_hp0",
-			description = f.distant and attrans("Munich U-Bahn Distant Signal ("..loc..")") or attrans("Munich U-Bahn Main Signal ("..loc..")"),
+			description = f.distant and S("Munich U-Bahn Distant Signal ("..loc..")") or S("Munich U-Bahn Main Signal ("..loc..")"),
 			groups = {
 				cracky=3,
 				not_blocking_trains=1,
@@ -113,4 +116,4 @@ for this,nxt in pairs({l = "t", t = "r",r = "l"}) do --Circular crafting for wal
 		type = "shapeless",
 		recipe = {"advtrains_signals_muc_ubahn:signal_wall_"..this.."_vr0"},
 	})
-end
\ No newline at end of file
+end