From 8996ad27d8cea20e46851c48c529dc8d3d716c4c Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 20 Jan 2022 08:57:36 +0000 Subject: [PATCH] update translation checks --- init.lua | 28 ++++++++++++++++++++++++++-- intllib.lua | 3 --- 2 files changed, 26 insertions(+), 5 deletions(-) delete mode 100644 intllib.lua diff --git a/init.lua b/init.lua index f43dc01..21adc81 100644 --- a/init.lua +++ b/init.lua @@ -1,8 +1,29 @@ -- 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") + +-- Check for translation method +local S +if minetest.get_translator ~= nil then + S = minetest.get_translator("mob_horse") -- 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 -- 0.4.17 or 5.0 check @@ -348,3 +369,6 @@ lucky_block:add_blocks({ }) end + + +print("[MOD] Mob Horse loaded") diff --git a/intllib.lua b/intllib.lua deleted file mode 100644 index 7decdf7..0000000 --- a/intllib.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Support for the old multi-load method -return dofile(minetest.get_modpath("intllib").."/init.lua") -