Fix Inner/Outer Stairs translation (#13)

Change case of Stairs/Slab first character to be consistent with the `stairs` mod.

README.txt

@@ -12,10 +12,10 @@ License: MIT (see LICENSE.txt)
 Dependencies:
 default (found in minetest_game)
 stairs (found in minetest_game)
-moreblocks (optional, for stairsplus support)
+moreblocks or stairsplus (optional, for stairsplus support)
 
-Please report bugs at the github issue tracker:
+Please report bugs at the GitHub issue tracker:
-https://github.com/4Evergreen4/quartz/issues/
+https://github.com/minetest-mods/quartz/issues/
 
 Crafting:
 
@@ -80,3 +80,6 @@ x|x|x
 x|c|x
 -----
 x|x|x
+
+If you have stairsplus (or moreblocks) installed, you will be able to use
+circular saws to cut quartz blocks.

depends.txt

@@ -1,3 +0,0 @@
-default
-stairs
-moreblocks?

description.txt

@@ -1 +0,0 @@
-Adds quartz ore and some decorative quartz blocks

init.lua

@@ -1,4 +1,6 @@
-dofile(minetest.get_modpath("quartz").."/settings.txt")
+local settings = Settings(minetest.get_modpath("quartz").."/settings.txt")
+
+local S = minetest.get_translator("quartz")
 
 --
 --  Item Registration
@@ -6,11 +8,11 @@ dofile(minetest.get_modpath("quartz").."/settings.txt")
 
 --  Quartz Crystal
 minetest.register_craftitem("quartz:quartz_crystal", {
-	description = "Quartz Crystal",
+	description = S("Quartz Crystal"),
 	inventory_image = "quartz_crystal_full.png",
 })
 minetest.register_craftitem("quartz:quartz_crystal_piece", {
-	description = "Quartz Crystal Piece",
+	description = S("Quartz Crystal Piece"),
 	inventory_image = "quartz_crystal_piece.png",
 })
 
@@ -20,7 +22,7 @@ minetest.register_craftitem("quartz:quartz_crystal_piece", {
 
 --  Ore
 minetest.register_node("quartz:quartz_ore", {
-	description = "Quartz Ore",
+	description = S("Quartz Ore"),
 	tiles = {"default_stone.png^quartz_ore.png"},
 	groups = {cracky=3, stone=1},
 	drop = 'quartz:quartz_crystal',
@@ -40,7 +42,7 @@ minetest.register_ore({
 
 -- Quartz Block
 minetest.register_node("quartz:block", {
-	description = "Quartz Block",
+	description = S("Quartz Block"),
 	tiles = {"quartz_block.png"},
 	groups = {cracky=3, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_glass_defaults(),
@@ -48,7 +50,7 @@ minetest.register_node("quartz:block", {
 
 -- Chiseled Quartz
 minetest.register_node("quartz:chiseled", {
-	description = "Chiseled Quartz",
+	description = S("Chiseled Quartz"),
 	tiles = {"quartz_chiseled.png"},
 	groups = {cracky=3, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_glass_defaults(),
@@ -56,9 +58,10 @@ minetest.register_node("quartz:chiseled", {
 
 -- Quartz Pillar
 minetest.register_node("quartz:pillar", {
-	description = "Quartz Pillar",
+	description = S("Quartz Pillar"),
 	paramtype2 = "facedir",
-	tiles = {"quartz_pillar_top.png", "quartz_pillar_top.png", "quartz_pillar_side.png"},
+	tiles = {"quartz_pillar_top.png", "quartz_pillar_top.png",
+		"quartz_pillar_side.png"},
 	groups = {cracky=3, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
@@ -68,16 +71,25 @@ minetest.register_node("quartz:pillar", {
 stairs.register_stair_and_slab("quartzblock", "quartz:block",
 		{cracky=3, oddly_breakable_by_hand=1},
 		{"quartz_block.png"},
-		"Quartz stair",
+		S("Quartz Stair"),
-		"Quartz slab",
+		S("Quartz Slab"),
-		default.node_sound_glass_defaults())
+		default.node_sound_glass_defaults(),
+		nil,
+		S("Inner Quartz Stair"),
+		S("Outer Quartz Stair")
+	)
 
-stairs.register_slab("quartzstair", "quartz:pillar",
+stairs.register_stair_and_slab("quartzstair", "quartz:pillar",
 		{cracky=3, oddly_breakable_by_hand=1},
-		{"quartz_pillar_top.png", "quartz_pillar_top.png", "quartz_pillar_side.png"},
+		{"quartz_pillar_top.png", "quartz_pillar_top.png",
-		"Quartz Pillar stair",
+			"quartz_pillar_side.png"},
-		"Quartz Pillar slab",
+		S("Quartz Pillar Stair"),
-		default.node_sound_glass_defaults())
+		S("Quartz Pillar Slab"),
+		default.node_sound_glass_defaults(),
+		nil,
+		S("Inner Quartz Pillar Stair"),
+		S("Outer Quartz Pillar Stair")
+	)
 
 --
 -- Crafting
@@ -103,21 +115,11 @@ minetest.register_craft({
 
 -- Chiseled Quartz
 minetest.register_craft({
-	output = 'quartz:chiseled 2',
+	output = 'quartz:chiseled 4',
 	recipe = {
-		{'stairs:slab_quartzblock', '', ''},
+		{'quartz:block', 'quartz:block', ''},
-		{'stairs:slab_quartzblock', '', ''},
+		{'quartz:block', 'quartz:block', ''},
-		{'', '', ''},
+		{'',             '',             ''},
-	}
-})
-
--- Chiseled Quartz (for stairsplus)
-minetest.register_craft({
-	output = 'quartz:chiseled 2',
-	recipe = {
-		{'quartz:slab_block', '', ''},
-		{'quartz:slab_block', '', ''},
-		{'', '', ''},
 	}
 })
 
@@ -153,49 +155,46 @@ minetest.register_abm({
 -- Compatibility with stairsplus
 --
 
-if minetest.get_modpath("moreblocks") and enable_stairsplus then
+if minetest.global_exists("stairsplus") then
-	register_stair_slab_panel_micro("quartz", "block", "quartz:block",
+	stairsplus:register_all("quartz", "block", "quartz:block", {
-		{cracky=3},
+		description = "Quartz Block",
-		{"quartz_block.png"},
+		tiles  = {"quartz_block.png"},
-		"Quartz Block",
+		groups = {cracky=3, oddly_breakable_by_hand=1},
-		"block",
+		sounds = default.node_sound_glass_defaults()
-		0
+	})
-	)
 
-	register_stair_slab_panel_micro("quartz", "chiseled", "quartz:chiseled",
+	stairsplus:register_all("quartz", "chiseled", "quartz:chiseled", {
-		{cracky=3},
+		description = "Chiseled Quartz",
-		{"quartz_chiseled.png"},
+		tiles  = {"quartz_chiseled.png"},
-		"Chiseled Quartz",
+		groups = {cracky=3, oddly_breakable_by_hand=1},
-		"chiseled",
+		sounds = default.node_sound_glass_defaults()
-		0
+	})
-	)
 
-	register_stair_slab_panel_micro("quartz", "pillar", "quartz:pillar",
+	stairsplus:register_all("quartz", "pillar", "quartz:pillar", {
-		{cracky=3},
+		description = "Quartz Pillar",
-		{"quartz_pillar_top.png", "quartz_pillar_top.png", "quartz_pillar_side.png"},
+		tiles  = {"quartz_pillar_top.png", "quartz_pillar_top.png",
-		"Quartz Pillar",
+			"quartz_pillar_side.png"},
-		"pillar",
+		groups = {cracky=3, oddly_breakable_by_hand=1},
-		0
+		sounds = default.node_sound_glass_defaults()
-	)
+	})
-
-	table.insert(circular_saw.known_stairs, "quartz:block")
-	table.insert(circular_saw.known_stairs, "quartz:chiseled")
-	table.insert(circular_saw.known_stairs, "quartz:pillar")
 end
 
 --
 -- Deprecated
 --
 
-if enable_horizontal_pillar then
+if settings:get_bool("ENABLE_HORIZONTAL_PILLAR") then
 	-- Quartz Pillar (horizontal)
 	minetest.register_node("quartz:pillar_horizontal", {
 			description = "Quartz Pillar Horizontal",
-			tiles = {"quartz_pillar_side.png", "quartz_pillar_side.png", "quartz_pillar_side.png^[transformR90",
+			tiles = {"quartz_pillar_side.png", "quartz_pillar_side.png",
-			"quartz_pillar_side.png^[transformR90", "quartz_pillar_top.png", "quartz_pillar_top.png"},
+				"quartz_pillar_side.png^[transformR90",
+				"quartz_pillar_side.png^[transformR90", "quartz_pillar_top.png",
+				"quartz_pillar_top.png"},
 			paramtype2 = "facedir",
 			drop = 'quartz:pillar',
-			groups = {cracky=3, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
+			groups = {cracky=3, oddly_breakable_by_hand=1,
+				not_in_creative_inventory=1},
 			sounds = default.node_sound_glass_defaults(),
 	})
 end

locale/quartz.es.tr

@@ -0,0 +1,19 @@
+# textdomain: quartz
+
+
+### init.lua ###
+
+Chiseled Quartz=Cuarzo cincelado
+Inner Quartz Pillar Stair=
+Inner Quartz Stair=
+Outer Quartz Pillar Stair=
+Outer Quartz Stair=
+Quartz Block=Bloque de cuarzo
+Quartz Crystal=Cristal de cuarzo
+Quartz Crystal Piece=Trozo de cristal de cuarzo
+Quartz Ore=Mineral de cuarzo
+Quartz Pillar=Pilar de cuarzo
+Quartz Pillar Slab=Losa de pilar de cuarzo
+Quartz Pillar Stair=Escaleras de pilar de cuarzo
+Quartz Slab=Losa de cuarzo
+Quartz Stair=Escaleras de cuarzo

locale/quartz.fr.tr

@@ -0,0 +1,19 @@
+# textdomain: quartz
+
+
+### init.lua ###
+
+Chiseled Quartz=Quartz ciselé
+Inner Quartz Pillar Stair=Escalier intérieur en pilier en quartz
+Inner Quartz Stair=Escalier intérieur en quartz
+Outer Quartz Pillar Stair=Escalier extérieur en pilier de quartz
+Outer Quartz Stair=Escalier extérieur en quartz
+Quartz Block=Bloc de quartz
+Quartz Crystal=Cristal de quartz
+Quartz Crystal Piece=Morceau de cristal de quartz
+Quartz Ore=Minerai de quartz
+Quartz Pillar=Pilier en quartz
+Quartz Pillar Slab=Dalle en pilier en quartz
+Quartz Pillar Stair=Escalier en pilier en quartz
+Quartz Slab=Dalle en quartz
+Quartz Stair=Escalier en quartz

locale/quartz.pt_BR.tr

@@ -0,0 +1,19 @@
+# textdomain: quartz
+
+
+### init.lua ###
+
+Chiseled Quartz=Quartzo Cinzelado
+Inner Quartz Pillar Stair=
+Inner Quartz Stair=
+Outer Quartz Pillar Stair=
+Outer Quartz Stair=
+Quartz Block=Bloco de Quartzo
+Quartz Crystal=Cristal de Quartzo
+Quartz Crystal Piece=Pedaço de Cristal de Quartzo
+Quartz Ore=Minério de Quartzo
+Quartz Pillar=Pilar de Quartzo
+Quartz Pillar Slab=Laje de Pilar de Quartzo
+Quartz Pillar Stair=Escada de Pilar de Quartzo
+Quartz Slab=Laje de quartzo
+Quartz Stair=Escada de quartzo

locale/template.txt

@@ -0,0 +1,19 @@
+# textdomain: quartz
+
+
+### init.lua ###
+
+Chiseled Quartz=
+Inner Quartz Pillar Stair=
+Inner Quartz Stair=
+Outer Quartz Pillar Stair=
+Outer Quartz Stair=
+Quartz Block=
+Quartz Crystal=
+Quartz Crystal Piece=
+Quartz Ore=
+Quartz Pillar=
+Quartz Pillar Slab=
+Quartz Pillar Stair=
+Quartz Slab=
+Quartz Stair=

mod.conf

@@ -0,0 +1,4 @@
+name             = quartz
+description      = Adds quartz ore and some decorative quartz blocks.
+depends          = default,stairs
+optional_depends = moreblocks,stairsplus

settings.txt

@@ -1,7 +1,7 @@
--- Set this to true to allow usage of the stairsplus mod in moreblocks
+# Set this to true to allow usage of the stairsplus mod in moreblocks
 
-enable_stairsplus = false
+ENABLE_STAIRSPLUS = false
 
--- This enables the old horizontal pillar block(deprecated, be sure to convert them back to normal pillars)
+# This enables the old horizontal pillar block(deprecated, be sure to convert them back to normal pillars)
 
-enable_horizontal_pillar = true
+ENABLE_HORIZONTAL_PILLAR = true