Browse Source

Fix incorrect upstream use of the NS function. Use intllib.lua as per intllib docs.

master
poikilos 3 years ago
parent
commit
4be56b9d6b
  1. 3
      Bucket_Game-branches/unified_inventory_recipe_fix-vs-211031/mods/codercore/api.lua
  2. 1
      Bucket_Game-branches/unified_inventory_recipe_fix-vs-211031/mods/codercore/depends.txt
  3. 3
      Bucket_Game-branches/unified_inventory_recipe_fix-vs-211031/mods/codercore/group.lua
  4. 3
      Bucket_Game-branches/unified_inventory_recipe_fix-vs-211031/mods/codercore/internal.lua
  5. 45
      Bucket_Game-branches/unified_inventory_recipe_fix-vs-211031/mods/codercore/intllib.lua
  6. 9
      Bucket_Game-branches/unified_inventory_recipe_fix-vs-211031/mods/codercore/register.lua

3
Bucket_Game-branches/unified_inventory_recipe_fix-vs-211031/mods/codercore/api.lua

@ -1,4 +1,5 @@
local S = function (str) return str end
local modpath = minetest.get_modpath("unified_inventory")
local S, NS = dofile(modpath .. "/intllib.lua")
local F = minetest.formspec_escape
-- Create detached creative inventory after loading all mods

1
Bucket_Game-branches/unified_inventory_recipe_fix-vs-211031/mods/codercore/depends.txt

@ -4,3 +4,4 @@ sfinv?
datastorage?
farming?
ocsethome?
intllib?

3
Bucket_Game-branches/unified_inventory_recipe_fix-vs-211031/mods/codercore/group.lua

@ -1,4 +1,5 @@
local S = function (str) return str end
local modpath = minetest.get_modpath("unified_inventory")
local S, NS = dofile(modpath .. "/intllib.lua")
function unified_inventory.canonical_item_spec_matcher(spec)
local specname = ItemStack(spec):get_name()

3
Bucket_Game-branches/unified_inventory_recipe_fix-vs-211031/mods/codercore/internal.lua

@ -1,4 +1,5 @@
local S = function (str) return str end
local modpath = minetest.get_modpath("unified_inventory")
local S, NS = dofile(modpath .. "/intllib.lua")
local F = minetest.formspec_escape
-- This pair of encoding functions is used where variable text must go in

45
Bucket_Game-branches/unified_inventory_recipe_fix-vs-211031/mods/codercore/intllib.lua

@ -0,0 +1,45 @@
-- 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("unified_inventory")
else
-- Old method using text files.
gettext = intllib.Getter("unified_inventory")
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

9
Bucket_Game-branches/unified_inventory_recipe_fix-vs-211031/mods/codercore/register.lua

@ -1,5 +1,6 @@
local S = function (str) return str end
local NS = function(s) return s end
local modpath = minetest.get_modpath("unified_inventory")
local S, NS = dofile(modpath .. "/intllib.lua")
-- NS = S
local F = minetest.formspec_escape
minetest.register_privilege("creative", {
@ -233,8 +234,8 @@ local function stack_image_button(x, y, w, h, buttonname_prefix, item)
end
local recipe_text = {
recipe = NS("Recipe @1 of @2"),
usage = NS("Usage @1 of @2"),
recipe = S("Recipe @1 of @2"),
usage = S("Usage @1 of @2"),
}
local no_recipe_text = {
recipe = S("No recipes"),

Loading…
Cancel
Save