From 53272617184bbe3cca16101e14c4e4f3ea54467e Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Thu, 19 Sep 2019 14:00:26 +0200
Subject: [PATCH] Move to MT 5.0.0 translation system

---
 api.lua       |  2 +-
 bags.lua      |  2 +-
 depends.txt   |  1 -
 group.lua     |  2 +-
 init.lua      |  6 ------
 internal.lua  |  2 +-
 intllib.lua   | 45 ---------------------------------------------
 mod.conf      |  2 +-
 register.lua  |  2 +-
 waypoints.lua |  2 +-
 10 files changed, 7 insertions(+), 59 deletions(-)
 delete mode 100644 intllib.lua

diff --git a/api.lua b/api.lua
index 3ec17ec..7cf8f4a 100644
--- a/api.lua
+++ b/api.lua
@@ -1,4 +1,4 @@
-local S = unified_inventory.gettext
+local S = minetest.get_translator("unified_inventory")
 local F = minetest.formspec_escape
 
 -- Create detached creative inventory after loading all mods
diff --git a/bags.lua b/bags.lua
index 02858c5..1ebbdd3 100644
--- a/bags.lua
+++ b/bags.lua
@@ -5,7 +5,7 @@ Copyright (c) 2012 cornernote, Brett O'Donnell <cornernote@gmail.com>
 License: GPLv3
 --]]
 
-local S = unified_inventory.gettext
+local S = minetest.get_translator("unified_inventory")
 local F = minetest.formspec_escape
 
 unified_inventory.register_page("bags", {
diff --git a/depends.txt b/depends.txt
index 20eb8b0..cb3d2b4 100644
--- a/depends.txt
+++ b/depends.txt
@@ -1,6 +1,5 @@
 default
 creative?
 sfinv?
-intllib?
 datastorage?
 farming?
diff --git a/group.lua b/group.lua
index c7e09be..3864267 100644
--- a/group.lua
+++ b/group.lua
@@ -1,4 +1,4 @@
-local S = unified_inventory.gettext
+local S = minetest.get_translator("unified_inventory")
 
 function unified_inventory.canonical_item_spec_matcher(spec)
 	local specname = ItemStack(spec):get_name()
diff --git a/init.lua b/init.lua
index 1c73fad..fcbcf3d 100644
--- a/init.lua
+++ b/init.lua
@@ -3,9 +3,6 @@
 local modpath = minetest.get_modpath(minetest.get_current_modname())
 local worldpath = minetest.get_worldpath()
 
--- Intllib
-local S, NS = dofile(modpath .. "/intllib.lua")
-
 -- Data tables definitions
 unified_inventory = {
 	activefilter = {},
@@ -33,9 +30,6 @@ unified_inventory = {
 	-- Default inventory page
 	default = "craft",
 
-	-- intllib
-	gettext = S,
-
 	-- "Lite" mode
 	lite_mode = minetest.settings:get_bool("unified_inventory_lite"),
 
diff --git a/internal.lua b/internal.lua
index 0f7fa34..07ac530 100644
--- a/internal.lua
+++ b/internal.lua
@@ -1,4 +1,4 @@
-local S = unified_inventory.gettext
+local S = minetest.get_translator("unified_inventory")
 local F = minetest.formspec_escape
 
 -- This pair of encoding functions is used where variable text must go in
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
diff --git a/mod.conf b/mod.conf
index e22e595..4fe3375 100644
--- a/mod.conf
+++ b/mod.conf
@@ -1,4 +1,4 @@
 name = unified_inventory
 depends = default
-optional_depends = creative, sfinv, intllib, datastorage, farming
+optional_depends = creative, sfinv, datastorage, farming
 description = Unified Inventory replaces the default survival and creative inventory. It adds a nicer interface and a number of features, such as a crafting guide.
diff --git a/register.lua b/register.lua
index a61a4e9..b197ded 100644
--- a/register.lua
+++ b/register.lua
@@ -1,4 +1,4 @@
-local S = unified_inventory.gettext
+local S = minetest.get_translator("unified_inventory")
 local F = minetest.formspec_escape
 
 minetest.register_privilege("creative", {
diff --git a/waypoints.lua b/waypoints.lua
index b6b729c..fb9746d 100644
--- a/waypoints.lua
+++ b/waypoints.lua
@@ -1,4 +1,4 @@
-local S = unified_inventory.gettext
+local S = minetest.get_translator("unified_inventory")
 local F = minetest.formspec_escape
 
 local hud_colors = {