diff --git a/mods/lord/Blocks/campfire/campfire.lua b/mods/lord/Blocks/campfire/campfire.lua index c8892b520..8a7598ce2 100644 --- a/mods/lord/Blocks/campfire/campfire.lua +++ b/mods/lord/Blocks/campfire/campfire.lua @@ -16,7 +16,7 @@ - You can craft and use better campfire. ]]-- -local S = minetest.get_translator("campfire") +local S = minetest.get_mod_translator() -- VARIABLES local campfire_cooking = 1; -- nil - not cooked, 1 - cooked diff --git a/mods/lord/Blocks/castle/arrowslit.lua b/mods/lord/Blocks/castle/arrowslit.lua index 72d615048..6ab337aa3 100644 --- a/mods/lord/Blocks/castle/arrowslit.lua +++ b/mods/lord/Blocks/castle/arrowslit.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("castle") +local S = minetest.get_mod_translator() minetest.register_alias("castle:arrowslit", "castle:arrowslit_stonewall") diff --git a/mods/lord/Blocks/castle/init.lua b/mods/lord/Blocks/castle/init.lua index 45408948c..1dbe21b39 100644 --- a/mods/lord/Blocks/castle/init.lua +++ b/mods/lord/Blocks/castle/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("castle") +local S = minetest.get_mod_translator() castle = {} -- namespace diff --git a/mods/lord/Blocks/castle/jailbars.lua b/mods/lord/Blocks/castle/jailbars.lua index 6beecf5a3..9802339e6 100644 --- a/mods/lord/Blocks/castle/jailbars.lua +++ b/mods/lord/Blocks/castle/jailbars.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("castle") +local S = minetest.get_mod_translator() -- xjailbarss mod by xyz diff --git a/mods/lord/Blocks/castle/murder_hole.lua b/mods/lord/Blocks/castle/murder_hole.lua index c6cb4ce71..fd0d506a2 100644 --- a/mods/lord/Blocks/castle/murder_hole.lua +++ b/mods/lord/Blocks/castle/murder_hole.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("castle") +local S = minetest.get_mod_translator() local hole = {} diff --git a/mods/lord/Blocks/castle/pillars.lua b/mods/lord/Blocks/castle/pillars.lua index 779577787..467f8c40e 100644 --- a/mods/lord/Blocks/castle/pillars.lua +++ b/mods/lord/Blocks/castle/pillars.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("castle") +local S = minetest.get_mod_translator() minetest.register_alias("castle:pillars_bottom", "castle:pillars_stonewall_bottom") minetest.register_alias("castle:pillars_top", "castle:pillars_stonewall_top") diff --git a/mods/lord/Blocks/castle/rope.lua b/mods/lord/Blocks/castle/rope.lua index 05799d833..01c49493b 100644 --- a/mods/lord/Blocks/castle/rope.lua +++ b/mods/lord/Blocks/castle/rope.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("castle") +local S = minetest.get_mod_translator() minetest.register_node("castle:ropes",{ description = S("Rope"), diff --git a/mods/lord/Blocks/castle/shields_decor.lua b/mods/lord/Blocks/castle/shields_decor.lua index 773d15264..11c18ad8f 100644 --- a/mods/lord/Blocks/castle/shields_decor.lua +++ b/mods/lord/Blocks/castle/shields_decor.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("castle") +local S = minetest.get_mod_translator() minetest.register_node("castle:shield", { description = S("Mounted Shield"), diff --git a/mods/lord/Blocks/castle/tapestry.lua b/mods/lord/Blocks/castle/tapestry.lua index 07c90c3a1..b6f9d38e3 100644 --- a/mods/lord/Blocks/castle/tapestry.lua +++ b/mods/lord/Blocks/castle/tapestry.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("castle") +local S = minetest.get_mod_translator() local function register_tapestry_top(node_name, craft_from, description_material, texture) diff --git a/mods/lord/Blocks/castle/town_item.lua b/mods/lord/Blocks/castle/town_item.lua index 3c207ec6f..dbb0d2872 100644 --- a/mods/lord/Blocks/castle/town_item.lua +++ b/mods/lord/Blocks/castle/town_item.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("castle") +local S = minetest.get_mod_translator() minetest.register_alias("darkage:box", "castle:crate") diff --git a/mods/lord/Blocks/christmas/init.lua b/mods/lord/Blocks/christmas/init.lua index 4f9f339cb..69668a61d 100644 --- a/mods/lord/Blocks/christmas/init.lua +++ b/mods/lord/Blocks/christmas/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("christmas") +local S = minetest.get_mod_translator() local mod_path = minetest.get_modpath(minetest.get_current_modname()) local require = function(name) return dofile(mod_path .. "/" .. name:gsub("%.", "/") .. ".lua") end diff --git a/mods/lord/Blocks/christmas/tree_nodes.lua b/mods/lord/Blocks/christmas/tree_nodes.lua index 546215058..b9dd25166 100644 --- a/mods/lord/Blocks/christmas/tree_nodes.lua +++ b/mods/lord/Blocks/christmas/tree_nodes.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("christmas") +local S = minetest.get_mod_translator() --- @param pos Position diff --git a/mods/lord/Blocks/clan_node/src/chest/node.lua b/mods/lord/Blocks/clan_node/src/chest/node.lua index b22a6b691..89307008a 100644 --- a/mods/lord/Blocks/clan_node/src/chest/node.lua +++ b/mods/lord/Blocks/clan_node/src/chest/node.lua @@ -2,7 +2,7 @@ local Form = require("chest.node.Form") -local S = minetest.get_translator('clan_node') +local S = minetest.get_mod_translator() ---@type number @seconds diff --git a/mods/lord/Blocks/clan_node/src/chest/node/Form.lua b/mods/lord/Blocks/clan_node/src/chest/node/Form.lua index dc9dccacd..f747fe27e 100644 --- a/mods/lord/Blocks/clan_node/src/chest/node/Form.lua +++ b/mods/lord/Blocks/clan_node/src/chest/node/Form.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator('clan_node') +local S = minetest.get_mod_translator() --- --- @class clan_node.chest.node.Form: base_classes.Form.Base diff --git a/mods/lord/Blocks/clans_tapestries/init.lua b/mods/lord/Blocks/clans_tapestries/init.lua index e4050f700..ce25f913a 100644 --- a/mods/lord/Blocks/clans_tapestries/init.lua +++ b/mods/lord/Blocks/clans_tapestries/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("clans_tapestries") +local S = minetest.get_mod_translator() castle.tapestry.register( "clans_tapestries:example", diff --git a/mods/lord/Blocks/clay_types/init.lua b/mods/lord/Blocks/clay_types/init.lua index f3b6e8510..45a72ad0c 100644 --- a/mods/lord/Blocks/clay_types/init.lua +++ b/mods/lord/Blocks/clay_types/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() -- Chamotte diff --git a/mods/lord/Blocks/grinder/src/grinder/Grinder.lua b/mods/lord/Blocks/grinder/src/grinder/Grinder.lua index 01441c93e..2a3ca5209 100644 --- a/mods/lord/Blocks/grinder/src/grinder/Grinder.lua +++ b/mods/lord/Blocks/grinder/src/grinder/Grinder.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("grinder") +local SL = minetest.get_mod_translator() local form = require('grinder.definition.node.form') --- @type string diff --git a/mods/lord/Blocks/grinder/src/grinder/definition/craft.lua b/mods/lord/Blocks/grinder/src/grinder/definition/craft.lua index 64852015e..0cebd3b82 100644 --- a/mods/lord/Blocks/grinder/src/grinder/definition/craft.lua +++ b/mods/lord/Blocks/grinder/src/grinder/definition/craft.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("grinder") +local SL = minetest.get_mod_translator() return { recipes = { diff --git a/mods/lord/Blocks/grinder/src/grinder/definition/node/active.lua b/mods/lord/Blocks/grinder/src/grinder/definition/node/active.lua index cfecc01e3..4cd73438a 100644 --- a/mods/lord/Blocks/grinder/src/grinder/definition/node/active.lua +++ b/mods/lord/Blocks/grinder/src/grinder/definition/node/active.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("grinder") +local SL = minetest.get_mod_translator() local form = require('grinder.definition.node.form') diff --git a/mods/lord/Blocks/grinder/src/grinder/definition/node/inactive.lua b/mods/lord/Blocks/grinder/src/grinder/definition/node/inactive.lua index ec5addaba..d81fdde99 100644 --- a/mods/lord/Blocks/grinder/src/grinder/definition/node/inactive.lua +++ b/mods/lord/Blocks/grinder/src/grinder/definition/node/inactive.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("grinder") +local SL = minetest.get_mod_translator() local form = require('grinder.definition.node.form') diff --git a/mods/lord/Blocks/lamps/init.lua b/mods/lord/Blocks/lamps/init.lua index 20a7648e9..d69085f85 100644 --- a/mods/lord/Blocks/lamps/init.lua +++ b/mods/lord/Blocks/lamps/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lamps") +local S = minetest.get_mod_translator() local chains = {} diff --git a/mods/lord/Blocks/lord_artisan_benches/src/artisan_benches/anvil.lua b/mods/lord/Blocks/lord_artisan_benches/src/artisan_benches/anvil.lua index 23a75d7f9..24a182f05 100644 --- a/mods/lord/Blocks/lord_artisan_benches/src/artisan_benches/anvil.lua +++ b/mods/lord/Blocks/lord_artisan_benches/src/artisan_benches/anvil.lua @@ -1,7 +1,7 @@ local Form = require("artisan_benches.anvil.Form") -local S = minetest.get_translator('lord_artisan_benches') +local S = minetest.get_mod_translator() minetest.CraftMethod.ANVIL = 'anvil' minetest.register_craft_method(minetest.CraftMethod.ANVIL) diff --git a/mods/lord/Blocks/lord_artisan_benches/src/artisan_benches/workbench.lua b/mods/lord/Blocks/lord_artisan_benches/src/artisan_benches/workbench.lua index ec65d75b3..0e483c826 100644 --- a/mods/lord/Blocks/lord_artisan_benches/src/artisan_benches/workbench.lua +++ b/mods/lord/Blocks/lord_artisan_benches/src/artisan_benches/workbench.lua @@ -1,7 +1,7 @@ -- luacheck:ignore 561 -- Отключена проверка на цикломатическую сложность, поскольку -- mods/lord/Blocks/castle/town_item.lua:152:20: cyclomatic complexity of function get_recipe is too high (14 > 10) -local S = minetest.get_translator('lord_artisan_benches') +local S = minetest.get_mod_translator() minetest.register_alias('castle:workbench', 'lord_artisan_benches:workbench') diff --git a/mods/lord/Blocks/lord_beds/init.lua b/mods/lord/Blocks/lord_beds/init.lua index 374a4ea98..03e22441f 100644 --- a/mods/lord/Blocks/lord_beds/init.lua +++ b/mods/lord/Blocks/lord_beds/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_beds") +local S = minetest.get_mod_translator() beds.day_interval.finish = 0.790 -- reduced a bit diff --git a/mods/lord/Blocks/lord_blocks/init.lua b/mods/lord/Blocks/lord_blocks/init.lua index 6c1a72e4d..9860511b9 100644 --- a/mods/lord/Blocks/lord_blocks/init.lua +++ b/mods/lord/Blocks/lord_blocks/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_blocks") +local S = minetest.get_mod_translator() minetest.register_node("lord_blocks:blackout", { description = S("Blackout"), diff --git a/mods/lord/Blocks/lord_bricks/src/bricks.lua b/mods/lord/Blocks/lord_bricks/src/bricks.lua index 3f80c41f5..aba944078 100644 --- a/mods/lord/Blocks/lord_bricks/src/bricks.lua +++ b/mods/lord/Blocks/lord_bricks/src/bricks.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() require('bricks.rock') diff --git a/mods/lord/Blocks/lord_bricks/src/bricks/chamotte.lua b/mods/lord/Blocks/lord_bricks/src/bricks/chamotte.lua index d70f1d6c4..ea3fc151f 100644 --- a/mods/lord/Blocks/lord_bricks/src/bricks/chamotte.lua +++ b/mods/lord/Blocks/lord_bricks/src/bricks/chamotte.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() -- Items diff --git a/mods/lord/Blocks/lord_bricks/src/bricks/mordor.lua b/mods/lord/Blocks/lord_bricks/src/bricks/mordor.lua index 8a7fc8000..53d5f7f2a 100644 --- a/mods/lord/Blocks/lord_bricks/src/bricks/mordor.lua +++ b/mods/lord/Blocks/lord_bricks/src/bricks/mordor.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() -- Items diff --git a/mods/lord/Blocks/lord_bricks/src/bricks/rock.lua b/mods/lord/Blocks/lord_bricks/src/bricks/rock.lua index 58fee95a8..f9e49c62e 100644 --- a/mods/lord/Blocks/lord_bricks/src/bricks/rock.lua +++ b/mods/lord/Blocks/lord_bricks/src/bricks/rock.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() for node_name, registration in pairs(rocks.get_lord_nodes()) do diff --git a/mods/lord/Blocks/lord_default/init.lua b/mods/lord/Blocks/lord_default/init.lua index f1c3dabdf..2549f132c 100644 --- a/mods/lord/Blocks/lord_default/init.lua +++ b/mods/lord/Blocks/lord_default/init.lua @@ -1,5 +1,5 @@ -local S = minetest.get_translator("lord_default") +local S = minetest.get_mod_translator() minetest.register_craftitem(":default:scorched_stuff", { diff --git a/mods/lord/Blocks/lord_doors/init.lua b/mods/lord/Blocks/lord_doors/init.lua index dafb51207..19d285957 100644 --- a/mods/lord/Blocks/lord_doors/init.lua +++ b/mods/lord/Blocks/lord_doors/init.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_doors") +local SL = minetest.get_mod_translator() doors.register("lord_doors:door_gondor", { tiles = {{ name = "lord_doors_gondor.png", backface_culling = true }}, diff --git a/mods/lord/Blocks/lord_doors/mtg.lua b/mods/lord/Blocks/lord_doors/mtg.lua index 9c6a06605..d18762c2c 100644 --- a/mods/lord/Blocks/lord_doors/mtg.lua +++ b/mods/lord/Blocks/lord_doors/mtg.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_doors") +local S = minetest.get_mod_translator() local function register_replace_mtg_doors_legacy_lbm(name) diff --git a/mods/lord/Blocks/lord_doors/race_doors.lua b/mods/lord/Blocks/lord_doors/race_doors.lua index 07185a3fd..a79d91b1e 100644 --- a/mods/lord/Blocks/lord_doors/race_doors.lua +++ b/mods/lord/Blocks/lord_doors/race_doors.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_doors") +local S = minetest.get_mod_translator() --- Обработчик on_rightclick для расовых дверей. diff --git a/mods/lord/Blocks/lord_flowers/init.lua b/mods/lord/Blocks/lord_flowers/init.lua index 46fc066c9..de7a315a9 100644 --- a/mods/lord/Blocks/lord_flowers/init.lua +++ b/mods/lord/Blocks/lord_flowers/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_flowers") +local S = minetest.get_mod_translator() minetest.register_node(":flowers:cactus_decor", { description = S("Cactus decorative"), diff --git a/mods/lord/Blocks/lord_ground/src/ground/api/dirt.lua b/mods/lord/Blocks/lord_ground/src/ground/api/dirt.lua index 5399d930e..da7724337 100644 --- a/mods/lord/Blocks/lord_ground/src/ground/api/dirt.lua +++ b/mods/lord/Blocks/lord_ground/src/ground/api/dirt.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_ground") +local S = minetest.get_mod_translator() local dirt = { --- @type table|NodeDefinition[] diff --git a/mods/lord/Blocks/lord_ground/src/ground/api/sand.lua b/mods/lord/Blocks/lord_ground/src/ground/api/sand.lua index 920578043..75ef80c19 100644 --- a/mods/lord/Blocks/lord_ground/src/ground/api/sand.lua +++ b/mods/lord/Blocks/lord_ground/src/ground/api/sand.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_ground") +local S = minetest.get_mod_translator() local sand = { --- @type table|NodeDefinition[] diff --git a/mods/lord/Blocks/lord_homedecor/armchairs.lua b/mods/lord/Blocks/lord_homedecor/armchairs.lua index 477a0dfeb..70ffec7d6 100644 --- a/mods/lord/Blocks/lord_homedecor/armchairs.lua +++ b/mods/lord/Blocks/lord_homedecor/armchairs.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_homedecor") +local SL = minetest.get_mod_translator() local armchair_cbox = { type = "fixed", diff --git a/mods/lord/Blocks/lord_homedecor/building_blocks.lua b/mods/lord/Blocks/lord_homedecor/building_blocks.lua index 620c61de6..89f052955 100644 --- a/mods/lord/Blocks/lord_homedecor/building_blocks.lua +++ b/mods/lord/Blocks/lord_homedecor/building_blocks.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_homedecor") +local SL = minetest.get_mod_translator() minetest.register_node("lord_homedecor:Adobe", { tiles = {"building_blocks_Adobe.png"}, diff --git a/mods/lord/Blocks/lord_homedecor/coffeetable.lua b/mods/lord/Blocks/lord_homedecor/coffeetable.lua index 3e041b7f3..021287a57 100644 --- a/mods/lord/Blocks/lord_homedecor/coffeetable.lua +++ b/mods/lord/Blocks/lord_homedecor/coffeetable.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_homedecor") +local SL = minetest.get_mod_translator() minetest.register_node("lord_homedecor:coffeetable_back", { description = SL("Coffee Table"), diff --git a/mods/lord/Blocks/lord_homedecor/crafts.lua b/mods/lord/Blocks/lord_homedecor/crafts.lua index 281a8520f..e460605c3 100644 --- a/mods/lord/Blocks/lord_homedecor/crafts.lua +++ b/mods/lord/Blocks/lord_homedecor/crafts.lua @@ -2,7 +2,7 @@ -- -- Mostly my own code; overall template borrowed from game default -local S = minetest.get_translator("lord_homedecor") +local S = minetest.get_mod_translator() -- misc craftitems diff --git a/mods/lord/Blocks/lord_homedecor/endtable.lua b/mods/lord/Blocks/lord_homedecor/endtable.lua index 921391a20..e2cf20321 100644 --- a/mods/lord/Blocks/lord_homedecor/endtable.lua +++ b/mods/lord/Blocks/lord_homedecor/endtable.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_homedecor") +local SL = minetest.get_mod_translator() minetest.register_node("lord_homedecor:endtable", { description = SL("End Table"), diff --git a/mods/lord/Blocks/lord_homedecor/exterior.lua b/mods/lord/Blocks/lord_homedecor/exterior.lua index 26a16b72c..688770e16 100644 --- a/mods/lord/Blocks/lord_homedecor/exterior.lua +++ b/mods/lord/Blocks/lord_homedecor/exterior.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_homedecor") +local SL = minetest.get_mod_translator() local bl1_sbox = { type = "fixed", diff --git a/mods/lord/Blocks/lord_homedecor/furniture_medieval.lua b/mods/lord/Blocks/lord_homedecor/furniture_medieval.lua index 48f480477..0693342f2 100644 --- a/mods/lord/Blocks/lord_homedecor/furniture_medieval.lua +++ b/mods/lord/Blocks/lord_homedecor/furniture_medieval.lua @@ -1,5 +1,5 @@ -local S = minetest.get_translator("lord_homedecor") +local S = minetest.get_mod_translator() lord_homedecor.register("bars", { description = S("Bars"), diff --git a/mods/lord/Blocks/lord_homedecor/handlers/expansion.lua b/mods/lord/Blocks/lord_homedecor/handlers/expansion.lua index 1792e9d87..464d26616 100644 --- a/mods/lord/Blocks/lord_homedecor/handlers/expansion.lua +++ b/mods/lord/Blocks/lord_homedecor/handlers/expansion.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_homedecor") +local S = minetest.get_mod_translator() -- vectors to place one node next to or behind another diff --git a/mods/lord/Blocks/lord_homedecor/handlers/furnaces.lua b/mods/lord/Blocks/lord_homedecor/handlers/furnaces.lua index e00513234..44106f9c1 100644 --- a/mods/lord/Blocks/lord_homedecor/handlers/furnaces.lua +++ b/mods/lord/Blocks/lord_homedecor/handlers/furnaces.lua @@ -1,6 +1,6 @@ -- This code supplies an oven/stove. Basically it's just a copy of the default furnace with different textures. -local SL = minetest.get_translator("lord_homedecor") +local SL = minetest.get_mod_translator() local function swap_node(pos, name) local node = minetest.get_node(pos) diff --git a/mods/lord/Blocks/lord_homedecor/handlers/inventory.lua b/mods/lord/Blocks/lord_homedecor/handlers/inventory.lua index 3d66f35c3..fe5b9d3a5 100644 --- a/mods/lord/Blocks/lord_homedecor/handlers/inventory.lua +++ b/mods/lord/Blocks/lord_homedecor/handlers/inventory.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_homedecor") +local S = minetest.get_mod_translator() local default_can_dig = function(pos,player) local meta = minetest.get_meta(pos) diff --git a/mods/lord/Blocks/lord_homedecor/init.lua b/mods/lord/Blocks/lord_homedecor/init.lua index 301d21f31..8f7a1effb 100644 --- a/mods/lord/Blocks/lord_homedecor/init.lua +++ b/mods/lord/Blocks/lord_homedecor/init.lua @@ -1,7 +1,7 @@ -- Minetest 0.4 mod: lord_homedecor -- See README.txt for licensing and other information. -local SL = minetest.get_translator("lord_homedecor") +local SL = minetest.get_mod_translator() local modpath = minetest.get_modpath("lord_homedecor") -- Definitions made by this mod that other mods can use too diff --git a/mods/lord/Blocks/lord_homedecor/lighting.lua b/mods/lord/Blocks/lord_homedecor/lighting.lua index b3d1ba741..39f4558bc 100644 --- a/mods/lord/Blocks/lord_homedecor/lighting.lua +++ b/mods/lord/Blocks/lord_homedecor/lighting.lua @@ -1,7 +1,7 @@ -- This file supplies glowlights -local S = minetest.get_translator("lord_homedecor") +local S = minetest.get_mod_translator() local tc_cbox = { diff --git a/mods/lord/Blocks/lord_homedecor/longsofas.lua b/mods/lord/Blocks/lord_homedecor/longsofas.lua index 29e585abb..ae618feb7 100644 --- a/mods/lord/Blocks/lord_homedecor/longsofas.lua +++ b/mods/lord/Blocks/lord_homedecor/longsofas.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_homedecor") +local SL = minetest.get_mod_translator() local longsofa_sbox = { type = "fixed", diff --git a/mods/lord/Blocks/lord_homedecor/misc-nodes.lua b/mods/lord/Blocks/lord_homedecor/misc-nodes.lua index 09fdce668..67b43436c 100644 --- a/mods/lord/Blocks/lord_homedecor/misc-nodes.lua +++ b/mods/lord/Blocks/lord_homedecor/misc-nodes.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_homedecor") +local S = minetest.get_mod_translator() local pot_colors = {"terracotta"} diff --git a/mods/lord/Blocks/lord_homedecor/roofing.lua b/mods/lord/Blocks/lord_homedecor/roofing.lua index 9eefc25e7..9367cce7e 100644 --- a/mods/lord/Blocks/lord_homedecor/roofing.lua +++ b/mods/lord/Blocks/lord_homedecor/roofing.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_homedecor") +local S = minetest.get_mod_translator() minetest.register_node("lord_homedecor:skylight", { description = S("Glass Skylight"), diff --git a/mods/lord/Blocks/lord_homedecor/shutters.lua b/mods/lord/Blocks/lord_homedecor/shutters.lua index a17645ae2..a1bc02e7b 100644 --- a/mods/lord/Blocks/lord_homedecor/shutters.lua +++ b/mods/lord/Blocks/lord_homedecor/shutters.lua @@ -1,6 +1,6 @@ -- Various kinds of window shutters -local S = minetest.get_translator("lord_homedecor") +local S = minetest.get_mod_translator() local shutters = { {"oak", "Unpainted oak", "#bf8a51:200" }, diff --git a/mods/lord/Blocks/lord_homedecor/sofas.lua b/mods/lord/Blocks/lord_homedecor/sofas.lua index 964cc6ad8..ebd8f57b8 100644 --- a/mods/lord/Blocks/lord_homedecor/sofas.lua +++ b/mods/lord/Blocks/lord_homedecor/sofas.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_homedecor") +local SL = minetest.get_mod_translator() local sofa_sbox = { diff --git a/mods/lord/Blocks/lord_homedecor/window_treatments.lua b/mods/lord/Blocks/lord_homedecor/window_treatments.lua index eff71581e..cadfe20dc 100644 --- a/mods/lord/Blocks/lord_homedecor/window_treatments.lua +++ b/mods/lord/Blocks/lord_homedecor/window_treatments.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_homedecor") +local S = minetest.get_mod_translator() lord_homedecor.register("window_flowerbox", { description = S("Window flowerbox"), diff --git a/mods/lord/Blocks/lord_mail/init.lua b/mods/lord/Blocks/lord_mail/init.lua index 3e7d6d39a..f13efef4d 100644 --- a/mods/lord/Blocks/lord_mail/init.lua +++ b/mods/lord/Blocks/lord_mail/init.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_mail") +local SL = minetest.get_mod_translator() local colorize = minetest.colorize local e = minetest.formspec.escape local spec = minetest.formspec diff --git a/mods/lord/Blocks/lord_ores/init.lua b/mods/lord/Blocks/lord_ores/init.lua index 911e93bcc..15a57ad6c 100644 --- a/mods/lord/Blocks/lord_ores/init.lua +++ b/mods/lord/Blocks/lord_ores/init.lua @@ -4,7 +4,7 @@ minetest.mod(function(mod) require('rock_ores') - local S = minetest.get_translator('lord_ores') + local S = minetest.get_mod_translator() minetest.register_node("lord_ores:magma", { description = S("Magma"), diff --git a/mods/lord/Blocks/lord_ores/src/rock_ores.lua b/mods/lord/Blocks/lord_ores/src/rock_ores.lua index e14470106..1ae45c640 100644 --- a/mods/lord/Blocks/lord_ores/src/rock_ores.lua +++ b/mods/lord/Blocks/lord_ores/src/rock_ores.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_ores") +local S = minetest.get_mod_translator() for name, registration in pairs(rocks.get_lord_nodes()) do diff --git a/mods/lord/Blocks/lord_planks/src/planks/api.lua b/mods/lord/Blocks/lord_planks/src/planks/api.lua index 1441014f1..89c925725 100644 --- a/mods/lord/Blocks/lord_planks/src/planks/api.lua +++ b/mods/lord/Blocks/lord_planks/src/planks/api.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_planks") +local S = minetest.get_mod_translator() local planks = { diff --git a/mods/lord/Blocks/lord_rocks/src/rocks/api.lua b/mods/lord/Blocks/lord_rocks/src/rocks/api.lua index b34220e68..cf392c642 100644 --- a/mods/lord/Blocks/lord_rocks/src/rocks/api.lua +++ b/mods/lord/Blocks/lord_rocks/src/rocks/api.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_rocks") +local S = minetest.get_mod_translator() local rocks = { --- @type table|NodeDefinition[] diff --git a/mods/lord/Blocks/lord_trees/src/tree/fruits.lua b/mods/lord/Blocks/lord_trees/src/tree/fruits.lua index cbd947787..cb682b292 100644 --- a/mods/lord/Blocks/lord_trees/src/tree/fruits.lua +++ b/mods/lord/Blocks/lord_trees/src/tree/fruits.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_trees") +local S = minetest.get_mod_translator() minetest.register_node("lord_trees:plum", { diff --git a/mods/lord/Blocks/lord_trees/src/tree/leaves.lua b/mods/lord/Blocks/lord_trees/src/tree/leaves.lua index 563b4c214..c4266fd9b 100644 --- a/mods/lord/Blocks/lord_trees/src/tree/leaves.lua +++ b/mods/lord/Blocks/lord_trees/src/tree/leaves.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_trees") +local S = minetest.get_mod_translator() local leaves = { diff --git a/mods/lord/Blocks/lord_trees/src/tree/saplings.lua b/mods/lord/Blocks/lord_trees/src/tree/saplings.lua index d5931ab4f..362102ca9 100644 --- a/mods/lord/Blocks/lord_trees/src/tree/saplings.lua +++ b/mods/lord/Blocks/lord_trees/src/tree/saplings.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_trees") +local S = minetest.get_mod_translator() require("tree.saplings.grow_functions") diff --git a/mods/lord/Blocks/lord_trees/src/tree/trunks.lua b/mods/lord/Blocks/lord_trees/src/tree/trunks.lua index f3bf0ab5a..b261b214c 100644 --- a/mods/lord/Blocks/lord_trees/src/tree/trunks.lua +++ b/mods/lord/Blocks/lord_trees/src/tree/trunks.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_trees") +local S = minetest.get_mod_translator() local trunks = { diff --git a/mods/lord/Blocks/lord_trees/src/tree/trunks/slabs.lua b/mods/lord/Blocks/lord_trees/src/tree/trunks/slabs.lua index e11706c1e..f77baacf6 100644 --- a/mods/lord/Blocks/lord_trees/src/tree/trunks/slabs.lua +++ b/mods/lord/Blocks/lord_trees/src/tree/trunks/slabs.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_trees") +local S = minetest.get_mod_translator() stairs.register_slab( diff --git a/mods/lord/Blocks/lord_walls/init.lua b/mods/lord/Blocks/lord_walls/init.lua index cadc6d91e..19e47f668 100644 --- a/mods/lord/Blocks/lord_walls/init.lua +++ b/mods/lord/Blocks/lord_walls/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_walls") +local S = minetest.get_mod_translator() walls.register(":walls:orc_stone", S("Orc Stone Wall"), "lottblocks_orc_stone.png", "lottblocks:orc_stone", default.node_sound_stone_defaults()) diff --git a/mods/lord/Blocks/lord_wooden_stuff/src/lord_wooden_stuff/config.lua b/mods/lord/Blocks/lord_wooden_stuff/src/lord_wooden_stuff/config.lua index 382538737..835a43d3b 100644 --- a/mods/lord/Blocks/lord_wooden_stuff/src/lord_wooden_stuff/config.lua +++ b/mods/lord/Blocks/lord_wooden_stuff/src/lord_wooden_stuff/config.lua @@ -45,5 +45,5 @@ local wood_stuff_exceptions = { return { wood_defs = wood_defs, wood_stuff_exceptions = wood_stuff_exceptions, - translator = minetest.get_translator("lord_wooden_stuff"), + translator = minetest.get_mod_translator(), } diff --git a/mods/lord/Blocks/lord_wool/init.lua b/mods/lord/Blocks/lord_wool/init.lua index 3ef7961d8..238dac474 100644 --- a/mods/lord/Blocks/lord_wool/init.lua +++ b/mods/lord/Blocks/lord_wool/init.lua @@ -1,7 +1,7 @@ -- lord_wool/init.lua -- Load support for MT game translation. -local S = minetest.get_translator("lord_wool") +local S = minetest.get_mod_translator() for _, row in ipairs(dye.dyes) do local name = row[1] diff --git a/mods/lord/Blocks/lottblocks/chests.lua b/mods/lord/Blocks/lottblocks/chests.lua index ac402e97d..5f916d332 100644 --- a/mods/lord/Blocks/lottblocks/chests.lua +++ b/mods/lord/Blocks/lottblocks/chests.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottblocks") +local S = minetest.get_mod_translator() minetest.register_tool("lottblocks:lockpick", { diff --git a/mods/lord/Blocks/lottblocks/decoration.lua b/mods/lord/Blocks/lottblocks/decoration.lua index 3eb00d22f..dc35d954f 100644 --- a/mods/lord/Blocks/lottblocks/decoration.lua +++ b/mods/lord/Blocks/lottblocks/decoration.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottblocks") +local S = minetest.get_mod_translator() --Thanks for all the things in this file, and the related textures goes to catninja!-- diff --git a/mods/lord/Blocks/lottblocks/dwarf_tomb.lua b/mods/lord/Blocks/lottblocks/dwarf_tomb.lua index 96d92346a..6f772bc8c 100644 --- a/mods/lord/Blocks/lottblocks/dwarf_tomb.lua +++ b/mods/lord/Blocks/lottblocks/dwarf_tomb.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottblocks") +local S = minetest.get_mod_translator() local common_definition = { drawtype = "nodebox", diff --git a/mods/lord/Blocks/lottblocks/guides.lua b/mods/lord/Blocks/lottblocks/guides.lua index d1eca62dc..080a434f5 100644 --- a/mods/lord/Blocks/lottblocks/guides.lua +++ b/mods/lord/Blocks/lottblocks/guides.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator('lottblocks') +local S = minetest.get_mod_translator() local spec = minetest.formspec local lord_spec = forms.Spec local mod_path = minetest.get_modpath(minetest.get_current_modname()) diff --git a/mods/lord/Blocks/lottblocks/init.lua b/mods/lord/Blocks/lottblocks/init.lua index 2dc09af2c..44135e6ab 100644 --- a/mods/lord/Blocks/lottblocks/init.lua +++ b/mods/lord/Blocks/lottblocks/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottblocks") +local S = minetest.get_mod_translator() lottblocks = {} diff --git a/mods/lord/Blocks/lottblocks/lamps.lua b/mods/lord/Blocks/lottblocks/lamps.lua index 4220d18bb..505b79205 100644 --- a/mods/lord/Blocks/lottblocks/lamps.lua +++ b/mods/lord/Blocks/lottblocks/lamps.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottblocks") +local S = minetest.get_mod_translator() minetest.register_alias("lottother:lamp_wood", "lottblocks:lamp_wood") minetest.register_alias("lottother:lamp_middle_wood", "lottblocks:lamp_middle_wood") diff --git a/mods/lord/Blocks/lottblocks/misc.lua b/mods/lord/Blocks/lottblocks/misc.lua index 52659059b..298475ec0 100644 --- a/mods/lord/Blocks/lottblocks/misc.lua +++ b/mods/lord/Blocks/lottblocks/misc.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottblocks") +local S = minetest.get_mod_translator() --Code written by foot_on_teh_hill, with some slight changes. --https://github.com/foot-on-teh-hill/cavetools/blob/master/rope.lua diff --git a/mods/lord/Blocks/lottblocks/music.lua b/mods/lord/Blocks/lottblocks/music.lua index 27f0394fe..5f116b47e 100644 --- a/mods/lord/Blocks/lottblocks/music.lua +++ b/mods/lord/Blocks/lottblocks/music.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottblocks") +local S = minetest.get_mod_translator() minetest.register_node("lottblocks:dwarf_harp", { description = S("Dwarvern Harp"), diff --git a/mods/lord/Blocks/lottblocks/palantiri.lua b/mods/lord/Blocks/lottblocks/palantiri.lua index 53f0cc6d0..31f96d6ff 100644 --- a/mods/lord/Blocks/lottblocks/palantiri.lua +++ b/mods/lord/Blocks/lottblocks/palantiri.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottblocks") +local S = minetest.get_mod_translator() -- TODO #1555 remove old code for store in file. local function deprecated_load_palantiri() diff --git a/mods/lord/Blocks/lottfarming/athelas.lua b/mods/lord/Blocks/lottfarming/athelas.lua index ab3813ad3..9891bdb36 100644 --- a/mods/lord/Blocks/lottfarming/athelas.lua +++ b/mods/lord/Blocks/lottfarming/athelas.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:athelas_seed", { description = S("Athelas Seeds"), diff --git a/mods/lord/Blocks/lottfarming/barley.lua b/mods/lord/Blocks/lottfarming/barley.lua index bc7e9adc2..6084ff25d 100644 --- a/mods/lord/Blocks/lottfarming/barley.lua +++ b/mods/lord/Blocks/lottfarming/barley.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:barley_seed", { description = S("Barley Seeds"), diff --git a/mods/lord/Blocks/lottfarming/berries.lua b/mods/lord/Blocks/lottfarming/berries.lua index a548b962d..16406ed84 100644 --- a/mods/lord/Blocks/lottfarming/berries.lua +++ b/mods/lord/Blocks/lottfarming/berries.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:berries_seed", { description = S("Berries Seeds"), diff --git a/mods/lord/Blocks/lottfarming/blue.lua b/mods/lord/Blocks/lottfarming/blue.lua index 42b315f14..38b3f1709 100644 --- a/mods/lord/Blocks/lottfarming/blue.lua +++ b/mods/lord/Blocks/lottfarming/blue.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:blue_mushroom_spore", { description = S("Blue Mushroom Spores"), diff --git a/mods/lord/Blocks/lottfarming/brown.lua b/mods/lord/Blocks/lottfarming/brown.lua index 4706e865a..6c2b6b448 100644 --- a/mods/lord/Blocks/lottfarming/brown.lua +++ b/mods/lord/Blocks/lottfarming/brown.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:brown_mushroom_spore", { description = S("Brown Mushroom Spores"), diff --git a/mods/lord/Blocks/lottfarming/cabbage.lua b/mods/lord/Blocks/lottfarming/cabbage.lua index 7747cd96b..080c5a800 100644 --- a/mods/lord/Blocks/lottfarming/cabbage.lua +++ b/mods/lord/Blocks/lottfarming/cabbage.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:cabbage_seed", { description = S("Cabbage Seed"), diff --git a/mods/lord/Blocks/lottfarming/carrots.lua b/mods/lord/Blocks/lottfarming/carrots.lua index c22e771d7..baaafb650 100644 --- a/mods/lord/Blocks/lottfarming/carrots.lua +++ b/mods/lord/Blocks/lottfarming/carrots.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:carrot_seed", { description = S("Carrot Seeds"), diff --git a/mods/lord/Blocks/lottfarming/corn.lua b/mods/lord/Blocks/lottfarming/corn.lua index c566020a0..53b69f1ab 100644 --- a/mods/lord/Blocks/lottfarming/corn.lua +++ b/mods/lord/Blocks/lottfarming/corn.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:corn_seed", { description = S("Corn"), diff --git a/mods/lord/Blocks/lottfarming/crafting.lua b/mods/lord/Blocks/lottfarming/crafting.lua index b5f1a1f2f..ca0959fab 100644 --- a/mods/lord/Blocks/lottfarming/crafting.lua +++ b/mods/lord/Blocks/lottfarming/crafting.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() -- ITEMS and TOOLS diff --git a/mods/lord/Blocks/lottfarming/green.lua b/mods/lord/Blocks/lottfarming/green.lua index 65d70bb21..a24b34d1f 100644 --- a/mods/lord/Blocks/lottfarming/green.lua +++ b/mods/lord/Blocks/lottfarming/green.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:green_mushroom_spore", { description = S("Green Mushroom Spores"), diff --git a/mods/lord/Blocks/lottfarming/melon.lua b/mods/lord/Blocks/lottfarming/melon.lua index 3eee0ae4a..0318abeb2 100644 --- a/mods/lord/Blocks/lottfarming/melon.lua +++ b/mods/lord/Blocks/lottfarming/melon.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:melon_seed", { description = S("Melon Seed"), diff --git a/mods/lord/Blocks/lottfarming/oil.lua b/mods/lord/Blocks/lottfarming/oil.lua index d407fea34..99353b6f8 100644 --- a/mods/lord/Blocks/lottfarming/oil.lua +++ b/mods/lord/Blocks/lottfarming/oil.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:vegetable_oil", { description = S("Vegetable Oil"), diff --git a/mods/lord/Blocks/lottfarming/orc_food.lua b/mods/lord/Blocks/lottfarming/orc_food.lua index f70659da4..7f10c10b0 100644 --- a/mods/lord/Blocks/lottfarming/orc_food.lua +++ b/mods/lord/Blocks/lottfarming/orc_food.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() local function make_negative_visual_effect(user) local first_screen = user:hud_add({ diff --git a/mods/lord/Blocks/lottfarming/other.lua b/mods/lord/Blocks/lottfarming/other.lua index e11598ffe..bce23b911 100644 --- a/mods/lord/Blocks/lottfarming/other.lua +++ b/mods/lord/Blocks/lottfarming/other.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:cookie_cracker", { description = S("Cracker"), diff --git a/mods/lord/Blocks/lottfarming/pipeweed.lua b/mods/lord/Blocks/lottfarming/pipeweed.lua index bfa208f6d..12d5e4dfd 100644 --- a/mods/lord/Blocks/lottfarming/pipeweed.lua +++ b/mods/lord/Blocks/lottfarming/pipeweed.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:pipeweed_seed", { description = S("Pipeweed Seeds"), diff --git a/mods/lord/Blocks/lottfarming/potato.lua b/mods/lord/Blocks/lottfarming/potato.lua index 8d625429a..608655e20 100644 --- a/mods/lord/Blocks/lottfarming/potato.lua +++ b/mods/lord/Blocks/lottfarming/potato.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:potato_seed", { description = S("Half of potato"), diff --git a/mods/lord/Blocks/lottfarming/red.lua b/mods/lord/Blocks/lottfarming/red.lua index f80782980..19a6302c2 100644 --- a/mods/lord/Blocks/lottfarming/red.lua +++ b/mods/lord/Blocks/lottfarming/red.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:red_mushroom_spore", { description = S("Red Mushroom Spores"), diff --git a/mods/lord/Blocks/lottfarming/tomatoes.lua b/mods/lord/Blocks/lottfarming/tomatoes.lua index 965eb00c5..e3d9ba9a3 100644 --- a/mods/lord/Blocks/lottfarming/tomatoes.lua +++ b/mods/lord/Blocks/lottfarming/tomatoes.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:tomatoes_seed", { description = S("Tomato Seeds"), diff --git a/mods/lord/Blocks/lottfarming/turnips.lua b/mods/lord/Blocks/lottfarming/turnips.lua index 86f8a20f5..f622fe1d5 100644 --- a/mods/lord/Blocks/lottfarming/turnips.lua +++ b/mods/lord/Blocks/lottfarming/turnips.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:turnips_seed", { description = S("Turnip Seeds"), diff --git a/mods/lord/Blocks/lottfarming/white.lua b/mods/lord/Blocks/lottfarming/white.lua index 39d73b24c..c0cf6ff1f 100644 --- a/mods/lord/Blocks/lottfarming/white.lua +++ b/mods/lord/Blocks/lottfarming/white.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottfarming") +local S = minetest.get_mod_translator() minetest.register_craftitem("lottfarming:white_mushroom_spore", { description = S("White Mushroom Spores"), diff --git a/mods/lord/Blocks/lottores/init.lua b/mods/lord/Blocks/lottores/init.lua index b8060b546..d1ec9925f 100644 --- a/mods/lord/Blocks/lottores/init.lua +++ b/mods/lord/Blocks/lottores/init.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottores") +local SL = minetest.get_mod_translator() -- Ores: diff --git a/mods/lord/Blocks/lottother/flags.lua b/mods/lord/Blocks/lottother/flags.lua index d4e218df4..844eed96b 100644 --- a/mods/lord/Blocks/lottother/flags.lua +++ b/mods/lord/Blocks/lottother/flags.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottother") +local SL = minetest.get_mod_translator() local tapestry = {} diff --git a/mods/lord/Blocks/lottother/init.lua b/mods/lord/Blocks/lottother/init.lua index 41a817dc0..8c16d707f 100644 --- a/mods/lord/Blocks/lottother/init.lua +++ b/mods/lord/Blocks/lottother/init.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottother") +local SL = minetest.get_mod_translator() dofile(minetest.get_modpath("lottother") .. "/rings.lua") dofile(minetest.get_modpath("lottother") .. "/ms.lua") diff --git a/mods/lord/Blocks/lottother/ms.lua b/mods/lord/Blocks/lottother/ms.lua index b4f810c31..25f0c8d4d 100644 --- a/mods/lord/Blocks/lottother/ms.lua +++ b/mods/lord/Blocks/lottother/ms.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottother") +local SL = minetest.get_mod_translator() -- Mobs spawners for buildings -- Mordor diff --git a/mods/lord/Blocks/lottother/rings.lua b/mods/lord/Blocks/lottother/rings.lua index 4227fb9b0..fb53b7d7e 100644 --- a/mods/lord/Blocks/lottother/rings.lua +++ b/mods/lord/Blocks/lottother/rings.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottother") +local SL = minetest.get_mod_translator() local DWARF_RING_USES = 250 diff --git a/mods/lord/Blocks/lottplants/src/flowers.lua b/mods/lord/Blocks/lottplants/src/flowers.lua index 43b01b31a..fd6c83456 100644 --- a/mods/lord/Blocks/lottplants/src/flowers.lua +++ b/mods/lord/Blocks/lottplants/src/flowers.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottplants") +local S = minetest.get_mod_translator() -- FLOWERS diff --git a/mods/lord/Blocks/lottplants/src/herbs.lua b/mods/lord/Blocks/lottplants/src/herbs.lua index f6f5b3e3b..d57ee5303 100644 --- a/mods/lord/Blocks/lottplants/src/herbs.lua +++ b/mods/lord/Blocks/lottplants/src/herbs.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottplants") +local S = minetest.get_mod_translator() --Lorien grass diff --git a/mods/lord/Blocks/lottplants/src/nodes.lua b/mods/lord/Blocks/lottplants/src/nodes.lua index a6e73118c..9a6729c42 100644 --- a/mods/lord/Blocks/lottplants/src/nodes.lua +++ b/mods/lord/Blocks/lottplants/src/nodes.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottplants") +local S = minetest.get_mod_translator() --Fireflies / Светлячки diff --git a/mods/lord/Blocks/lottplants/src/wild_crops.lua b/mods/lord/Blocks/lottplants/src/wild_crops.lua index cf0e1bf3b..68d1fac75 100644 --- a/mods/lord/Blocks/lottplants/src/wild_crops.lua +++ b/mods/lord/Blocks/lottplants/src/wild_crops.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottplants") +local S = minetest.get_mod_translator() -- The wild plants drop food that can be eaten or crafted to get seeds diff --git a/mods/lord/Blocks/quest_node/src/reward_chest/node.lua b/mods/lord/Blocks/quest_node/src/reward_chest/node.lua index a642a882c..b0f4e6cb4 100644 --- a/mods/lord/Blocks/quest_node/src/reward_chest/node.lua +++ b/mods/lord/Blocks/quest_node/src/reward_chest/node.lua @@ -2,7 +2,7 @@ local Form = require("reward_chest.node.Form") -local S = minetest.get_translator('quest_node') +local S = minetest.get_mod_translator() --- HELPERS: ----------------------------------------------------------------------------------------------------------- diff --git a/mods/lord/Blocks/quest_node/src/reward_chest/node/Form.lua b/mods/lord/Blocks/quest_node/src/reward_chest/node/Form.lua index 24f129d56..959e7b0b4 100644 --- a/mods/lord/Blocks/quest_node/src/reward_chest/node/Form.lua +++ b/mods/lord/Blocks/quest_node/src/reward_chest/node/Form.lua @@ -1,7 +1,7 @@ local esc = minetest.formspec_escape -local S = minetest.get_translator('quest_node') +local S = minetest.get_mod_translator() --- --- @class quest_node.reward_chest.node.Form: base_classes.Form.Base diff --git a/mods/lord/Blocks/roads/init.lua b/mods/lord/Blocks/roads/init.lua index 301480412..87c2d369a 100644 --- a/mods/lord/Blocks/roads/init.lua +++ b/mods/lord/Blocks/roads/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("roads") +local S = minetest.get_mod_translator() local function register_road(name, main_material, desc, fill) -- функция регистрации всех нодов дороги local mn = "roads:"..name -- имя мода с материалом diff --git a/mods/lord/Blocks/signs_lib/init.lua b/mods/lord/Blocks/signs_lib/init.lua index 8e8d6981c..b734ba68d 100644 --- a/mods/lord/Blocks/signs_lib/init.lua +++ b/mods/lord/Blocks/signs_lib/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator('signs_lib') +local S = minetest.get_mod_translator() -- This mod provides the visible text on signs library used by Home Decor -- and perhaps other mods at some point in the future. Forked from thexyz's/ diff --git a/mods/lord/Blocks/technic_chests/register.lua b/mods/lord/Blocks/technic_chests/register.lua index e597e8b68..e26718f5a 100644 --- a/mods/lord/Blocks/technic_chests/register.lua +++ b/mods/lord/Blocks/technic_chests/register.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("technic_chests") +local S = minetest.get_mod_translator() local pipeworks = rawget(_G, "pipeworks") if not minetest.get_modpath("pipeworks") then diff --git a/mods/lord/Core/builtin/src/mod.lua b/mods/lord/Core/builtin/src/mod.lua index f56c9bddb..12c7bf630 100644 --- a/mods/lord/Core/builtin/src/mod.lua +++ b/mods/lord/Core/builtin/src/mod.lua @@ -1,5 +1,6 @@ local RequireFactory = require("mod.require") local LoggerFactory = require("mod.logger") +local Translator = require("mod.translator") --- @type string local DS = os.DIRECTORY_SEPARATOR @@ -18,11 +19,12 @@ minetest.get_mod_require = RequireFactory.get_mod_require minetest.get_mod_logger = LoggerFactory.get_mod_logger --- @class minetest.Mod ---- @field name string name of the mod ---- @field path string path of the mad ---- @field debug boolean whether debug mode is enabled for this mod ---- @field require fun(name:string) require function for the mod ---- @field logger helpers.Logger lazy loaded logger instance for this mod +--- @field name string name of the mod +--- @field path string path of the mad +--- @field debug boolean whether debug mode is enabled for this mod +--- @field require fun(name:string) require function for the mod +--- @field translator fun(str: string, ...):string translator for this mod +--- @field logger helpers.Logger lazy loaded logger instance for this mod --- @param mod_init_function fun(mod:minetest.Mod) function minetest.mod(mod_init_function) @@ -35,10 +37,11 @@ function minetest.mod(mod_init_function) mod_init_function(setmetatable( { - name = mod_name, - path = mod_path, - debug = mod_debug, - require = require, + name = mod_name, + path = mod_path, + debug = mod_debug, + require = require, + translator = Translator.get() }, { -- Lazy Loading __index = function(self, key) diff --git a/mods/lord/Core/builtin/src/mod/translator.lua b/mods/lord/Core/builtin/src/mod/translator.lua new file mode 100644 index 000000000..b50649ba0 --- /dev/null +++ b/mods/lord/Core/builtin/src/mod/translator.lua @@ -0,0 +1,11 @@ + +--- @param mod_name string +--- @return fun(str: string, ...):string +function minetest.get_mod_translator(mod_name) + return minetest.get_translator(mod_name or minetest.get_current_modname()) +end + + +return { + get = minetest.get_mod_translator +} diff --git a/mods/lord/Entities/bees/hive_artificial.lua b/mods/lord/Entities/bees/hive_artificial.lua index 9525b4088..672cd0e3d 100644 --- a/mods/lord/Entities/bees/hive_artificial.lua +++ b/mods/lord/Entities/bees/hive_artificial.lua @@ -1,6 +1,6 @@ -- УЛЕЙ -local S = minetest.get_translator("bees") +local S = minetest.get_mod_translator() -- Функции diff --git a/mods/lord/Entities/bees/hive_wild.lua b/mods/lord/Entities/bees/hive_wild.lua index c77c88167..48675c52f 100644 --- a/mods/lord/Entities/bees/hive_wild.lua +++ b/mods/lord/Entities/bees/hive_wild.lua @@ -1,6 +1,6 @@ -- ДИКИЙ УЛЕЙ -local S = minetest.get_translator("bees") +local S = minetest.get_mod_translator() -- Функции diff --git a/mods/lord/Entities/bees/init.lua b/mods/lord/Entities/bees/init.lua index e78b9323f..d8cb1cb60 100644 --- a/mods/lord/Entities/bees/init.lua +++ b/mods/lord/Entities/bees/init.lua @@ -5,7 +5,7 @@ --Version 2.2 --License WTFPL -local S = minetest.get_translator("bees") +local S = minetest.get_mod_translator() --VARIABLES bees = {} diff --git a/mods/lord/Entities/lord_traders/src/traders/config.lua b/mods/lord/Entities/lord_traders/src/traders/config.lua index c705120be..5c26bd4ed 100644 --- a/mods/lord/Entities/lord_traders/src/traders/config.lua +++ b/mods/lord/Entities/lord_traders/src/traders/config.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_traders") +local SL = minetest.get_mod_translator() --- @class traders.config --- @field goods table key: stack_string, value: {price: stack_string, chance: percent} diff --git a/mods/lord/Entities/lord_traders/src/traders/trader.lua b/mods/lord/Entities/lord_traders/src/traders/trader.lua index 58edf8ec3..62badf4cf 100644 --- a/mods/lord/Entities/lord_traders/src/traders/trader.lua +++ b/mods/lord/Entities/lord_traders/src/traders/trader.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_traders") +local SL = minetest.get_mod_translator() --- @type traders.config[] local config = require("traders.config") diff --git a/mods/lord/Entities/lord_traders/src/traders/trader/Form.lua b/mods/lord/Entities/lord_traders/src/traders/trader/Form.lua index 8e2602f32..0eccdc784 100644 --- a/mods/lord/Entities/lord_traders/src/traders/trader/Form.lua +++ b/mods/lord/Entities/lord_traders/src/traders/trader/Form.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_traders") +local S = minetest.get_mod_translator() --- diff --git a/mods/lord/Entities/lottmobs/src/animals/livestock/chicken.lua b/mods/lord/Entities/lottmobs/src/animals/livestock/chicken.lua index db9f81ad2..9f73443eb 100644 --- a/mods/lord/Entities/lottmobs/src/animals/livestock/chicken.lua +++ b/mods/lord/Entities/lottmobs/src/animals/livestock/chicken.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottmobs") +local SL = minetest.get_mod_translator() -- egg throwing item diff --git a/mods/lord/Entities/lottmobs/src/animals/livestock/riding.lua b/mods/lord/Entities/lottmobs/src/animals/livestock/riding.lua index 9b50605d3..fcfe98125 100644 --- a/mods/lord/Entities/lottmobs/src/animals/livestock/riding.lua +++ b/mods/lord/Entities/lottmobs/src/animals/livestock/riding.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottmobs") +local SL = minetest.get_mod_translator() local function is_ground(pos) diff --git a/mods/lord/Entities/lottmobs/src/animals/water/fishes.lua b/mods/lord/Entities/lottmobs/src/animals/water/fishes.lua index f333afb4e..1726f460d 100644 --- a/mods/lord/Entities/lottmobs/src/animals/water/fishes.lua +++ b/mods/lord/Entities/lottmobs/src/animals/water/fishes.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottmobs") +local SL = minetest.get_mod_translator() local SPRITE_VERSION = false -- set to true to use upright sprites instead of meshes diff --git a/mods/lord/Entities/lottmobs/src/animals/wild/boar.lua b/mods/lord/Entities/lottmobs/src/animals/wild/boar.lua index dcb51c8c1..cfd439d07 100644 --- a/mods/lord/Entities/lottmobs/src/animals/wild/boar.lua +++ b/mods/lord/Entities/lottmobs/src/animals/wild/boar.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottmobs") +local SL = minetest.get_mod_translator() mobs:register_mob("lottmobs:boar", { diff --git a/mods/lord/Entities/lottmobs/src/animals/wild/horse.lua b/mods/lord/Entities/lottmobs/src/animals/wild/horse.lua index 7db4b4693..89934e4dd 100644 --- a/mods/lord/Entities/lottmobs/src/animals/wild/horse.lua +++ b/mods/lord/Entities/lottmobs/src/animals/wild/horse.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottmobs") +local SL = minetest.get_mod_translator() mobs:register_mob("lottmobs:horse", { diff --git a/mods/lord/Entities/lottmobs/src/animals/wild/pony.lua b/mods/lord/Entities/lottmobs/src/animals/wild/pony.lua index 25da9daa7..2d9a7b599 100644 --- a/mods/lord/Entities/lottmobs/src/animals/wild/pony.lua +++ b/mods/lord/Entities/lottmobs/src/animals/wild/pony.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottmobs") +local SL = minetest.get_mod_translator() mobs:register_mob("lottmobs:shirepony", { diff --git a/mods/lord/Entities/lottmobs/src/animals/wild/warg.lua b/mods/lord/Entities/lottmobs/src/animals/wild/warg.lua index 6a04241c1..3fa83015c 100644 --- a/mods/lord/Entities/lottmobs/src/animals/wild/warg.lua +++ b/mods/lord/Entities/lottmobs/src/animals/wild/warg.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottmobs") +local SL = minetest.get_mod_translator() mobs:register_mob("lottmobs:warg", { diff --git a/mods/lord/Entities/lottmobs/src/craftitems.lua b/mods/lord/Entities/lottmobs/src/craftitems.lua index 2a11494df..83da4713f 100644 --- a/mods/lord/Entities/lottmobs/src/craftitems.lua +++ b/mods/lord/Entities/lottmobs/src/craftitems.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottmobs") +local SL = minetest.get_mod_translator() minetest.register_craftitem("lottmobs:meat", { description = SL("Cooked Meat"), diff --git a/mods/lord/Entities/lottmobs/src/guarding.lua b/mods/lord/Entities/lottmobs/src/guarding.lua index 1dc8be9dc..8931b1419 100644 --- a/mods/lord/Entities/lottmobs/src/guarding.lua +++ b/mods/lord/Entities/lottmobs/src/guarding.lua @@ -1,5 +1,5 @@ -local SL = minetest.get_translator("lottmobs") +local SL = minetest.get_mod_translator() lottmobs = {} diff --git a/mods/lord/Entities/lottthrowing/init.lua b/mods/lord/Entities/lottthrowing/init.lua index 39ddd49bd..03f03c771 100644 --- a/mods/lord/Entities/lottthrowing/init.lua +++ b/mods/lord/Entities/lottthrowing/init.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottthrowing") +local SL = minetest.get_mod_translator() local lottthrowing_player_shoot = function(player, arrow_name) diff --git a/mods/lord/Entities/npc/e_deputy_mob.lua b/mods/lord/Entities/npc/e_deputy_mob.lua index 0fe777750..806e84f7f 100644 --- a/mods/lord/Entities/npc/e_deputy_mob.lua +++ b/mods/lord/Entities/npc/e_deputy_mob.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("npc") +local S = minetest.get_mod_translator() local esc = minetest.formspec_escape ---show mob answers diff --git a/mods/lord/Entities/npc/info_mob.lua b/mods/lord/Entities/npc/info_mob.lua index 6002c83b5..9a0c009d6 100644 --- a/mods/lord/Entities/npc/info_mob.lua +++ b/mods/lord/Entities/npc/info_mob.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("npc") +local S = minetest.get_mod_translator() local esc = minetest.formspec_escape local function show_answer(clicker, item) diff --git a/mods/lord/Entities/npc/npc.lua b/mods/lord/Entities/npc/npc.lua index 33088d2e7..75f05e412 100644 --- a/mods/lord/Entities/npc/npc.lua +++ b/mods/lord/Entities/npc/npc.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("npc") +local S = minetest.get_mod_translator() local esc = minetest.formspec_escape npc = { diff --git a/mods/lord/Game/debugtools/src/photometer.lua b/mods/lord/Game/debugtools/src/photometer.lua index deb9f0313..8cf6e8ea2 100644 --- a/mods/lord/Game/debugtools/src/photometer.lua +++ b/mods/lord/Game/debugtools/src/photometer.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("debugtools") +local S = minetest.get_mod_translator() minetest.register_tool("debugtools:photometer", { description = S("Photometer"), diff --git a/mods/lord/Game/dice/init.lua b/mods/lord/Game/dice/init.lua index 08b7d3bbf..7f67aec6f 100644 --- a/mods/lord/Game/dice/init.lua +++ b/mods/lord/Game/dice/init.lua @@ -1,18 +1,21 @@ -local S = minetest.get_translator("dice") -minetest.register_chatcommand("dice", { - params = "[MAX_NUM]", - description = S("prints out random number"), - func = function(name, param) - local max_limit = 6 - if (param ~= "") then - local current_limit = tonumber(param) - if (current_limit ~= nil) then - max_limit = current_limit +minetest.mod(function(mod) + local S = mod.translator + + minetest.register_chatcommand("dice", { + params = "[MAX_NUM]", + description = S("prints out random number"), + func = function(name, param) + local max_limit = 6 + if (param ~= "") then + local current_limit = tonumber(param) + if (current_limit ~= nil) then + max_limit = current_limit + end end - end - local num = math.random(1, max_limit) - minetest.chat_send_all(name .. " - ".. S("dice") .. ": " .. num) - return true - end, -}) + local num = math.random(1, max_limit) + minetest.chat_send_all(name .. " - " .. S("dice") .. ": " .. num) + return true + end, + }) +end) diff --git a/mods/lord/Game/dice/mod.conf b/mods/lord/Game/dice/mod.conf index a57b68ae9..458ba0ffd 100644 --- a/mods/lord/Game/dice/mod.conf +++ b/mods/lord/Game/dice/mod.conf @@ -1,2 +1,3 @@ name = dice description = Adds `/dice` chat command for printing random numbers +depends = builtin diff --git a/mods/lord/Game/lord_classes/init.lua b/mods/lord/Game/lord_classes/init.lua index 4bbb045e0..12a552b35 100644 --- a/mods/lord/Game/lord_classes/init.lua +++ b/mods/lord/Game/lord_classes/init.lua @@ -1,7 +1,7 @@ local table_has_key = table.has_key -local SL = minetest.get_translator("lord_classes") +local SL = minetest.get_mod_translator() --[[ TODO: Move I/O-related functions into a separate mod (lord_util?) diff --git a/mods/lord/Game/lord_info/init.lua b/mods/lord/Game/lord_info/init.lua index 937312df5..fabc014b2 100644 --- a/mods/lord/Game/lord_info/init.lua +++ b/mods/lord/Game/lord_info/init.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_info") +local SL = minetest.get_mod_translator() --- @param search_query string diff --git a/mods/lord/Game/lord_names_rules/init.lua b/mods/lord/Game/lord_names_rules/init.lua index a858f3b68..bb2820f1d 100644 --- a/mods/lord/Game/lord_names_rules/init.lua +++ b/mods/lord/Game/lord_names_rules/init.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_names_rules") +local SL = minetest.get_mod_translator() -- правила формирования имени local rules = { diff --git a/mods/lord/Game/lottachievements/api.lua b/mods/lord/Game/lottachievements/api.lua index d081db364..45a4893d2 100644 --- a/mods/lord/Game/lottachievements/api.lua +++ b/mods/lord/Game/lottachievements/api.lua @@ -13,7 +13,7 @@ -- with this program; if not, write to the Free Software Foundation, Inc., -- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- -local SL = minetest.get_translator("lottachievements") +local SL = minetest.get_mod_translator() dofile(minetest.get_modpath("lottachievements").."/api_helpers.lua") diff --git a/mods/lord/Game/lottachievements/chat_commands.lua b/mods/lord/Game/lottachievements/chat_commands.lua index 2e91951eb..d82d31f92 100644 --- a/mods/lord/Game/lottachievements/chat_commands.lua +++ b/mods/lord/Game/lottachievements/chat_commands.lua @@ -14,7 +14,7 @@ -- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- -local SL = minetest.get_translator("lottachievements") +local SL = minetest.get_mod_translator() minetest.register_chatcommand("achievements", { params = SL("[c|clear|disable|enable]"), diff --git a/mods/lord/Game/lottachievements/init.lua b/mods/lord/Game/lottachievements/init.lua index 0fcd8d8b5..f819d0a80 100644 --- a/mods/lord/Game/lottachievements/init.lua +++ b/mods/lord/Game/lottachievements/init.lua @@ -14,7 +14,7 @@ -- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- -local SL = minetest.get_translator("lottachievements") +local SL = minetest.get_mod_translator() -- The global award namespace lottachievements = { diff --git a/mods/lord/Game/lottachievements/triggers.lua b/mods/lord/Game/lottachievements/triggers.lua index 3cfa64ae6..59cd55735 100644 --- a/mods/lord/Game/lottachievements/triggers.lua +++ b/mods/lord/Game/lottachievements/triggers.lua @@ -14,7 +14,7 @@ -- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- -local SL = minetest.get_translator("lottachievements") +local SL = minetest.get_mod_translator() lottachievements.register_trigger("dig", function(def) local tmp = { diff --git a/mods/lord/Game/mail_list/init.lua b/mods/lord/Game/mail_list/init.lua index 2e4b15b2f..3dd041082 100644 --- a/mods/lord/Game/mail_list/init.lua +++ b/mods/lord/Game/mail_list/init.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("mail_list") +local SL = minetest.get_mod_translator() local file_name = minetest.get_worldpath() .. "/mail_list.txt" diff --git a/mods/lord/Player/Help/lord_tooltips/src/snippet/armor.lua b/mods/lord/Player/Help/lord_tooltips/src/snippet/armor.lua index 12f1aae6a..b6f2b9eba 100644 --- a/mods/lord/Player/Help/lord_tooltips/src/snippet/armor.lua +++ b/mods/lord/Player/Help/lord_tooltips/src/snippet/armor.lua @@ -1,7 +1,7 @@ local items, colorize = minetest.registered_items, minetest.colorize -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() local armor_groups = { 'defense_fleshy', 'defense_fire', 'defense_soul', 'defense_poison', } diff --git a/mods/lord/Player/Help/lord_tooltips/src/snippet/buffs.lua b/mods/lord/Player/Help/lord_tooltips/src/snippet/buffs.lua index 14a1fe54d..9d5444c43 100644 --- a/mods/lord/Player/Help/lord_tooltips/src/snippet/buffs.lua +++ b/mods/lord/Player/Help/lord_tooltips/src/snippet/buffs.lua @@ -1,7 +1,7 @@ local items, colorize = minetest.registered_items, minetest.colorize -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() --- @type table diff --git a/mods/lord/Player/Help/lord_tooltips/src/snippet/damage.lua b/mods/lord/Player/Help/lord_tooltips/src/snippet/damage.lua index ab1431e45..dbdcc6d0f 100644 --- a/mods/lord/Player/Help/lord_tooltips/src/snippet/damage.lua +++ b/mods/lord/Player/Help/lord_tooltips/src/snippet/damage.lua @@ -1,7 +1,7 @@ local items, colorize = minetest.registered_items, minetest.colorize -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() --- @param item_string string diff --git a/mods/lord/Player/Help/lord_tooltips/src/snippet/digging.lua b/mods/lord/Player/Help/lord_tooltips/src/snippet/digging.lua index 8eddf164d..df97331c6 100644 --- a/mods/lord/Player/Help/lord_tooltips/src/snippet/digging.lua +++ b/mods/lord/Player/Help/lord_tooltips/src/snippet/digging.lua @@ -1,7 +1,7 @@ local items, colorize = minetest.registered_items, minetest.colorize -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() --- @param caps_times table diff --git a/mods/lord/Player/Help/lord_tooltips/src/snippet/food.lua b/mods/lord/Player/Help/lord_tooltips/src/snippet/food.lua index b4c113bb0..57cc21159 100644 --- a/mods/lord/Player/Help/lord_tooltips/src/snippet/food.lua +++ b/mods/lord/Player/Help/lord_tooltips/src/snippet/food.lua @@ -1,7 +1,7 @@ local items, colorize = minetest.registered_items, minetest.colorize -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() --- @param value number diff --git a/mods/lord/Player/Help/lord_tooltips/src/snippet/potions.lua b/mods/lord/Player/Help/lord_tooltips/src/snippet/potions.lua index 324eec904..0678b25c6 100644 --- a/mods/lord/Player/Help/lord_tooltips/src/snippet/potions.lua +++ b/mods/lord/Player/Help/lord_tooltips/src/snippet/potions.lua @@ -1,7 +1,7 @@ local items, colorize = minetest.registered_items, minetest.colorize -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() local template = { diff --git a/mods/lord/Player/Help/lord_tooltips/src/snippet/properties.lua b/mods/lord/Player/Help/lord_tooltips/src/snippet/properties.lua index db2168210..9e5fbdff5 100644 --- a/mods/lord/Player/Help/lord_tooltips/src/snippet/properties.lua +++ b/mods/lord/Player/Help/lord_tooltips/src/snippet/properties.lua @@ -5,7 +5,7 @@ local properties = { node = require('snippet.properties.node'), item = require('snippet.properties.item'), } -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() local dig_properties = { diff --git a/mods/lord/Player/Help/lord_tooltips/src/snippet/properties/node.lua b/mods/lord/Player/Help/lord_tooltips/src/snippet/properties/node.lua index b8002cfe5..4b553b87e 100644 --- a/mods/lord/Player/Help/lord_tooltips/src/snippet/properties/node.lua +++ b/mods/lord/Player/Help/lord_tooltips/src/snippet/properties/node.lua @@ -1,7 +1,7 @@ local items, colorize = minetest.registered_items, minetest.colorize -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() diff --git a/mods/lord/Player/bones/init.lua b/mods/lord/Player/bones/init.lua index 5467eae4c..1f559b8db 100644 --- a/mods/lord/Player/bones/init.lua +++ b/mods/lord/Player/bones/init.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("bones") +local SL = minetest.get_mod_translator() -- Minetest 0.4 mod: bones -- See README.txt for licensing and other information. diff --git a/mods/lord/Player/bones/items.lua b/mods/lord/Player/bones/items.lua index daed9c7c3..025dd792c 100644 --- a/mods/lord/Player/bones/items.lua +++ b/mods/lord/Player/bones/items.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("bones") +local SL = minetest.get_mod_translator() minetest.register_craftitem("bones:bonedust", { description = SL("Bone Dust"), diff --git a/mods/lord/Player/bones/skeleton.lua b/mods/lord/Player/bones/skeleton.lua index cd11d48f6..12e92409d 100644 --- a/mods/lord/Player/bones/skeleton.lua +++ b/mods/lord/Player/bones/skeleton.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("bones") +local SL = minetest.get_mod_translator() minetest.register_node("bones:skeleton", { description = SL("Skeleton Head"), diff --git a/mods/lord/Player/clans/src/clans/commands.lua b/mods/lord/Player/clans/src/clans/commands.lua index c4724a34e..87ef15aa6 100644 --- a/mods/lord/Player/clans/src/clans/commands.lua +++ b/mods/lord/Player/clans/src/clans/commands.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("clans") +local S = minetest.get_mod_translator() local colorize = minetest.colorize diff --git a/mods/lord/Player/hud_modpack/hbarmor/init.lua b/mods/lord/Player/hud_modpack/hbarmor/init.lua index 3de33b7b3..abe885241 100644 --- a/mods/lord/Player/hud_modpack/hbarmor/init.lua +++ b/mods/lord/Player/hud_modpack/hbarmor/init.lua @@ -3,7 +3,7 @@ if not minetest.settings:get_bool("enable_damage", false) then end -local S = minetest.get_translator("hb.armor") +local S = minetest.get_mod_translator() local N = function(s) return s end diff --git a/mods/lord/Player/hud_modpack/hbarmor/locale/hbarmor.ru.tr b/mods/lord/Player/hud_modpack/hbarmor/locale/hbarmor.ru.tr index 589547101..0063b4eff 100644 --- a/mods/lord/Player/hud_modpack/hbarmor/locale/hbarmor.ru.tr +++ b/mods/lord/Player/hud_modpack/hbarmor/locale/hbarmor.ru.tr @@ -1,3 +1,3 @@ -# textdomain: hb.armor +# textdomain: hbarmor Armor=Защита @1: @2%=@1: @2% diff --git a/mods/lord/Player/hud_modpack/hbarmor/mod.conf b/mods/lord/Player/hud_modpack/hbarmor/mod.conf index f5fb16fe2..c4d1bddcc 100644 --- a/mods/lord/Player/hud_modpack/hbarmor/mod.conf +++ b/mods/lord/Player/hud_modpack/hbarmor/mod.conf @@ -1,2 +1,2 @@ name = hbarmor -depends = hudbars +depends = builtin, hudbars diff --git a/mods/lord/Player/hud_modpack/hbhunger/init.lua b/mods/lord/Player/hud_modpack/hbhunger/init.lua index 75ce89df9..eab9a8473 100644 --- a/mods/lord/Player/hud_modpack/hbhunger/init.lua +++ b/mods/lord/Player/hud_modpack/hbhunger/init.lua @@ -1,6 +1,6 @@ if minetest.settings:get_bool("enable_damage") then -local S = minetest.get_translator("hb.hunger") +local S = minetest.get_mod_translator() hbhunger = {} hbhunger.food = {} diff --git a/mods/lord/Player/hud_modpack/hbhunger/locale/hbhunger.ru.tr b/mods/lord/Player/hud_modpack/hbhunger/locale/hbhunger.ru.tr index 6ef7ef644..3b4a8c055 100644 --- a/mods/lord/Player/hud_modpack/hbhunger/locale/hbhunger.ru.tr +++ b/mods/lord/Player/hud_modpack/hbhunger/locale/hbhunger.ru.tr @@ -1,2 +1,2 @@ -# textdomain: hb.hunger +# textdomain: hbhunger Satiation=Насыщение diff --git a/mods/lord/Player/hud_modpack/hbhunger/mod.conf b/mods/lord/Player/hud_modpack/hbhunger/mod.conf index 4abac7531..438537428 100644 --- a/mods/lord/Player/hud_modpack/hbhunger/mod.conf +++ b/mods/lord/Player/hud_modpack/hbhunger/mod.conf @@ -1,2 +1,2 @@ name = hbhunger -depends = hudbars +depends = builtin, hudbars diff --git a/mods/lord/Player/hud_modpack/hbsprint/init.lua b/mods/lord/Player/hud_modpack/hbsprint/init.lua index 522e6c23f..5e17ff2d9 100644 --- a/mods/lord/Player/hud_modpack/hbsprint/init.lua +++ b/mods/lord/Player/hud_modpack/hbsprint/init.lua @@ -1,7 +1,7 @@ local enable_stamina = false --Set to "true" to enable stamina if enable_stamina == true then -local S = minetest.get_translator("hb.sprint") +local S = minetest.get_mod_translator() -- Vars local speed = tonumber(minetest.settings:get ("sprint_speed")) or 2 diff --git a/mods/lord/Player/hud_modpack/hbsprint/locale/hbsprint.ru.tr b/mods/lord/Player/hud_modpack/hbsprint/locale/hbsprint.ru.tr index 6403aefe7..4ea23d1d8 100644 --- a/mods/lord/Player/hud_modpack/hbsprint/locale/hbsprint.ru.tr +++ b/mods/lord/Player/hud_modpack/hbsprint/locale/hbsprint.ru.tr @@ -1,2 +1,2 @@ -# textdomain: hb.sprint +# textdomain: hbsprint Stamina=Стойкость diff --git a/mods/lord/Player/hud_modpack/hbsprint/mod.conf b/mods/lord/Player/hud_modpack/hbsprint/mod.conf index 262779d73..025d9cc3b 100644 --- a/mods/lord/Player/hud_modpack/hbsprint/mod.conf +++ b/mods/lord/Player/hud_modpack/hbsprint/mod.conf @@ -1,2 +1,2 @@ name = hbsprint -depends = hudbars +depends = builtin, hudbars diff --git a/mods/lord/Player/hud_modpack/hudbars/init.lua b/mods/lord/Player/hud_modpack/hudbars/init.lua index 018d04eac..303b46d2d 100644 --- a/mods/lord/Player/hud_modpack/hudbars/init.lua +++ b/mods/lord/Player/hud_modpack/hudbars/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("hudbars") +local S = minetest.get_mod_translator() local N = function(s) return s end hb = {} diff --git a/mods/lord/Player/lord_equipment/src/equipment.lua b/mods/lord/Player/lord_equipment/src/equipment.lua index 44361aedd..5d2fc7724 100644 --- a/mods/lord/Player/lord_equipment/src/equipment.lua +++ b/mods/lord/Player/lord_equipment/src/equipment.lua @@ -5,7 +5,7 @@ local detached_inv_equipment_slots = { armor = require("equipment.armor_slots"), clothing = require("equipment.clothing_slots"), } -local SL = minetest.get_translator("lord_equipment") +local SL = minetest.get_mod_translator() local CLOTHING_EQUIPMENT_SIZE = 5 diff --git a/mods/lord/Player/lord_inventory/src/inventory/Form/AboutTab.lua b/mods/lord/Player/lord_inventory/src/inventory/Form/AboutTab.lua index dd9fbec80..1fcd09d74 100644 --- a/mods/lord/Player/lord_inventory/src/inventory/Form/AboutTab.lua +++ b/mods/lord/Player/lord_inventory/src/inventory/Form/AboutTab.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator('lord_inventory') +local S = minetest.get_mod_translator() local spec = minetest.formspec local lord_spec = forms.Spec diff --git a/mods/lord/Player/lord_inventory/src/inventory/Form/BagsTab.lua b/mods/lord/Player/lord_inventory/src/inventory/Form/BagsTab.lua index b103d92b9..58c42ffde 100644 --- a/mods/lord/Player/lord_inventory/src/inventory/Form/BagsTab.lua +++ b/mods/lord/Player/lord_inventory/src/inventory/Form/BagsTab.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator('lord_inventory') +local S = minetest.get_mod_translator() --- @class inventory.Form.BagsTab: base_classes.Form.Element.Tab diff --git a/mods/lord/Player/lord_inventory/src/inventory/Form/MainTab.lua b/mods/lord/Player/lord_inventory/src/inventory/Form/MainTab.lua index db6b5ed2a..b97468db7 100644 --- a/mods/lord/Player/lord_inventory/src/inventory/Form/MainTab.lua +++ b/mods/lord/Player/lord_inventory/src/inventory/Form/MainTab.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator('lord_inventory') +local S = minetest.get_mod_translator() local EXISTING_CRAFTING_IMAGE_LANG = { 'ru', 'en' } local DEFAULT_CRAFTING_IMAGE_LANG = 'en' diff --git a/mods/lord/Tools/arrows/arrows.lua b/mods/lord/Tools/arrows/arrows.lua index dc2d75701..ebc6daea7 100644 --- a/mods/lord/Tools/arrows/arrows.lua +++ b/mods/lord/Tools/arrows/arrows.lua @@ -1,5 +1,5 @@ -local SL = minetest.get_translator("arrows") +local SL = minetest.get_mod_translator() local KFR = 0.0002 diff --git a/mods/lord/Tools/arrows/axe.lua b/mods/lord/Tools/arrows/axe.lua index 93bd2cb89..b471481f3 100644 --- a/mods/lord/Tools/arrows/axe.lua +++ b/mods/lord/Tools/arrows/axe.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("arrows") +local SL = minetest.get_mod_translator() local AXE_MASS = 1.8 -- MASS - Масса топора local AXE_VEL = 20 -- VEL - Velocity - начальная скорость diff --git a/mods/lord/Tools/arrows/init.lua b/mods/lord/Tools/arrows/init.lua index db3de3bd3..0a1a3964d 100644 --- a/mods/lord/Tools/arrows/init.lua +++ b/mods/lord/Tools/arrows/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("arrows") +local S = minetest.get_mod_translator() --- @generic arrows = {} diff --git a/mods/lord/Tools/arrows/magic.lua b/mods/lord/Tools/arrows/magic.lua index d5265e7d9..2433fe4c3 100644 --- a/mods/lord/Tools/arrows/magic.lua +++ b/mods/lord/Tools/arrows/magic.lua @@ -1,6 +1,6 @@ -- Mob Attacks -local SL = minetest.get_translator("arrows") +local SL = minetest.get_mod_translator() local flame_node = function(pos) local n = minetest.get_node(pos).name diff --git a/mods/lord/Tools/bags/init.lua b/mods/lord/Tools/bags/init.lua index 3b427d6bd..6d92346eb 100644 --- a/mods/lord/Tools/bags/init.lua +++ b/mods/lord/Tools/bags/init.lua @@ -1,50 +1,53 @@ -local S = minetest.get_translator("bags") -minetest.register_tool("bags:small", { - description = S("Small Bag"), - inventory_image = "bags_small.png", - groups = { bagslots = 8 }, -}) -minetest.register_tool("bags:medium", { - description = S("Medium Bag"), - inventory_image = "bags_medium.png", - groups = { bagslots = 16 }, -}) -minetest.register_tool("bags:large", { - description = S("Large Bag"), - inventory_image = "bags_large.png", - groups = { bagslots = 24, forbidden = 1 }, -}) +minetest.mod(function(mod) + local S = mod.translator -minetest.register_craft({ - output = 'bags:small', - recipe = { - { '', 'group:stick', '' }, - { 'group:wool', 'default:steel_ingot', 'group:wool' }, - { 'group:wool', 'group:wool', 'group:wool' }, - } -}) + minetest.register_tool("bags:small", { + description = S("Small Bag"), + inventory_image = "bags_small.png", + groups = { bagslots = 8 }, + }) + minetest.register_tool("bags:medium", { + description = S("Medium Bag"), + inventory_image = "bags_medium.png", + groups = { bagslots = 16 }, + }) + minetest.register_tool("bags:large", { + description = S("Large Bag"), + inventory_image = "bags_large.png", + groups = { bagslots = 24, forbidden = 1 }, + }) -minetest.register_craft({ - output = 'bags:medium', - recipe = { - { 'default:steel_ingot', 'farming:string', 'default:steel_ingot' }, - { 'bags:small', 'farming:string', 'bags:small' }, - } -}) + minetest.register_craft({ + output = 'bags:small', + recipe = { + { '', 'group:stick', '' }, + { 'group:wool', 'default:steel_ingot', 'group:wool' }, + { 'group:wool', 'group:wool', 'group:wool' }, + } + }) -minetest.register_craft({ - output = 'bags:large', - recipe = { - { 'default:steel_ingot', 'bags:medium', 'default:steel_ingot' }, - { 'farming:string', 'bags:small', 'farming:string' }, - } -}) + minetest.register_craft({ + output = 'bags:medium', + recipe = { + { 'default:steel_ingot', 'farming:string', 'default:steel_ingot' }, + { 'bags:small', 'farming:string', 'bags:small' }, + } + }) -minetest.register_craft({ - output = 'bags:large', - recipe = { - { 'default:steel_ingot', 'bags:small', 'default:steel_ingot' }, - { 'farming:string', 'bags:medium', 'farming:string' }, - } -}) + minetest.register_craft({ + output = 'bags:large', + recipe = { + { 'default:steel_ingot', 'bags:medium', 'default:steel_ingot' }, + { 'farming:string', 'bags:small', 'farming:string' }, + } + }) + + minetest.register_craft({ + output = 'bags:large', + recipe = { + { 'default:steel_ingot', 'bags:small', 'default:steel_ingot' }, + { 'farming:string', 'bags:medium', 'farming:string' }, + } + }) +end) diff --git a/mods/lord/Tools/bags/mod.conf b/mods/lord/Tools/bags/mod.conf index b2caf201c..ecddfa3d7 100644 --- a/mods/lord/Tools/bags/mod.conf +++ b/mods/lord/Tools/bags/mod.conf @@ -1 +1,2 @@ name = bags +depends = builtin diff --git a/mods/lord/Tools/clans_clothes/init.lua b/mods/lord/Tools/clans_clothes/init.lua index bab98033d..8e329501f 100644 --- a/mods/lord/Tools/clans_clothes/init.lua +++ b/mods/lord/Tools/clans_clothes/init.lua @@ -1,5 +1,5 @@ minetest.mod(function(mod) - local S = minetest.get_translator("clans_clothes") + local S = mod.translator -- Кланы, которые запросили плащ, прислали текстуры на GH diff --git a/mods/lord/Tools/lord_armor/src/armor.lua b/mods/lord/Tools/lord_armor/src/armor.lua index b6c30f6d3..d193758fd 100644 --- a/mods/lord/Tools/lord_armor/src/armor.lua +++ b/mods/lord/Tools/lord_armor/src/armor.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_armor") +local S = minetest.get_mod_translator() -- Wood Armor minetest.register_tool(":lottarmor:helmet_wood", { diff --git a/mods/lord/Tools/lord_armor/src/shield.lua b/mods/lord/Tools/lord_armor/src/shield.lua index a3ec051b3..c4fd44413 100644 --- a/mods/lord/Tools/lord_armor/src/shield.lua +++ b/mods/lord/Tools/lord_armor/src/shield.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_armor") +local SL = minetest.get_mod_translator() -- Register Shields minetest.register_tool(":lottarmor:shield_wood", { diff --git a/mods/lord/Tools/lord_boats/functions.lua b/mods/lord/Tools/lord_boats/functions.lua index b7858f2b1..a6423ba7c 100644 --- a/mods/lord/Tools/lord_boats/functions.lua +++ b/mods/lord/Tools/lord_boats/functions.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_boats") +local S = minetest.get_mod_translator() local function is_water(pos) local nn = minetest.get_node(pos).name diff --git a/mods/lord/Tools/lord_boats/init.lua b/mods/lord/Tools/lord_boats/init.lua index 8ea8e6a3d..f85fc9fab 100644 --- a/mods/lord/Tools/lord_boats/init.lua +++ b/mods/lord/Tools/lord_boats/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_boats") +local S = minetest.get_mod_translator() -- Load files local default_path = minetest.get_modpath("lord_boats") diff --git a/mods/lord/Tools/lord_books/brewing.lua b/mods/lord/Tools/lord_books/brewing.lua index c98ec13e4..b669084e8 100644 --- a/mods/lord/Tools/lord_books/brewing.lua +++ b/mods/lord/Tools/lord_books/brewing.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_books") +local SL = minetest.get_mod_translator() local form = {} --- @type string diff --git a/mods/lord/Tools/lord_books/cooking.lua b/mods/lord/Tools/lord_books/cooking.lua index 8d9997b50..ef8959aee 100644 --- a/mods/lord/Tools/lord_books/cooking.lua +++ b/mods/lord/Tools/lord_books/cooking.lua @@ -2,7 +2,7 @@ -- See README for more information -- Released by Zeg9 under WTFPL -local SL = minetest.get_translator("lord_books") +local SL = minetest.get_mod_translator() zcc = {} zcc.users = {} diff --git a/mods/lord/Tools/lord_books/crafts.lua b/mods/lord/Tools/lord_books/crafts.lua index 29aa5479a..a374c4a4d 100644 --- a/mods/lord/Tools/lord_books/crafts.lua +++ b/mods/lord/Tools/lord_books/crafts.lua @@ -2,7 +2,7 @@ -- See README for more information -- Released by Zeg9 under WTFPL -local SL = minetest.get_translator("lord_books") +local SL = minetest.get_mod_translator() local DEFAULT_LANG = minetest.settings:get("language") if DEFAULT_LANG == nil or DEFAULT_LANG == "" then DEFAULT_LANG = os.getenv("LANG") end diff --git a/mods/lord/Tools/lord_books/forbidden.lua b/mods/lord/Tools/lord_books/forbidden.lua index d831e5b82..00f823134 100644 --- a/mods/lord/Tools/lord_books/forbidden.lua +++ b/mods/lord/Tools/lord_books/forbidden.lua @@ -2,7 +2,7 @@ -- See README for more information -- Released by Zeg9 under WTFPL -local SL = minetest.get_translator("lord_books") +local SL = minetest.get_mod_translator() zfc = {} zfc.users = {} diff --git a/mods/lord/Tools/lord_books/master.lua b/mods/lord/Tools/lord_books/master.lua index d95a02410..af55f0e49 100644 --- a/mods/lord/Tools/lord_books/master.lua +++ b/mods/lord/Tools/lord_books/master.lua @@ -2,7 +2,7 @@ -- See README for more information -- Released by Zeg9 under WTFPL -local SL = minetest.get_translator("lord_books") +local SL = minetest.get_mod_translator() local DEFAULT_LANG = minetest.settings:get("language") if DEFAULT_LANG == nil or DEFAULT_LANG == "" then DEFAULT_LANG = os.getenv("LANG") end diff --git a/mods/lord/Tools/lord_books/potions.lua b/mods/lord/Tools/lord_books/potions.lua index 1cd9365a5..a92a33782 100644 --- a/mods/lord/Tools/lord_books/potions.lua +++ b/mods/lord/Tools/lord_books/potions.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lord_books") +local SL = minetest.get_mod_translator() local form = {} --- @type string diff --git a/mods/lord/Tools/lord_books/protection.lua b/mods/lord/Tools/lord_books/protection.lua index 883be8819..ce8ed62b4 100644 --- a/mods/lord/Tools/lord_books/protection.lua +++ b/mods/lord/Tools/lord_books/protection.lua @@ -2,7 +2,7 @@ -- See README for more information -- Released by Zeg9 under WTFPL -local SL = minetest.get_translator("lord_books") +local SL = minetest.get_mod_translator() zpc = {} zpc.users = {} diff --git a/mods/lord/Tools/lord_books/scroll.lua b/mods/lord/Tools/lord_books/scroll.lua index 55279c7b3..c67ec4e85 100644 --- a/mods/lord/Tools/lord_books/scroll.lua +++ b/mods/lord/Tools/lord_books/scroll.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_books") +local S = minetest.get_mod_translator() local esc = minetest.formspec_escape local formspec_size = "size[8,8]" diff --git a/mods/lord/Tools/lord_bucket/init.lua b/mods/lord/Tools/lord_bucket/init.lua index dad238bec..6a08c6d26 100644 --- a/mods/lord/Tools/lord_bucket/init.lua +++ b/mods/lord/Tools/lord_bucket/init.lua @@ -1,5 +1,5 @@ minetest.mod(function(mod) - local S = minetest.get_translator("lord_bucket") + local S = minetest.get_mod_translator() minetest.register_craftitem(":bucket:bucket_ice", { diff --git a/mods/lord/Tools/lord_food/init.lua b/mods/lord/Tools/lord_food/init.lua index f4cdd86c7..f69eedb8b 100644 --- a/mods/lord/Tools/lord_food/init.lua +++ b/mods/lord/Tools/lord_food/init.lua @@ -1,12 +1,14 @@ -local S = minetest.get_translator("lord_food") -- As for now, this mod extremely small -- So, it not follow mod structure convention +minetest.mod(function(mod) + local S = mod.translator -minetest.register_craftitem("lord_food:lembas", { - description = S("Lembas"), - inventory_image = "lord_food_lembas.png", - groups = { food_bread = 1 }, - on_use = minetest.item_eat(30), - _tt_food_hp = 30, -}) + minetest.register_craftitem("lord_food:lembas", { + description = S("Lembas"), + inventory_image = "lord_food_lembas.png", + groups = { food_bread = 1 }, + on_use = minetest.item_eat(30), + _tt_food_hp = 30, + }) +end) diff --git a/mods/lord/Tools/lord_food/mod.conf b/mods/lord/Tools/lord_food/mod.conf index 647433931..9d46edaff 100644 --- a/mods/lord/Tools/lord_food/mod.conf +++ b/mods/lord/Tools/lord_food/mod.conf @@ -1,2 +1,3 @@ name = lord_food description = Lord additional foods +depends = builtin diff --git a/mods/lord/Tools/lord_money/money.lua b/mods/lord/Tools/lord_money/money.lua index ba3946cf7..0625f0810 100644 --- a/mods/lord/Tools/lord_money/money.lua +++ b/mods/lord/Tools/lord_money/money.lua @@ -1,6 +1,6 @@ -- lord_money/money.lua -local S = minetest.get_translator("lord_money") +local S = minetest.get_mod_translator() minetest.register_craftitem("lord_money:diamond_coin", { description = S("Diamond Coin"), diff --git a/mods/lord/Tools/lord_money/shop.lua b/mods/lord/Tools/lord_money/shop.lua index 246cf61aa..0667bac02 100644 --- a/mods/lord/Tools/lord_money/shop.lua +++ b/mods/lord/Tools/lord_money/shop.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_money") +local S = minetest.get_mod_translator() --- @param stack ItemStack diff --git a/mods/lord/Tools/lord_potions/src/lord_potions/api.lua b/mods/lord/Tools/lord_potions/src/lord_potions/api.lua index bb02db717..0588928eb 100644 --- a/mods/lord/Tools/lord_potions/src/lord_potions/api.lua +++ b/mods/lord/Tools/lord_potions/src/lord_potions/api.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() local colorize = minetest.colorize diff --git a/mods/lord/Tools/lord_potions/src/lord_potions/config.lua b/mods/lord/Tools/lord_potions/src/lord_potions/config.lua index 37cc49776..8ee6e5b1c 100644 --- a/mods/lord/Tools/lord_potions/src/lord_potions/config.lua +++ b/mods/lord/Tools/lord_potions/src/lord_potions/config.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() --- @class lord_potions.PotionPower diff --git a/mods/lord/Tools/lord_replacer/init.lua b/mods/lord/Tools/lord_replacer/init.lua index 34780e4cb..0c973468f 100644 --- a/mods/lord/Tools/lord_replacer/init.lua +++ b/mods/lord/Tools/lord_replacer/init.lua @@ -1,7 +1,7 @@ local table_has_value = table.has_value -local S = minetest.get_translator("lord_replacer") +local S = minetest.get_mod_translator() local DEFAULT_SELECTED_NODE = "default:dirt" local REPLACER_PLACE_BLACKLIST = { diff --git a/mods/lord/Tools/lord_screwdriver/init.lua b/mods/lord/Tools/lord_screwdriver/init.lua index bb4c4c59c..75dd9bab6 100644 --- a/mods/lord/Tools/lord_screwdriver/init.lua +++ b/mods/lord/Tools/lord_screwdriver/init.lua @@ -1,7 +1,7 @@ -- lord_screwdriver/init.lua -- Load support for MT game translation. -local S = minetest.get_translator("lord_screwdriver") +local S = minetest.get_mod_translator() -- Galvorn Screwdriver minetest.register_tool(":screwdriver:screwdriver_galvorn", { diff --git a/mods/lord/Tools/lottclothes/brandybuck.lua b/mods/lord/Tools/lottclothes/brandybuck.lua index 9e18b4e07..7537cabd2 100644 --- a/mods/lord/Tools/lottclothes/brandybuck.lua +++ b/mods/lord/Tools/lottclothes/brandybuck.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottclothes") +local SL = minetest.get_mod_translator() -- basic outfit from the the brandybuck family. -- made from blue flax and copper ingot. diff --git a/mods/lord/Tools/lottclothes/chetwood.lua b/mods/lord/Tools/lottclothes/chetwood.lua index c0475468a..17747789a 100644 --- a/mods/lord/Tools/lottclothes/chetwood.lua +++ b/mods/lord/Tools/lottclothes/chetwood.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottclothes") +local SL = minetest.get_mod_translator() -- basic outfit from the chetwood forest. -- made from green and brown felt & tin ingot. diff --git a/mods/lord/Tools/lottclothes/cloaks.lua b/mods/lord/Tools/lottclothes/cloaks.lua index 297408264..b029e4296 100644 --- a/mods/lord/Tools/lottclothes/cloaks.lua +++ b/mods/lord/Tools/lottclothes/cloaks.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottclothes") +local SL = minetest.get_mod_translator() minetest.register_tool("lottclothes:cloak_ranger", { description = SL("Ranger's Cloak"), diff --git a/mods/lord/Tools/lottclothes/elven.lua b/mods/lord/Tools/lottclothes/elven.lua index 2a7e6f86d..1e379f61a 100644 --- a/mods/lord/Tools/lottclothes/elven.lua +++ b/mods/lord/Tools/lottclothes/elven.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottclothes") +local SL = minetest.get_mod_translator() minetest.register_tool("lottclothes:hood_elven", { description = SL("Elven Hood"), diff --git a/mods/lord/Tools/lottclothes/ettenmoor.lua b/mods/lord/Tools/lottclothes/ettenmoor.lua index 9c801285c..a45298b17 100644 --- a/mods/lord/Tools/lottclothes/ettenmoor.lua +++ b/mods/lord/Tools/lottclothes/ettenmoor.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottclothes") +local SL = minetest.get_mod_translator() -- outfit from the ettenmoor region. wizard style (as possible). -- made from grey and brown felt & gold ingot. diff --git a/mods/lord/Tools/lottclothes/fabrics.lua b/mods/lord/Tools/lottclothes/fabrics.lua index 3cc54eb8f..d236e5fc9 100644 --- a/mods/lord/Tools/lottclothes/fabrics.lua +++ b/mods/lord/Tools/lottclothes/fabrics.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottclothes") +local SL = minetest.get_mod_translator() -------------------------------------------------------------------------------- -- fabrics.lua: colored fabrics as ingredient for clothes diff --git a/mods/lord/Tools/lottclothes/hobbit.lua b/mods/lord/Tools/lottclothes/hobbit.lua index c54f0ec63..04bde89f1 100644 --- a/mods/lord/Tools/lottclothes/hobbit.lua +++ b/mods/lord/Tools/lottclothes/hobbit.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottclothes") +local SL = minetest.get_mod_translator() -- basic hobbit outfit. -- made from varios flax (multi-color). diff --git a/mods/lord/Tools/lottclothes/midgewater.lua b/mods/lord/Tools/lottclothes/midgewater.lua index 7b2f730b1..e0ac7b469 100644 --- a/mods/lord/Tools/lottclothes/midgewater.lua +++ b/mods/lord/Tools/lottclothes/midgewater.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottclothes") +local SL = minetest.get_mod_translator() -- the simplest outfit available. -- made from green felt & wood (just cut down the nearest tree). diff --git a/mods/lord/Tools/lottclothes/wizard.lua b/mods/lord/Tools/lottclothes/wizard.lua index e2ec37988..b0ea32684 100644 --- a/mods/lord/Tools/lottclothes/wizard.lua +++ b/mods/lord/Tools/lottclothes/wizard.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottclothes") +local SL = minetest.get_mod_translator() -- Clothes made for wizards diff --git a/mods/lord/Tools/lottpotion/arrows.lua b/mods/lord/Tools/lottpotion/arrows.lua index 39c751b5e..93ce36e29 100644 --- a/mods/lord/Tools/lottpotion/arrows.lua +++ b/mods/lord/Tools/lottpotion/arrows.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottpotion") +local SL = minetest.get_mod_translator() local KFR=0.01 local DC=0.01 diff --git a/mods/lord/Tools/lottpotion/brewing.lua b/mods/lord/Tools/lottpotion/brewing.lua index eb09fff17..f6471cd58 100644 --- a/mods/lord/Tools/lottpotion/brewing.lua +++ b/mods/lord/Tools/lottpotion/brewing.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottpotion") +local SL = minetest.get_mod_translator() lottpotion.make_pipe = function( pipes, horizontal ) local result = {}; diff --git a/mods/lord/Tools/lottpotion/cauldron.lua b/mods/lord/Tools/lottpotion/cauldron.lua index a8494b2ba..987ac0b4a 100644 --- a/mods/lord/Tools/lottpotion/cauldron.lua +++ b/mods/lord/Tools/lottpotion/cauldron.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottpotion") +local SL = minetest.get_mod_translator() minetest.register_node("lottpotion:cauldron_full",{ drawtype="nodebox", diff --git a/mods/lord/Tools/lottpotion/init.lua b/mods/lord/Tools/lottpotion/init.lua index 52ee2893f..ce7d9e806 100644 --- a/mods/lord/Tools/lottpotion/init.lua +++ b/mods/lord/Tools/lottpotion/init.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottpotion") +local SL = minetest.get_mod_translator() local limit = { speed = 4, jump =2, diff --git a/mods/lord/Tools/lottpotion/potionbrewing.lua b/mods/lord/Tools/lottpotion/potionbrewing.lua index 3b691d31b..1e8db9d16 100644 --- a/mods/lord/Tools/lottpotion/potionbrewing.lua +++ b/mods/lord/Tools/lottpotion/potionbrewing.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("lottpotion") +local SL = minetest.get_mod_translator() -- Base Ingredients minetest.register_node("lottpotion:glass_bottle_mese", { diff --git a/mods/lord/Tools/tools/src/axes.lua b/mods/lord/Tools/tools/src/axes.lua index 5dd903116..274d65ed7 100644 --- a/mods/lord/Tools/tools/src/axes.lua +++ b/mods/lord/Tools/tools/src/axes.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("tools") +local SL = minetest.get_mod_translator() return { get_recipes = function(source) diff --git a/mods/lord/Tools/tools/src/battleaxes.lua b/mods/lord/Tools/tools/src/battleaxes.lua index eaeb62e08..49221082f 100644 --- a/mods/lord/Tools/tools/src/battleaxes.lua +++ b/mods/lord/Tools/tools/src/battleaxes.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("tools") +local SL = minetest.get_mod_translator() return { get_recipes = function(source) diff --git a/mods/lord/Tools/tools/src/daggers.lua b/mods/lord/Tools/tools/src/daggers.lua index 1ad9ca99d..ddcc21399 100644 --- a/mods/lord/Tools/tools/src/daggers.lua +++ b/mods/lord/Tools/tools/src/daggers.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("tools") +local SL = minetest.get_mod_translator() return { get_recipes = function(source) diff --git a/mods/lord/Tools/tools/src/picks.lua b/mods/lord/Tools/tools/src/picks.lua index 0d3ae96dc..a08538cbd 100644 --- a/mods/lord/Tools/tools/src/picks.lua +++ b/mods/lord/Tools/tools/src/picks.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("tools") +local SL = minetest.get_mod_translator() return { get_recipes = function(source) diff --git a/mods/lord/Tools/tools/src/shovels.lua b/mods/lord/Tools/tools/src/shovels.lua index b5a0ee690..121dd9572 100644 --- a/mods/lord/Tools/tools/src/shovels.lua +++ b/mods/lord/Tools/tools/src/shovels.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("tools") +local SL = minetest.get_mod_translator() return { get_recipes = function(source) diff --git a/mods/lord/Tools/tools/src/spears.lua b/mods/lord/Tools/tools/src/spears.lua index 1bb0b54e9..3babb7628 100644 --- a/mods/lord/Tools/tools/src/spears.lua +++ b/mods/lord/Tools/tools/src/spears.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("tools") +local SL = minetest.get_mod_translator() return { get_recipes = function(source) diff --git a/mods/lord/Tools/tools/src/special.lua b/mods/lord/Tools/tools/src/special.lua index d17df450c..8668833b1 100644 --- a/mods/lord/Tools/tools/src/special.lua +++ b/mods/lord/Tools/tools/src/special.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator('tools') +local S = minetest.get_mod_translator() minetest.register_tool('tools:sword_elven', { diff --git a/mods/lord/Tools/tools/src/swords.lua b/mods/lord/Tools/tools/src/swords.lua index cfa814c93..19064cd93 100644 --- a/mods/lord/Tools/tools/src/swords.lua +++ b/mods/lord/Tools/tools/src/swords.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("tools") +local SL = minetest.get_mod_translator() return { get_recipes = function(source) diff --git a/mods/lord/Tools/tools/src/warhammers.lua b/mods/lord/Tools/tools/src/warhammers.lua index e62b9e9cb..27adaac72 100644 --- a/mods/lord/Tools/tools/src/warhammers.lua +++ b/mods/lord/Tools/tools/src/warhammers.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("tools") +local SL = minetest.get_mod_translator() return { get_recipes = function(source) diff --git a/mods/lord/World/Generation/lottmapgen/nodes.lua b/mods/lord/World/Generation/lottmapgen/nodes.lua index aeb5ea911..dcbaf90a3 100644 --- a/mods/lord/World/Generation/lottmapgen/nodes.lua +++ b/mods/lord/World/Generation/lottmapgen/nodes.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lottmapgen") +local S = minetest.get_mod_translator() minetest.register_node("lottmapgen:angsnowblock", { description = S("Snow Block"), diff --git a/mods/lord/World/lord_spawn/init.lua b/mods/lord/World/lord_spawn/init.lua index 68774b016..898914dba 100644 --- a/mods/lord/World/lord_spawn/init.lua +++ b/mods/lord/World/lord_spawn/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_spawn") +local S = minetest.get_mod_translator() -- Some modified from: Minetest: builtin/static_spawn.lua diff --git a/mods/lord/World/mountgen/mod.conf b/mods/lord/World/mountgen/mod.conf index c892efcf9..904a77413 100644 --- a/mods/lord/World/mountgen/mod.conf +++ b/mods/lord/World/mountgen/mod.conf @@ -1 +1,2 @@ name = mountgen +depends = builtin diff --git a/mods/lord/World/mountgen/ui.lua b/mods/lord/World/mountgen/ui.lua index 03854a5d3..5c24358b5 100644 --- a/mods/lord/World/mountgen/ui.lua +++ b/mods/lord/World/mountgen/ui.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("mountgen") +local S = minetest.get_mod_translator() local esc = minetest.formspec_escape mountgen = { diff --git a/mods/lord/World/mypos/init.lua b/mods/lord/World/mypos/init.lua index ee6cb31d2..e19eed7e6 100644 --- a/mods/lord/World/mypos/init.lua +++ b/mods/lord/World/mypos/init.lua @@ -1,4 +1,4 @@ -local SL = minetest.get_translator("mypos") +local SL = minetest.get_mod_translator() minetest.register_chatcommand("mypos", { params = "", diff --git a/mods/lord/World/worldedit_ext/init.lua b/mods/lord/World/worldedit_ext/init.lua index d4984995d..d9487c337 100644 --- a/mods/lord/World/worldedit_ext/init.lua +++ b/mods/lord/World/worldedit_ext/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("worldedit_ext") +local S = minetest.get_mod_translator() worldedit.register_command('select_chunks', { params = "", diff --git a/mods/lord/_experimental/lord_bows/src/bows/api.lua b/mods/lord/_experimental/lord_bows/src/bows/api.lua index b46e02112..61c2d4d45 100644 --- a/mods/lord/_experimental/lord_bows/src/bows/api.lua +++ b/mods/lord/_experimental/lord_bows/src/bows/api.lua @@ -1,4 +1,4 @@ -local S_tt = minetest.get_translator("tt_base") +local S_tt = minetest.get_mod_translator("tt_base") require("bows.behavior.mechanics_throwing") diff --git a/mods/lord/_experimental/lord_bows/src/bows/config.lua b/mods/lord/_experimental/lord_bows/src/bows/config.lua index e3208ce62..706e91b7e 100644 --- a/mods/lord/_experimental/lord_bows/src/bows/config.lua +++ b/mods/lord/_experimental/lord_bows/src/bows/config.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_bows") +local S = minetest.get_mod_translator() return { diff --git a/mods/lord/_overwrites/MTG/carts/crafting.lua b/mods/lord/_overwrites/MTG/carts/crafting.lua index 10ea8717c..4191f3b4a 100644 --- a/mods/lord/_overwrites/MTG/carts/crafting.lua +++ b/mods/lord/_overwrites/MTG/carts/crafting.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("lord_overwrites_mtg_carts") +local S = minetest.get_mod_translator() -- -- crafting diff --git a/mods/lord/_overwrites/MTG/default/init.lua b/mods/lord/_overwrites/MTG/default/init.lua index 12247bcc2..42f0f7dbf 100644 --- a/mods/lord/_overwrites/MTG/default/init.lua +++ b/mods/lord/_overwrites/MTG/default/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator(minetest.get_current_modname()) +local S = minetest.get_mod_translator() -- default/furnace.lua diff --git a/mods/lord/_overwrites/MTG/sethome/init.lua b/mods/lord/_overwrites/MTG/sethome/init.lua index d3d5ed4a3..c086e363c 100644 --- a/mods/lord/_overwrites/MTG/sethome/init.lua +++ b/mods/lord/_overwrites/MTG/sethome/init.lua @@ -1,5 +1,5 @@ -local S = minetest.get_translator("sethome") +local S = minetest.get_mod_translator("sethome") local original_sethome_set = sethome.set diff --git a/mods/lord/_overwrites/MTG/stairs/init.lua b/mods/lord/_overwrites/MTG/stairs/init.lua index 161a372bf..3edb345a4 100644 --- a/mods/lord/_overwrites/MTG/stairs/init.lua +++ b/mods/lord/_overwrites/MTG/stairs/init.lua @@ -1,5 +1,5 @@ -local S = minetest.get_translator("lord_overwrites_mtg_stairs") +local S = minetest.get_mod_translator() -- stairs/init.lua