Fix Inner/Outer Stairs translation (#13)

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

LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 EvergreenTree
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.txt

@@ -4,9 +4,18 @@
  | |_| | |_| | (_| | |  | |_ / /  | |  | | (_) | (_| |
   \__\_\\__,_|\__,_|_|   \__/___| |_|  |_|\___/ \__,_|
 
-
 This mod adds quartz ore and some decorative blocks to minetest.
 
+Version: 1.0.0
+License: MIT (see LICENSE.txt)
+
+Dependencies:
+default (found in minetest_game)
+stairs (found in minetest_game)
+moreblocks or stairsplus (optional, for stairsplus support)
+
+Please report bugs at the GitHub issue tracker:
+https://github.com/minetest-mods/quartz/issues/
 
 Crafting:
 
@@ -72,11 +81,5 @@ x|c|x
 -----
 x|x|x
 
-
+If you have stairsplus (or moreblocks) installed, you will be able to use
-License:
+circular saws to cut quartz blocks.
-
-CC BY-SA 3.0
-
-More info at http://creativecommons.org/licenses/by-sa/3.0/
-
-

depends.txt

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

init.lua

@@ -1,20 +1,28 @@
-dofile(minetest.get_modpath("quartz").."/settings.txt")
+local settings = Settings(minetest.get_modpath("quartz").."/settings.txt")
 
---Node Registration
+local S = minetest.get_translator("quartz")
+
+--
+--  Item Registration
+--
 
 --  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",
 })
 
+--
+-- Node Registration
+--
+
 --  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',
@@ -34,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(),
@@ -42,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(),
@@ -50,37 +58,42 @@ 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
 })
 
-
 -- Stairs & Slabs
 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
+--
 
 -- Quartz Crystal Piece
 minetest.register_craft({
@@ -102,20 +115,10 @@ 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', '', ''},
 		{'',             '',             ''},
 	}
 })
@@ -130,9 +133,13 @@ minetest.register_craft({
 	}
 })
 
---abms
+--
+-- ABMS
+--
+
 local dirs2 = {12, 9, 18, 7, 12}
 
+-- Replace all instances of the horizontal quartz pillar with the
 minetest.register_abm({
 	nodenames = {"quartz:pillar_horizontal"},
 	interval = 1,
@@ -144,47 +151,50 @@ minetest.register_abm({
 	end,
 })
 
---These are deprecated, don't use them
+--
+-- Compatibility with stairsplus
+--
 
-if enable_horizontal_pillar then
+if minetest.global_exists("stairsplus") then
-	--Quartz Pillar (horizontal)
+	stairsplus:register_all("quartz", "block", "quartz:block", {
-	minetest.register_node("quartz:pillar_horizontal", {
+		description = "Quartz Block",
-			description = "Quartz Pillar Horizontal",
+		tiles  = {"quartz_block.png"},
-			tiles = {"quartz_pillar_side.png", "quartz_pillar_side.png", "quartz_pillar_side.png^[transformR90",
+		groups = {cracky=3, oddly_breakable_by_hand=1},
-			"quartz_pillar_side.png^[transformR90", "quartz_pillar_top.png", "quartz_pillar_top.png"},
+		sounds = default.node_sound_glass_defaults()
-			paramtype2 = "facedir",
+	})
-			drop = 'quartz:pillar',
+
-			groups = {cracky=3, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
+	stairsplus:register_all("quartz", "chiseled", "quartz:chiseled", {
-			sounds = default.node_sound_glass_defaults(),
+		description = "Chiseled Quartz",
+		tiles  = {"quartz_chiseled.png"},
+		groups = {cracky=3, oddly_breakable_by_hand=1},
+		sounds = default.node_sound_glass_defaults()
+	})
+
+	stairsplus:register_all("quartz", "pillar", "quartz:pillar", {
+		description = "Quartz Pillar",
+		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()
 	})
 end
 
+--
+-- Deprecated
+--
 
---Compatibility with stairsplus
+if settings:get_bool("ENABLE_HORIZONTAL_PILLAR") then
-
+	-- Quartz Pillar (horizontal)
-if minetest.get_modpath("moreblocks") and enable_stairsplus then
+	minetest.register_node("quartz:pillar_horizontal", {
-	register_stair_slab_panel_micro("quartz", "block", "quartz:block",
+			description = "Quartz Pillar Horizontal",
-	{cracky=3},
+			tiles = {"quartz_pillar_side.png", "quartz_pillar_side.png",
-	{"quartz_block.png"},
+				"quartz_pillar_side.png^[transformR90",
-	"Quartz Block",
+				"quartz_pillar_side.png^[transformR90", "quartz_pillar_top.png",
-	"block",
+				"quartz_pillar_top.png"},
-	0)
+			paramtype2 = "facedir",
-	
+			drop = 'quartz:pillar',
-	register_stair_slab_panel_micro("quartz", "chiseled", "quartz:chiseled",
+			groups = {cracky=3, oddly_breakable_by_hand=1,
-	{cracky=3},
+				not_in_creative_inventory=1},
-	{"quartz_chiseled.png"},
+			sounds = default.node_sound_glass_defaults(),
-	"Chiseled Quartz",
+	})
-	"chiseled",
-	0)
-	
-	register_stair_slab_panel_micro("quartz", "pillar", "quartz:pillar",
-	{cracky=3},
-	{"quartz_pillar_top.png", "quartz_pillar_top.png", "quartz_pillar_side.png"},
-	"Quartz Pillar",
-	"pillar",
-	0)
-	
-	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

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