From 946d833d2e3277dd43536ffd6b3300554081e56a Mon Sep 17 00:00:00 2001 From: webdesigner97 Date: Mon, 19 May 2014 21:27:47 +0200 Subject: Many changed files from the last weeks where I don't know what I chenged --- roadsigns/pole.lua | 4 ++-- roadsigns/signs.lua | 16 ++++++++-------- roadsigns/workshop.lua | 36 ++++++++++++++++++------------------ 3 files changed, 28 insertions(+), 28 deletions(-) (limited to 'roadsigns') diff --git a/roadsigns/pole.lua b/roadsigns/pole.lua index 417ecdf..5d68398 100644 --- a/roadsigns/pole.lua +++ b/roadsigns/pole.lua @@ -2,7 +2,7 @@ StreetsMod: Poles and signs ]] minetest.register_node(":streets:pole_bottom",{ - description = S("Pole"), + description = streets.S("Pole"), tiles = {"streets_pole.png"}, groups = {cracky=2}, inventory_image = "streets_pole_inv.png", @@ -42,7 +42,7 @@ minetest.register_node(":streets:pole_bottom",{ }) minetest.register_node(":streets:pole_top",{ - description = S("Y u no play minetest without cheating?"), + description = streets.S("Y u no play minetest without cheating?"), tiles = {"streets_pole.png"}, groups = {cracky=2,not_in_creative_inventory=1}, paramtype = "light", diff --git a/roadsigns/signs.lua b/roadsigns/signs.lua index 3b8beb4..03b4139 100644 --- a/roadsigns/signs.lua +++ b/roadsigns/signs.lua @@ -1,5 +1,5 @@ minetest.register_node(":streets:sign_blank",{ - description = S("Empty sign"), + description = streets.S("Empty sign"), tiles = {"streets_sign_back.png"}, inventory_image = "streets_sign_back.png", wield_image = "streets_sign_back.png", @@ -27,11 +27,11 @@ minetest.register_node(":streets:sign_blank",{ after_place_node = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("infotext", S("Empty Sign")) + meta:set_string("infotext", streets.S("Empty Sign")) end }) minetest.register_node(":streets:sign_lava",{ - description = S("Warning sign (lava)"), + description = streets.S("Warning sign (lava)"), tiles = {"streets_sign_lava.png"}, inventory_image = "streets_sign_lava.png", wield_image = "streets_sign_lava.png", @@ -59,12 +59,12 @@ minetest.register_node(":streets:sign_lava",{ after_place_node = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("infotext", S("Warning: Careful of lava")) + meta:set_string("infotext", streets.S("Warning: Careful of lava")) end }) minetest.register_node(":streets:sign_water",{ - description = S("Warning sign (water)"), + description = streets.S("Warning sign (water)"), tiles = {"streets_sign_water.png"}, inventory_image = "streets_sign_water.png", wield_image = "streets_sign_water.png", @@ -92,12 +92,12 @@ minetest.register_node(":streets:sign_water",{ after_place_node = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("infotext", S("Warning: Water nearby")) + meta:set_string("infotext", streets.S("Warning: Water nearby")) end }) minetest.register_node(":streets:sign_construction",{ - description = S("Warning sign (Construction area)"), + description = streets.S("Warning sign (Construction area)"), tiles = {"streets_sign_construction.png"}, inventory_image = "streets_sign_construction.png", wield_image = "streets_sign_construction.png", @@ -125,6 +125,6 @@ minetest.register_node(":streets:sign_construction",{ after_place_node = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("infotext", S("Warning: Construction area, possible deep excavations")) + meta:set_string("infotext", streets.S("Warning: Construction area, possible deep excavations")) end }) diff --git a/roadsigns/workshop.lua b/roadsigns/workshop.lua index 272285c..4854a98 100644 --- a/roadsigns/workshop.lua +++ b/roadsigns/workshop.lua @@ -4,17 +4,17 @@ local forms = { inactive = { "size[12,10]", - "label[3.5,0;"..S("Sign workshop - Create signs for your roads!").."]", - "label[0,0.5;"..S("Available signs:").."]", + "label[3.5,0;"..streets.S("Sign workshop - Create signs for your roads!").."]", + "label[0,0.5;"..streets.S("Available signs:").."]", "list[context;streets:signworkshop_list;0,1;5,4]", - "label[9,0.5;"..S("Needed stuff:").."]", + "label[9,0.5;"..streets.S("Needed stuff:").."]", "list[context;streets:signworkshop_recipe;8,1;4,1]", - "label[9,2;"..S("Put it here:").."]", + "label[9,2;"..streets.S("Put it here:").."]", "list[context;streets:signworkshop_input;8,3;4,1]", - "button[8,4;2,1;streets:signworkshop_send;"..S("Start!").."]", - "label[5.8,0.5;"..S("Selected:").."]", + "button[8,4;2,1;streets:signworkshop_send;"..streets.S("Start!").."]", + "label[5.8,0.5;"..streets.S("Selected:").."]", "list[context;streets:signworkshop_select;6,1;1,1]", - "label[5.8,2.5;"..S("Output:").."]", + "label[5.8,2.5;"..streets.S("Output:").."]", "list[context;streets:signworkshop_output;6,3;1,1]", "list[current_player;main;2,6;8,1]", "list[current_player;main;2,7.25;8,3;8]", @@ -25,16 +25,16 @@ local forms = { }, active = { "size[12,10]", - "label[3.5,0;"..S("Sign workshop - Create signs for your roads!").."]", - "label[0,0.5;"..S("Available signs:").."]", + "label[3.5,0;"..streets.S("Sign workshop - Create signs for your roads!").."]", + "label[0,0.5;"..streets.S("Available signs:").."]", "list[context;streets:signworkshop_list;0,1;5,4]", - "label[9,0.5;"..S("Needed stuff:").."]", + "label[9,0.5;"..streets.S("Needed stuff:").."]", "list[context;streets:signworkshop_recipe;8,1;4,1]", - "label[9,2;"..S("Put it here:").."]", + "label[9,2;"..streets.S("Put it here:").."]", "list[context;streets:signworkshop_input;8,3;4,1]", - "label[5.8,0.5;"..S("Selected:").."]", + "label[5.8,0.5;"..streets.S("Selected:").."]", "list[context;streets:signworkshop_select;6,1;1,1]", - "label[5.8,2.5;"..S("Output:").."]", + "label[5.8,2.5;"..streets.S("Output:").."]", "list[context;streets:signworkshop_output;6,3;1,1]", "list[current_player;main;2,6;8,1]", "list[current_player;main;2,7.25;8,3;8]", @@ -46,7 +46,7 @@ local forms = { } } minetest.register_node(":streets:signworkshop",{ - description = S("Sign workshop"), + description = streets.S("Sign workshop"), tiles = {"streets_signworkshop_top.png","streets_signworkshop_bottom.png","streets_signworkshop_side.png","streets_signworkshop_side.png","streets_signworkshop_side.png","streets_signworkshop_front.png"}, groups = {cracky = 1, level = 2}, paramtype2 = "facedir", @@ -65,7 +65,7 @@ minetest.register_node(":streets:signworkshop",{ inv:add_item("streets:signworkshop_list","streets:sign_water") inv:add_item("streets:signworkshop_list","streets:sign_construction") -- Meta - meta:set_string("infotext",S("Sign workshop idle")) + meta:set_string("infotext",streets.S("Sign workshop idle")) meta:set_string("idle","y") end, allow_metadata_inventory_put = function(pos, listname, index, stack, player) @@ -129,14 +129,14 @@ minetest.register_node(":streets:signworkshop",{ if has[3] == nil then has[3] = { name = "" } end if has[4] == nil then has[4] = { name = "" } end if need[1].name == has[1].name and need[2].name == has[2].name and need[3].name == has[3].name and need[4].name == has[4].name then - meta:set_string("infotext",S("Sign workshop working")) + meta:set_string("infotext",streets.S("Sign workshop working")) meta:set_string("idle","n") - meta:set_string("formspec",table.concat(forms.active) .. "label[8,4;"..S("Please wait %s seconds..."):format(def.time).."]") + meta:set_string("formspec",table.concat(forms.active) .. "label[8,4;"..streets.S("Please wait %s seconds..."):format(def.time).."]") -- Clear input inv:set_list("streets:signworkshop_input",{"","","",""}) minetest.after(def.time,function() -- Reset infotext and meta - meta:set_string("infotext",S("Sign workshop idle")) + meta:set_string("infotext",streets.S("Sign workshop idle")) meta:set_string("idle","y") meta:set_string("formspec",table.concat(forms.inactive)) -- Fill output -- cgit v1.2.3