Merge pull request #2 from h4ml3t/development

2019-11-12
minetest-mods · Nov 23, 2019 · 78e74b0 · 78e74b0
2 parents 977350f + c993ded
commit 78e74b0
Show file tree

Hide file tree

Showing 24 changed files with 25 additions and 4 deletions.
diff --git a/default_shields.lua b/default_shields.lua
@@ -2,9 +2,21 @@ minetest.register_alias("castle:shield", "castle_shields:shield_1")
 minetest.register_alias("castle:shield_2", "castle_shields:shield_2")
 minetest.register_alias("castle:shield_3", "castle_shields:shield_3")
 
--- internationalization boilerplate
-local MP = minetest.get_modpath(minetest.get_current_modname())
-local S, NS = dofile(MP.."/intllib.lua")
+
+-- Used for localization, choose either built-in or intllib.
+
+local MP, S, NS = nil
+
+if (minetest.get_modpath("intllib") == nil) then
+	S = minetest.get_translator("castle_shields")
+
+else
+	-- internationalization boilerplate
+	MP = minetest.get_modpath(minetest.get_current_modname())
+	S, NS = dofile(MP.."/intllib.lua")
+
+end
+
 
 --The following colors are permitted:
 -- "black", "blue", "brown", "cyan", "dark_green", "dark_grey", "green", "grey", "magenta", "orange", "pink", "red", "violet", "white", "yellow"
@@ -15,4 +27,4 @@ local S, NS = dofile(MP.."/intllib.lua")
 
 castle_shields.register_shield("shield_1", S("Mounted Shield"), "red", "blue", "slash")
 castle_shields.register_shield("shield_2", S("Mounted Shield"), "cyan", "yellow", "chevron")
-castle_shields.register_shield("shield_3", S("Mounted Shield"), "grey", "green", "cross")
+castle_shields.register_shield("shield_3", S("Mounted Shield"), "grey", "green", "cross")
diff --git a/locale/castle_shields.it.tr b/locale/castle_shields.it.tr
@@ -0,0 +1,3 @@
+# textdomain:castle_shields
+
+Mounted Shield=Scudo appeso
diff --git a/locale/template.txt b/locale/template.txt
@@ -0,0 +1,3 @@
+# textdomain:castle_shields
+
+Mounted Shield=
diff --git a/mod.conf b/mod.conf
@@ -1 +1,4 @@
 name = castle_shields
+description = Adds decorative wall shields
+depends = default, dye
+optional_depends = intllib
diff --git a/screenshot.png b/screenshot.png
diff --git a/textures/castle_shield_back.png b/textures/castle_shield_back.png
diff --git a/textures/castle_shield_black.png b/textures/castle_shield_black.png
diff --git a/textures/castle_shield_blue.png b/textures/castle_shield_blue.png
diff --git a/textures/castle_shield_brown.png b/textures/castle_shield_brown.png
diff --git a/textures/castle_shield_cyan.png b/textures/castle_shield_cyan.png
diff --git a/textures/castle_shield_dark_green.png b/textures/castle_shield_dark_green.png
diff --git a/textures/castle_shield_dark_grey.png b/textures/castle_shield_dark_grey.png
diff --git a/textures/castle_shield_green.png b/textures/castle_shield_green.png
diff --git a/textures/castle_shield_grey.png b/textures/castle_shield_grey.png
diff --git a/textures/castle_shield_magenta.png b/textures/castle_shield_magenta.png
diff --git a/textures/castle_shield_mask_chevron.png b/textures/castle_shield_mask_chevron.png
diff --git a/textures/castle_shield_mask_cross.png b/textures/castle_shield_mask_cross.png
diff --git a/textures/castle_shield_mask_slash.png b/textures/castle_shield_mask_slash.png
diff --git a/textures/castle_shield_orange.png b/textures/castle_shield_orange.png
diff --git a/textures/castle_shield_pink.png b/textures/castle_shield_pink.png
diff --git a/textures/castle_shield_red.png b/textures/castle_shield_red.png
diff --git a/textures/castle_shield_violet.png b/textures/castle_shield_violet.png
diff --git a/textures/castle_shield_white.png b/textures/castle_shield_white.png
diff --git a/textures/castle_shield_yellow.png b/textures/castle_shield_yellow.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# textdomain:castle_shields

		Mounted Shield=Scudo appeso