From 98617ac0754c5244a7d8bb36402cb15184df4ac0 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Tue, 25 Aug 2020 09:44:26 +0100
Subject: [PATCH 1/2] use translation from api

---
 depends.txt |  1 -
 init.lua    |  5 +----
 intllib.lua | 45 ---------------------------------------------
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 intllib.lua

diff --git a/depends.txt b/depends.txt
index 5ccba0d..0dc5ef3 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,3 +1,2 @@
 mobs
 lucky_block?
-intllib?
diff --git a/init.lua b/init.lua
index 88d6277..170f374 100644
--- a/init.lua
+++ b/init.lua
@@ -1,8 +1,5 @@
 
--- intllib
-local MP = minetest.get_modpath(minetest.get_current_modname())
-local S, NS = dofile(MP .. "/intllib.lua")
-
+local S = mobs.intllib
 
 -- 0.4.17 or 5.0 check
 local y_off = 20
diff --git a/intllib.lua b/intllib.lua
deleted file mode 100644
index 6669d72..0000000
--- a/intllib.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-
--- 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

From 4d38b1b2331b550a7f7a6624d7e6d2e8ae88cf9a Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Tue, 25 Aug 2020 09:54:28 +0100
Subject: [PATCH 2/2] update translation detection

---
 depends.txt | 1 +
 init.lua    | 7 ++++---
 intllib.lua | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 intllib.lua

diff --git a/depends.txt b/depends.txt
index 0dc5ef3..5ccba0d 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,2 +1,3 @@
 mobs
 lucky_block?
+intllib?
diff --git a/init.lua b/init.lua
index 170f374..65d70fc 100644
--- a/init.lua
+++ b/init.lua
@@ -1,5 +1,8 @@
 
-local S = mobs.intllib
+-- Load support for intllib.
+local MP = minetest.get_modpath(minetest.get_current_modname())
+local S = minetest.get_translator and minetest.get_translator("mob_horse") or
+		dofile(MP .. "/intllib.lua")
 
 -- 0.4.17 or 5.0 check
 local y_off = 20
@@ -15,9 +18,7 @@ local shoes = {
 	["mobs:horseshoe_diamond"] = {10, 6, 6, "mobs_horseshoe_diamondo.png"}
 }
 
-
 -- rideable horse
-
 mobs:register_mob("mob_horse:horse", {
 	type = "animal",
 	visual = "mesh",
diff --git a/intllib.lua b/intllib.lua
new file mode 100644
index 0000000..adb0f88
--- /dev/null
+++ b/intllib.lua
@@ -0,0 +1,3 @@
+-- Support for the old multi-load method
+dofile(minetest.get_modpath("intllib").."/init.lua")
+