From d4ae151e47237189e295d2495c885a7a9d3d8251 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Tue, 25 Aug 2020 09:56:14 +0100
Subject: [PATCH] update translation detection

---
 depends.txt |  2 +-
 init.lua    |  9 ++++-----
 intllib.lua | 46 ++--------------------------------------------
 3 files changed, 7 insertions(+), 50 deletions(-)

diff --git a/depends.txt b/depends.txt
index 58b4e62..3168c5a 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,4 +1,4 @@
 default
 mobs
-intllib?
 lucky_block?
+intllib?
diff --git a/init.lua b/init.lua
index aa82703..241ad08 100644
--- a/init.lua
+++ b/init.lua
@@ -1,13 +1,11 @@
 
-local path = minetest.get_modpath("mobs_animal")
-
 -- Load support for intllib.
-local MP = minetest.get_modpath(minetest.get_current_modname())
-local S, NS = dofile(MP.."/intllib.lua")
+local path = minetest.get_modpath(minetest.get_current_modname())
+local S = minetest.get_translator and minetest.get_translator("mobs_animal") or
+		dofile(path .. "/intllib.lua")
 mobs.intllib = S
 
 -- Animals
-
 dofile(path .. "/chicken.lua") -- JKmurray
 dofile(path .. "/cow.lua") -- KrupnoPavel
 dofile(path .. "/rat.lua") -- PilzAdam
@@ -19,6 +17,7 @@ dofile(path .. "/kitten.lua") -- Jordach/BFD
 dofile(path .. "/penguin.lua") -- D00Med
 dofile(path .. "/panda.lua") -- AspireMint
 
+-- Lucky Blocks
 dofile(path .. "/lucky_block.lua")
 
 print (S("[MOD] Mobs Redo Animals loaded"))
diff --git a/intllib.lua b/intllib.lua
index 6669d72..adb0f88 100644
--- a/intllib.lua
+++ b/intllib.lua
@@ -1,45 +1,3 @@
+-- Support for the old multi-load method
+dofile(minetest.get_modpath("intllib").."/init.lua")
 
--- Fallback functions for when `intllib` is not installed.
--- Code released under Unlicense <http://unlicense.org>.
-
--- Get the latest version of this file at:
---   https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua
-
-local function format(str, ...)
-	local args = { ... }
-	local function repl(escape, open, num, close)
-		if escape == "" then
-			local replacement = tostring(args[tonumber(num)])
-			if open == "" then
-				replacement = replacement..close
-			end
-			return replacement
-		else
-			return "@"..open..num..close
-		end
-	end
-	return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl))
-end
-
-local gettext, ngettext
-if minetest.get_modpath("intllib") then
-	if intllib.make_gettext_pair then
-		-- New method using gettext.
-		gettext, ngettext = intllib.make_gettext_pair()
-	else
-		-- Old method using text files.
-		gettext = intllib.Getter()
-	end
-end
-
--- Fill in missing functions.
-
-gettext = gettext or function(msgid, ...)
-	return format(msgid, ...)
-end
-
-ngettext = ngettext or function(msgid, msgid_plural, n, ...)
-	return format(n==1 and msgid or msgid_plural, ...)
-end
-
-return gettext, ngettext