Refactoring: Core: add minetest.get_mod_translator(). Closes #1753

lord-server · Oct 31, 2024 · 1b49bb4 · 1b49bb4
1 parent 1e5dbde
commit 1b49bb4
Show file tree

Hide file tree

Showing 231 changed files with 326 additions and 300 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-local S = minetest.get_translator("lord_ground")
+local S = minetest.get_mod_translator()
 
 local dirt = {
 	--- @type table<string,NodeDefinition>|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
@@ -1,4 +1,4 @@
-local S = minetest.get_translator("lord_ground")
+local S = minetest.get_mod_translator()
 
 local sand = {
 	--- @type table<string,NodeDefinition>|NodeDefinition[]

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-local S = minetest.get_translator("lord_rocks")
+local S = minetest.get_mod_translator()
 
 local rocks = {
 	--- @type table<string,NodeDefinition>|NodeDefinition[]

diff --git 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
@@ -1,4 +1,4 @@
-local S = minetest.get_translator("lord_trees")
+local S = minetest.get_mod_translator()
 
 
 local leaves = {