diff --git a/init.lua b/init.lua index 7a434a5..753a425 100644 --- a/init.lua +++ b/init.lua @@ -1,8 +1,8 @@ --- intllib +-- Load support for intllib. local MP = minetest.get_modpath(minetest.get_current_modname()) -local S, NS = dofile(MP .. "/intllib.lua") - +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 @@ -18,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 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 . - --- 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