From 24db06a0b02498d870c1e8921b05e60964924711 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 5 Feb 2015 10:14:44 +0100 Subject: [PATCH] fix intllib support and remove unnecessary checks of it --- computer/miscitems.lua | 7 +------ homedecor/init.lua | 8 +------- signs_lib/init.lua | 8 +------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/computer/miscitems.lua b/computer/miscitems.lua index 9703e1cd..c5017a7d 100644 --- a/computer/miscitems.lua +++ b/computer/miscitems.lua @@ -5,12 +5,7 @@ -- This file defines some items in order to not have to depend on other mods. -- Boilerplate to support localized strings if intllib mod is installed. -local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() -else - S = function(s) return s end -end +local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end if (not minetest.get_modpath("homedecor")) then diff --git a/homedecor/init.lua b/homedecor/init.lua index 231cc6a4..673bab35 100644 --- a/homedecor/init.lua +++ b/homedecor/init.lua @@ -16,15 +16,9 @@ homedecor.debug = 0 homedecor.detail_level = 16 homedecor.modpath = minetest.get_modpath("homedecor") -homedecor.intllib_modpath = minetest.get_modpath("intllib") -- Boilerplate to support localized strings if intllib mod is installed. -local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() -else - S = function(s) return s end -end +local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end homedecor.gettext = S -- debug diff --git a/signs_lib/init.lua b/signs_lib/init.lua index 3bbc0336..f573848f 100644 --- a/signs_lib/init.lua +++ b/signs_lib/init.lua @@ -13,7 +13,6 @@ signs_lib = {} signs_lib.modpath = minetest.get_modpath("signs_lib") -signs_lib.intllib_modpath = minetest.get_modpath("intllib") signs_lib.wall_sign_model = { nodebox = { @@ -77,12 +76,7 @@ signs_lib.sign_post_model = { } -- Boilerplate to support localized strings if intllib mod is installed. -local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() -else - S = function(s) return s end -end +local S = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end signs_lib.gettext = S -- the list of standard sign nodes