From c8420fc3b701c0363bd9003c1f42e97e6c63fc58 Mon Sep 17 00:00:00 2001 From: David Leal Date: Sat, 24 Oct 2020 21:34:16 -0500 Subject: [PATCH] Refactor how translations are coded --- init.lua | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/init.lua b/init.lua index 34c9878..3969e2e 100644 --- a/init.lua +++ b/init.lua @@ -178,7 +178,7 @@ travelnet.show_message = function( pos, player_name, title, message ) return; end local formspec = "size[8,3]".. - "label[3,0;"..minetest.formspec_escape( title or "Error").."]".. + "label[3,0;"..minetest.formspec_escape( title or S("Error")).."]".. "textlist[0,0.5;8,1.5;;"..minetest.formspec_escape( message or "- nothing -")..";]".. "button_exit[3.5,2.5;1.0,0.5;back;"..S("Back").."]".. "button_exit[6.8,2.5;1.0,0.5;station_exit;"..S("Exit").."]".. @@ -247,7 +247,7 @@ travelnet.reset_formspec = function( meta ) "field[0.3,2.8;9,0.9;station_network;"..S("Assign to Network:")..";".. minetest.formspec_escape(station_network or "").."]".. - "label[0.3,3.1;"..S("You can have more than one network. If unsure, use \"%s\""):format(tostring(station_network))..".]".. + "label[0.3,3.1;"..S("You can have more than one network. If unsure, use \"@1\"", tostring(station_network)) .. ".]".. "field[0.3,4.4;9,0.9;owner;"..S("Owned by:")..";]".. "label[0.3,4.7;"..S("Unless you know what you are doing, leave this empty.").."]".. "button_exit[1.3,5.3;1.7,0.7;station_help_setup;"..S("Help").."]".. @@ -319,8 +319,8 @@ travelnet.update_formspec = function( pos, puncher_name, fields ) -- add this station travelnet.targets[ owner_name ][ station_network ][ station_name ] = {pos=pos, timestamp=zeit }; - minetest.chat_send_player(owner_name, S("Station '%s'"):format(station_name).." ".. - S(" has been reattached to the network '%s'."):format(station_network)); + minetest.chat_send_player(owner_name, S("Station '@1'" .." ".. + "has been reattached to the network '@2'.", station_name, station_network)); travelnet.save_data(); end @@ -486,10 +486,9 @@ travelnet.update_formspec = function( pos, puncher_name, fields ) meta:set_string( "formspec", formspec ); - meta:set_string( "infotext", S("Station '%s'"):format(tostring( station_name )).." ".. - S("on travelnet '%s'"):format(tostring( station_network )).." ".. - S("(owned by %s)"):format(tostring( owner_name )).." ".. - S("ready for usage. Right-click to travel, punch to update.")); + meta:set_string( "infotext", S("Station '@1'".." ".. + "on travelnet '@2' (owned by @3)" .." ".. + "ready for usage. Right-click to travel, punch to update.", tostring(station_name), tostring(station_network), tostring(owner_name))); -- show the player the updated formspec travelnet.show_current_formspec( pos, meta, puncher_name ); @@ -533,7 +532,7 @@ travelnet.add_target = function( station_name, network_name, pos, player_name, m elseif( not( minetest.check_player_privs(player_name, {interact=true}))) then travelnet.show_message( pos, player_name, S("Error"), - S("There is no player with interact privilege named '%s'. Aborting."):format(tostring( player_name ))); + S("There is no player with interact privilege named '@1'. Aborting.", tostring( player_name))); return; elseif( not( minetest.check_player_privs(player_name, {travelnet_attach=true})) @@ -561,7 +560,7 @@ travelnet.add_target = function( station_name, network_name, pos, player_name, m if( k == station_name ) then travelnet.show_message( pos, player_name, S("Error"), - S("A station named '%s' already exists on this network. Please choose a diffrent name!"):format(station_name)); + S("A station named '@1' already exists on this network. Please choose a diffrent name!", station_name)); return; end @@ -571,9 +570,8 @@ travelnet.add_target = function( station_name, network_name, pos, player_name, m -- we don't want too many stations in the same network because that would get confusing when displaying the targets if( anz+1 > travelnet.MAX_STATIONS_PER_NETWORK ) then travelnet.show_message( pos, player_name, S("Error"), - S("Network '%s',"):format(network_name).." ".. - S("already contains the maximum number (=%s) of allowed stations per network. ".. - "Please choose a diffrent/new network name."):format(travelnet.MAX_STATIONS_PER_NETWORK)); + S("Network '@1', already contains the maximum number (@2) of allowed stations per network. ".. + "Please choose a different/new network name.", network_name, travelnet.MAX_STATIONS_PER_NETWORK)); return; end @@ -583,9 +581,9 @@ travelnet.add_target = function( station_name, network_name, pos, player_name, m -- do we have a new node to set up? (and are not just reading from a safefile?) if( meta ) then - minetest.chat_send_player(player_name, S("Station '%s'"):format(station_name).." ".. - S("has been added to the network '%s'"):format(network_name).. - S(", which now consists of %s station(s)."):format(anz+1)); + minetest.chat_send_player(player_name, S("Station '@1'" .." ".. + "has been added to the network '@2'" .. + ", which now consists of @3 station(s).", station_name, network_name, anz+1)); meta:set_string( "station_name", station_name ); meta:set_string( "station_network", network_name ); @@ -679,7 +677,7 @@ travelnet.on_receive_fields = function(pos, formname, fields, player) -- simulate right-click local node = minetest.get_node( pos ); if( node and node.name and minetest.registered_nodes[ node.name ] ) then - travelnet.show_message( pos, name, "--> Help <--", + travelnet.show_message( pos, name, S("--> Help <--"), -- TODO: actually add help page S("No help available yet.")); end @@ -934,11 +932,11 @@ travelnet.remove_box = function( pos, oldnode, oldmetadata, digger ) travelnet.targets[ owner_name ][ station_network ][ station_name ] = nil; -- inform the owner - minetest.chat_send_player( owner_name, S("Station '%s'"):format(station_name ).." ".. - S("has been REMOVED from the network '%s'."):format(station_network)); + minetest.chat_send_player( owner_name, S("Station '@1'" .." ".. + "has been REMOVED from the network '@2'.", station_name, station_network)); if( digger ~= nil and owner_name ~= digger:get_player_name() ) then - minetest.chat_send_player( digger:get_player_name(), S("Station '%s'"):format(station_name).. - S("has been REMOVED from the network '%s'."):format(station_network)); + minetest.chat_send_player( digger:get_player_name(), S("Station '@1'" .." ".. + "has been REMOVED from the network '@2'.", station_name, station_network)); end -- save the updated network data in a savefile over server restart