From 7fc9966945980b714d89803ba39703bb67dd0c8f Mon Sep 17 00:00:00 2001 From: Olivier Dragon Date: Mon, 31 Aug 2020 00:00:18 -0400 Subject: [PATCH] Move armor.get_translator to API --- 3d_armor/api.lua | 5 +++-- 3d_armor/init.lua | 10 ++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/3d_armor/api.lua b/3d_armor/api.lua index 831eeaa..fa0c338 100644 --- a/3d_armor/api.lua +++ b/3d_armor/api.lua @@ -1,5 +1,5 @@ -- support for i18n -local S = armor.get_translator +local S = minetest.get_translator(minetest.get_current_modname()) local skin_previews = {} local use_player_monoids = minetest.global_exists("player_monoids") @@ -74,7 +74,8 @@ armor = { on_destroy = {}, }, migrate_old_inventory = true, - version = "0.4.13", + version = "0.4.13", + get_translator = S } armor.config = { diff --git a/3d_armor/init.lua b/3d_armor/init.lua index e3e05a2..d39a355 100644 --- a/3d_armor/init.lua +++ b/3d_armor/init.lua @@ -5,14 +5,12 @@ local last_punch_time = {} local pending_players = {} local timer = 0 --- local functions -local S = minetest.get_translator(minetest.get_current_modname()) -local F = minetest.formspec_escape - -armor.get_translator = S - dofile(modpath.."/api.lua") +-- local functions +local F = minetest.formspec_escape +local S = armor.get_translator + -- integration test if minetest.settings:get_bool("enable_3d_armor_integration_test") then dofile(modpath.."/integration_test.lua")