diff options
Diffstat (limited to 'advtrains_interlocking')
| -rw-r--r-- | advtrains_interlocking/demosignals.lua | 6 | ||||
| -rw-r--r-- | advtrains_interlocking/init.lua | 3 | ||||
| -rw-r--r-- | advtrains_interlocking/signal_api.lua | 60 | ||||
| -rwxr-xr-x | advtrains_interlocking/tcb_ts_ui.lua | 2 | ||||
| -rw-r--r-- | advtrains_interlocking/tool.lua | 18 | ||||
| -rw-r--r-- | advtrains_interlocking/tsr_rail.lua | 10 |
6 files changed, 51 insertions, 48 deletions
diff --git a/advtrains_interlocking/demosignals.lua b/advtrains_interlocking/demosignals.lua index 1c1b8b2..e19205a 100644 --- a/advtrains_interlocking/demosignals.lua +++ b/advtrains_interlocking/demosignals.lua @@ -34,7 +34,7 @@ local suppasp = { } minetest.register_node("advtrains_interlocking:ds_danger", { - description = "Demo signal at Danger", + description = attrans("Demo signal at Danger"), tiles = {"at_il_signal_asp_danger.png"}, groups = { cracky = 3, @@ -53,7 +53,7 @@ minetest.register_node("advtrains_interlocking:ds_danger", { after_dig_node = advtrains.interlocking.signal_after_dig, }) minetest.register_node("advtrains_interlocking:ds_free", { - description = "Demo signal at Free", + description = attrans("Demo signal at Free"), tiles = {"at_il_signal_asp_free.png"}, groups = { cracky = 3, @@ -74,7 +74,7 @@ minetest.register_node("advtrains_interlocking:ds_free", { after_dig_node = advtrains.interlocking.signal_after_dig, }) minetest.register_node("advtrains_interlocking:ds_slow", { - description = "Demo signal at Slow", + description = attrans("Demo signal at Slow"), tiles = {"at_il_signal_asp_slow.png"}, groups = { cracky = 3, diff --git a/advtrains_interlocking/init.lua b/advtrains_interlocking/init.lua index a2f5882..83956a2 100644 --- a/advtrains_interlocking/init.lua +++ b/advtrains_interlocking/init.lua @@ -1,6 +1,8 @@ -- Advtrains interlocking system -- See database.lua for a detailed explanation +print("[MOD BEGIN] " .. minetest.get_current_modname() .. "(" .. os.clock() .. ")") + advtrains.interlocking = {} advtrains.SHUNT_SPEED_MAX = 6 @@ -28,3 +30,4 @@ dofile(modpath.."tsr_rail.lua") minetest.register_privilege("interlocking", {description = "Can set up track sections, routes and signals.", give_to_singleplayer = true}) +print("[MOD END] " .. minetest.get_current_modname() .. "(" .. os.clock() .. ")") diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua index 83fae4a..15f26ca 100644 --- a/advtrains_interlocking/signal_api.lua +++ b/advtrains_interlocking/signal_api.lua @@ -257,7 +257,7 @@ function advtrains.interlocking.signal_rc_handler(pos, node, player, itemstack, advtrains.interlocking.show_signal_aspect_selector( pname, ndef.advtrains.supported_aspects, - "Set aspect manually", callback, + attrans("Set aspect manually"), callback, isasp) else --static signal - only IP @@ -325,21 +325,21 @@ function advtrains.interlocking.show_ip_form(pos, pname, only_notset) if not minetest.check_player_privs(pname, "interlocking") then return end - local form = "size[7,5]label[0.5,0.5;Signal at "..minetest.pos_to_string(pos).."]" + local form = "size[7,5]label[0.5,0.5;" .. attrans("Signal at @1", minetest.pos_to_string(pos)).."]" advtrains.interlocking.db.check_for_duplicate_ip(pos) local pts, connid = advtrains.interlocking.db.get_ip_by_signalpos(pos) if pts then - form = form.."label[0.5,1.5;Influence point is set at "..pts.."/"..connid.."]" - form = form.."button_exit[0.5,2.5; 5,1;set;Move]" - form = form.."button_exit[0.5,3.5; 5,1;clear;Clear]" + form = form.."label[0.5,1.5;" .. attrans("Influence point is set at @1/@2", pts, connid).."]" + form = form.."button_exit[0.5,2.5; 5,1;set;"..attrans("Move") .. "]" + form = form.."button_exit[0.5,3.5; 5,1;clear;" .. attrans("Clear") .. "]" local ipos = minetest.string_to_pos(pts) ipmarker(ipos, connid) else - form = form.."label[0.5,1.5;Influence point is not set.]" - form = form.."label[0.5,2.0;It is recommended to set an influence point.]" - form = form.."label[0.5,2.5;This is the point where trains will obey the signal.]" + form = form.."label[0.5,1.5;" .. attrans("Influence point is not set.") .. "]" + form = form.."label[0.5,2.0;" .. attrans("It is recommended to set an influence point.") .. "]" + form = form.."label[0.5,2.5;" .. attrans("This is the point where trains will obey the signal.") .. "]" - form = form.."button_exit[0.5,3.5; 5,1;set;Set]" + form = form.."button_exit[0.5,3.5; 5,1;set;" .. attrans("Set") .. "]" end if not only_notset or not pts then minetest.show_formspec(pname, "at_il_ipassign_"..minetest.pos_to_string(pos), form) @@ -368,12 +368,12 @@ end) -- inits the signal IP assignment process function advtrains.interlocking.signal_init_ip_assign(pos, pname) if not minetest.check_player_privs(pname, "interlocking") then - minetest.chat_send_player(pname, "Insufficient privileges to use this!") + minetest.chat_send_player(pname, attrans("Insufficient privileges to use this!")) return end --remove old IP --advtrains.interlocking.db.clear_ip_by_signalpos(pos) - minetest.chat_send_player(pname, "Configuring Signal: Please look in train's driving direction and punch rail to set influence point.") + minetest.chat_send_player(pname, attrans("Configuring Signal: Please look in train's driving direction and punch rail to set influence point.")) players_assign_ip[pname] = pos end @@ -398,15 +398,15 @@ minetest.register_on_punchnode(function(pos, node, player, pointed_thing) if not advtrains.interlocking.db.get_ip_signal_asp(pts, plconnid) then advtrains.interlocking.db.set_ip_signal(pts, plconnid, signalpos) ipmarker(pos, plconnid) - minetest.chat_send_player(pname, "Configuring Signal: Successfully set influence point") + minetest.chat_send_player(pname, attrans("Configuring Signal: Successfully set influence point")) else - minetest.chat_send_player(pname, "Configuring Signal: Influence point of another signal is already present!") + minetest.chat_send_player(pname, attrans("Configuring Signal: Influence point of another signal is already present!")) end else - minetest.chat_send_player(pname, "Configuring Signal: This is not a normal two-connection rail! Aborted.") + minetest.chat_send_player(pname, attrans("Configuring Signal: This is not a normal two-connection rail! Aborted.")) end else - minetest.chat_send_player(pname, "Configuring Signal: Node is too far away. Aborted.") + minetest.chat_send_player(pname, attrans("Configuring Signal: Node is too far away. Aborted.")) end players_assign_ip[pname] = nil end @@ -429,22 +429,22 @@ function advtrains.interlocking.show_signal_aspect_selector(pname, p_suppasp, p_ } local purpose = p_purpose or "" - local form = "size[7,7]label[0.5,0.5;Select Signal Aspect:]" + local form = "size[7,7]label[0.5,0.5;" .. attrans("Select Signal Aspect:") .. "]" form = form.."label[0.5,1;"..purpose.."]" - form = form.."label[0.5,1.5;== Main Signal ==]" + form = form.."label[0.5,1.5;" .. attrans("== Main Signal ==") .. "]" local selid = 1 local entries = {} for idx, spv in ipairs(suppasp.main) do local entry if spv == 0 then - entry = "Halt" + entry = attrans("Halt") elseif spv == -1 then - entry = "Continue at maximum speed" + entry = attrans("Continue at maximum speed") elseif not spv then - entry = "Continue\\, speed limit unchanged (no info)" + entry = attrans("Continue\\, speed limit unchanged (no info)") else - entry = "Continue at speed of "..spv + entry = attrans("Continue at speed of @1", spv) end -- hack: the crappy formspec system returns the label, not the index. save the index in it. entries[idx] = idx.."| "..entry @@ -455,26 +455,26 @@ function advtrains.interlocking.show_signal_aspect_selector(pname, p_suppasp, p_ form = form.."dropdown[0.5,2;6;main;"..table.concat(entries, ",")..";"..selid.."]" - form = form.."label[0.5,3;== Shunting ==]" + form = form.."label[0.5,3;" .. attrans("== Shunting ==") .. "]" if suppasp.shunt == nil then local st = 1 if isasp and isasp.shunt then st=2 end - form = form.."dropdown[0.5,3.5;6;shunt_free;---,allowed;"..st.."]" + form = form.."dropdown[0.5,3.5;6;shunt_free;---," .. attrans("allowed") .. ";"..st.."]" end - form = form.."label[0.5,4.5;== Distant Signal ==]" + form = form.."label[0.5,4.5;" .. attrans("== Distant Signal ==").."]" local selid = 1 local entries = {} for idx, spv in ipairs(suppasp.dst) do local entry if spv == 0 then - entry = "Expect to stop at the next signal" + entry = attrans("Expect to stop at the next signal") elseif spv == -1 then - entry = "Expect to pass the next signal at maximum speed" + entry = attrans("Expect to pass the next signal at maximum speed") elseif not spv then - entry = "No info" + entry = attrans("No info") else - entry = string.format("Expect to pass the next signal at speed of %d", spv) + entry = attrans("Expect to pass the next signal at speed of @1", string.format("%d", spv)) end entries[idx] = idx.."| "..entry if isasp and spv == (isasp.dst or false) then @@ -483,7 +483,7 @@ function advtrains.interlocking.show_signal_aspect_selector(pname, p_suppasp, p_ end form = form.."dropdown[0.5,5;6;dst;"..table.concat(entries, ",")..";"..selid.."]" - form = form.."button_exit[0.5,6;5,1;save;Save signal aspect]" + form = form.."button_exit[0.5,6;5,1;save;" .. attrans("Save signal aspect") .. "]" local token = advtrains.random_id() @@ -526,7 +526,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) local asp = { main = psl.suppasp.main[maini], dst = psl.suppasp.dst[dsti], - shunt = usebool(psl.suppasp.shunt, fields.shunt_free, "allowed"), + shunt = usebool(psl.suppasp.shunt, fields.shunt_free, attrans("allowed")), info = {} } psl.callback(pname, asp) diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua index 0cc10da..330ce43 100755 --- a/advtrains_interlocking/tcb_ts_ui.lua +++ b/advtrains_interlocking/tcb_ts_ui.lua @@ -26,7 +26,7 @@ minetest.register_node("advtrains_interlocking:tcb_node", { }, mesh = "at_il_tcb_node.obj", tiles = {"at_il_tcb_node.png"}, - description="Track Circuit Break", + description=attrans("Track Circuit Break"), sunlight_propagates=true, groups = { cracky=3, diff --git a/advtrains_interlocking/tool.lua b/advtrains_interlocking/tool.lua index 5d38b3a..1208b9f 100644 --- a/advtrains_interlocking/tool.lua +++ b/advtrains_interlocking/tool.lua @@ -4,7 +4,7 @@ local ilrs = advtrains.interlocking.route minetest.register_craftitem("advtrains_interlocking:tool",{ - description = "Interlocking tool\nright-click turnouts to inspect route locks", + description = attrans("Interlocking tool\nright-click turnouts to inspect route locks"), groups = {cracky=1}, -- key=name, value=rating; rating=1..3. inventory_image = "at_il_tool.png", wield_image = "at_il_tool.png", @@ -15,28 +15,28 @@ minetest.register_craftitem("advtrains_interlocking:tool",{ return end if not minetest.check_player_privs(pname, {interlocking=true}) then - minetest.chat_send_player(pname, "Insufficient privileges to use this!") + minetest.chat_send_player(pname, attrans("Insufficient privileges to use this!")) return end if pointed_thing.type=="node" then local pos=pointed_thing.under if advtrains.is_passive(pos) then - local form = "size[7,5]label[0.5,0.5;Route lock inspector]" + local form = "size[7,5]label[0.5,0.5;" .. attrans("Route lock inspector") .. "]" local pts = minetest.pos_to_string(pos) local rtl = ilrs.has_route_lock(pts) if rtl then - form = form.."label[0.5,1;Route locks currently put:\n"..rtl.."]" - form = form.."button_exit[0.5,3.5; 5,1;clear;Clear]" + form = form.."label[0.5,1;" .. attrans("Route locks currently put:") .. "\n"..rtl.."]" + form = form.."button_exit[0.5,3.5; 5,1;clear;" .. attrans("Clear") .. "]" else - form = form.."label[0.5,1;No route locks set]" - form = form.."button_exit[0.5,3.5; 5,1;emplace;Emplace manual lock]" + form = form.."label[0.5,1;" .. attrans("No route locks set") .. "]" + form = form.."button_exit[0.5,3.5; 5,1;emplace;" .. attrans("Emplace manual lock") .. "]" end minetest.show_formspec(pname, "at_il_rtool_"..pts, form) else - minetest.chat_send_player(pname, "Cannot use this here.") + minetest.chat_send_player(pname, attrans("Cannot use this here.")) return end end @@ -59,7 +59,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) ilrs.remove_route_locks(pts) end if fields.emplace then - ilrs.add_manual_route_lock(pts, "Manual lock ("..pname..")") + ilrs.add_manual_route_lock(pts, attrans("Manual lock (@1)", pname)) end end end diff --git a/advtrains_interlocking/tsr_rail.lua b/advtrains_interlocking/tsr_rail.lua index f302540..ee8fe37 100644 --- a/advtrains_interlocking/tsr_rail.lua +++ b/advtrains_interlocking/tsr_rail.lua @@ -8,8 +8,8 @@ local function updateform(pos) local pe = advtrains.encode_pos(pos) local npr = advtrains.interlocking.npr_rails[pe] or 2 - meta:set_string("infotext", "Point speed restriction: "..npr) - meta:set_string("formspec", "field[npr;Set point speed restriction:;"..npr.."]") + meta:set_string("infotext", advtrans("Point speed restriction") .. ": "..npr) + meta:set_string("formspec", "field[npr;"..attrans("Set point speed restriction:")..";"..npr.."]") end @@ -25,11 +25,11 @@ local adefunc = function(def, preset, suffix, rotation) on_receive_fields = function(pos, formname, fields, player) local pname = player:get_player_name() if not minetest.check_player_privs(pname, {interlocking=true}) then - minetest.chat_send_player(pname, "Interlocking privilege required!") + minetest.chat_send_player(pname, attrans("Interlocking privilege required!")) return end if minetest.is_protected(pos, pname) then - minetest.chat_send_player(pname, "This rail is protected!") + minetest.chat_send_player(pname, attrans("This rail is protected!")) minetest.record_protection_violation(pos, pname) return end @@ -59,7 +59,7 @@ if minetest.get_modpath("advtrains_train_track") ~= nil then models_prefix="advtrains_dtrack", models_suffix=".b3d", shared_texture="advtrains_dtrack_shared_npr.png", - description="Point Speed Restriction Rail", + description=attrans("Point Speed Restriction Rail"), formats={}, get_additional_definiton = adefunc, }, advtrains.trackpresets.t_30deg_straightonly) |