Merge branch 'master' of https://github.com/webdesigner97/streets

2 files changed, 23 insertions, 23 deletions

diff --git a/roadsigns/signs.lua b/roadsigns/signs.lua
index d7878fd..3b8beb4 100644
--- a/roadsigns/signs.lua
+++ b/roadsigns/signs.lua
@@ -1,5 +1,5 @@
 minetest.register_node(":streets:sign_blank",{
-	description = S("Emtpy sign"),
+	description = S("Empty sign"),
 	tiles = {"streets_sign_back.png"},
 	inventory_image = "streets_sign_back.png",
 	wield_image = "streets_sign_back.png",
@@ -27,7 +27,7 @@ minetest.register_node(":streets:sign_blank",{
 	after_place_node = function(pos)
 		local meta = minetest.get_meta(pos)
 		
-		meta:set_string("infotext", "Empty Sign")
+		meta:set_string("infotext", S("Empty Sign"))
 	end
 })
 minetest.register_node(":streets:sign_lava",{
@@ -59,7 +59,7 @@ minetest.register_node(":streets:sign_lava",{
 	after_place_node = function(pos)
 		local meta = minetest.get_meta(pos)
 		
-		meta:set_string("infotext", "Warning: Careful of lava")
+		meta:set_string("infotext", S("Warning: Careful of lava"))
 	end
 })
 	
@@ -92,7 +92,7 @@ minetest.register_node(":streets:sign_water",{
 	after_place_node = function(pos)
 		local meta = minetest.get_meta(pos)
 		
-		meta:set_string("infotext", "Warning: Water Nearby")
+		meta:set_string("infotext", S("Warning: Water nearby"))
 	end
 })
 
@@ -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", "Warning: Construction area, possible deep excavations")
+		meta:set_string("infotext", S("Warning: Construction area, possible deep excavations"))
 	end
 })
diff --git a/roadsigns/workshop.lua b/roadsigns/workshop.lua
index 75cbf5a..08b94f2 100644
--- a/roadsigns/workshop.lua
+++ b/roadsigns/workshop.lua
@@ -4,32 +4,32 @@
 local forms = {
 	inactive = {
 		"size[12,10]",
-		"label[3.5,0;Sign workshop - Create signs for your roads!]",
-		"label[0,0.5;Available signs:]",
+		"label[3.5,0;"..S("Sign workshop - Create signs for your roads!").."]",
+		"label[0,0.5;"..S("Available signs:").."]",
 		"list[context;streets:signworkshop_list;0,1;5,4]",
-		"label[9,0.5;Needed stuff:]",
+		"label[9,0.5;"..S("Needed stuff:").."]",
 		"list[context;streets:signworkshop_recipe;8,1;4,1]",
-		"label[9,2;Put it here:]",
+		"label[9,2;"..S("Put it here:").."]",
 		"list[context;streets:signworkshop_input;8,3;4,1]",
-		"button[8,4;2,1;streets:signworkshop_send;Start!]",
-		"label[5.8,0.5;Selected:]",
+		"button[8,4;2,1;streets:signworkshop_send;"..S("Start!").."]",
+		"label[5.8,0.5;"..S("Selected:").."]",
 		"list[context;streets:signworkshop_select;6,1;1,1]",
-		"label[5.8,2.5;Output:]",
+		"label[5.8,2.5;"..S("Output:").."]",
 		"list[context;streets:signworkshop_output;6,3;1,1]",
 		"list[current_player;main;2,6;8,4]",
 	},
 	active = {
 		"size[12,10]",
-		"label[3.5,0;Sign workshop - Create signs for your roads!]",
-		"label[0,0.5;Available signs:]",
+		"label[3.5,0;"..S("Sign workshop - Create signs for your roads!").."]",
+		"label[0,0.5;"..S("Available signs:").."]",
 		"list[context;streets:signworkshop_list;0,1;5,4]",
-		"label[9,0.5;Needed stuff:]",
+		"label[9,0.5;"..S("Needed stuff:").."]",
 		"list[context;streets:signworkshop_recipe;8,1;4,1]",
-		"label[9,2;Put it here:]",
+		"label[9,2;"..S("Put it here:").."]",
 		"list[context;streets:signworkshop_input;8,3;4,1]",
-		"label[5.8,0.5;Selected:]",
+		"label[5.8,0.5;"..S("Selected:").."]",
 		"list[context;streets:signworkshop_select;6,1;1,1]",
-		"label[5.8,2.5;Output:]",
+		"label[5.8,2.5;"..S("Output:").."]",
 		"list[context;streets:signworkshop_output;6,3;1,1]",
 		"list[current_player;main;2,6;8,4]"
 		-- 
@@ -55,7 +55,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","Sign workshop idle")
+		meta:set_string("infotext",S("Sign workshop idle"))
 		meta:set_string("idle","y")
 	end,
 	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
@@ -119,14 +119,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","Sign workshop working")
+				meta:set_string("infotext",S("Sign workshop working"))
 				meta:set_string("idle","n")
-				meta:set_string("formspec",table.concat(forms.active) .. "label[8,4;Please wait " .. def.time .. " seconds...]")
+				meta:set_string("formspec",table.concat(forms.active) .. "label[8,4;"..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","Sign workshop idle")
+					meta:set_string("infotext",S("Sign workshop idle"))
 					meta:set_string("idle","y")
 					meta:set_string("formspec",table.concat(forms.inactive))
 					-- Fill output
@@ -144,4 +144,4 @@ minetest.register_craft({
 		{"default:steel_ingot","default:diamond","default:steel_ingot"},
 		{"default:cobble","default:cobble","default:cobble"}
 	}
-})
\ No newline at end of file
+})