Merge remote-tracking branch 'upstream/master'

dirt_monster.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 local dirt_types = {
 

dungeon_master.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 local master_types = {
 

fire_spirit.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 local mob_drops = {
 	{name = "fireflies:firefly", chance = 1, min = 1, max = 1}

init.lua

@@ -2,10 +2,32 @@
 -- Load support for intllib.
 local path = minetest.get_modpath(minetest.get_current_modname()) .. "/"
 
-local S = minetest.get_translator and minetest.get_translator("mobs_monster") or
-		dofile(path .. "intllib.lua")
+local S
 
-mobs.intllib = S
+-- Check for translation method
+local S
+if minetest.get_translator ~= nil then
+	S = minetest.get_translator("mobs_monster") -- 5.x translation function
+else
+	if minetest.get_modpath("intllib") then
+		dofile(minetest.get_modpath("intllib") .. "/init.lua")
+		if intllib.make_gettext_pair then
+			gettext, ngettext = intllib.make_gettext_pair() -- new gettext method
+		else
+			gettext = intllib.Getter() -- old text file method
+		end
+		S = gettext
+	else -- boilerplate function
+		S = function(str, ...)
+			local args = {...}
+			return str:gsub("@%d+", function(match)
+				return args[tonumber(match:sub(2))]
+			end)
+		end
+	end
+end
+
+mobs.intllib_monster = S
 
 
 -- Check for custom mob spawn file

intllib.lua

@@ -1,3 +0,0 @@
--- Support for the old multi-load method
-return dofile(minetest.get_modpath("intllib").."/init.lua")
-

land_guard.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 
 local guard_types = {

lava_flan.lua

@@ -1,6 +1,5 @@
 
-local S = mobs.intllib
-
+local S = mobs.intllib_monster
 
 -- Lava Flan by Zeg9 (additional textures by JurajVajda)
 

locale/mobs_monster.es.tr

@@ -0,0 +1,14 @@
+# textdomain:mobs_monster
+Cobweb=Telarania
+Dirt Monster=Mounstro de tierra
+Dungeon Master=Maestro de mazmorra
+Lava Flan=Flan de lava
+Lava Pickaxe=Hacha de lava
+Lava orb=Esfera de lava
+Mese Monster=Mounstro de mese
+#Obsidian Flan=
+Oerkki=Oerkki
+Sand Monster=Mounstro de arena
+Spider=Arania
+Stone Monster=Mounstro de piedra
+Tree Monster=Mounstro de madera

mese_monster.lua

@@ -1,6 +1,5 @@
 
-local S = mobs.intllib
-
+local S = mobs.intllib_monster
 
 -- Mese Monster by Zeg9
 

oerkki.lua

@@ -1,6 +1,5 @@
 
-local S = mobs.intllib
-
+local S = mobs.intllib_monster
 
 -- Oerkki by PilzAdam
 

sand_monster.lua

@@ -1,6 +1,5 @@
 
-local S = mobs.intllib
-
+local S = mobs.intllib_monster
 
 -- custom particle effects
 local effect = function(

spider.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 local get_velocity = function(self)
 

stone_monster.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 local stone_types = {
 

tree_monster.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 local tree_types = {