Merge and update translations (#186)

stairsplus/common.lua

@@ -8,11 +8,11 @@ Licensed under the zlib license. See LICENSE.md for more information.
 local S = moreblocks.S
 
 local descriptions = {
-	["micro"] = S("%s Microblock"),
-	["slab"] = S("%s Slab"),
-	["slope"] = S("%s Slope"),
-	["panel"] = S("%s Panel"),
-	["stair"] = S("%s Stairs"),
+	["micro"] = "Microblock",
+	["slab"] = "Slab",
+	["slope"] = "Slope",
+	["panel"] = "Panel",
+	["stair"] = "Stairs",
 }
 
 -- Extends the standad rotate_node placement so that it takes into account
@@ -119,8 +119,9 @@ stairsplus.rotate_node_aux = function(itemstack, placer, pointed_thing)
 end
 
 stairsplus.register_single = function(category, alternate, info, modname, subname, recipeitem, fields)
+
 	local src_def = minetest.registered_nodes[recipeitem] or {}
-	local desc_base = descriptions[category]:format(fields.description)
+	local desc_base = S("@1 "..descriptions[category], fields.description)
 	local def = {}
 
 	if category ~= "slab" then

stairsplus/registrations.lua

@@ -4,7 +4,7 @@ More Blocks: registrations
 Copyright © 2011-2020 Hugo Locurcio and contributors.
 Licensed under the zlib license. See LICENSE.md for more information.
 --]]
-
+local S = moreblocks.S
 -- default registrations
 if minetest.get_modpath("default") then
 	local default_nodes = { -- Default stairs/slabs/panels/microblocks:
@@ -117,7 +117,7 @@ end
 
 if minetest.get_modpath("basic_materials") then
 	stairsplus:register_all("technic","concrete","basic_materials:concrete_block",{
-		description = "Concrete",
+		description = S("Concrete"),
 		tiles = {"basic_materials_concrete_block.png",},
 		groups = {cracky=1, level=2, concrete=1},
 		sounds = moreblocks.node_sound_stone_defaults(),
@@ -127,7 +127,7 @@ if minetest.get_modpath("basic_materials") then
 	minetest.register_alias("prefab:concrete_slab","technic:slab_concrete")
 
 	stairsplus:register_all("gloopblocks", "cement", "basic_materials:cement_block", {
-		description = "Cement",
+		description = S("Cement"),
 		tiles = {"basic_materials_cement_block.png"},
 		groups = {cracky=2, not_in_creative_inventory=1},
 		sounds = moreblocks.node_sound_stone_defaults(),
@@ -135,7 +135,7 @@ if minetest.get_modpath("basic_materials") then
 	})
 
 	stairsplus:register_all("technic", "brass_block", "basic_materials:brass_block", {
-		description="Brass Block",
+		description= S("Brass Block"),
 		groups={cracky=1, not_in_creative_inventory=1},
 		tiles={"basic_materials_brass_block.png"},
 	})
@@ -158,6 +158,6 @@ minetest.register_lbm({
 
 		})
 		minetest.log('action', "LBM replaced " .. node.name ..
-			" at " .. minetest.pos_to_string(pos))
+				" at " .. minetest.pos_to_string(pos))
 	end,
 })