Move to MT 5.0.0 translation system

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

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", {

depends.txt

@@ -1,6 +1,5 @@
 default
 creative?
 sfinv?
-intllib?
 datastorage?
 farming?

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()

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"),
 

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

intllib.lua

@@ -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

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.

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", {

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 = {