remove homedecor_i18n and merged into homedecor_common, fixed meseon global error

2019-04-21 16:25:21 +01:00
parent 8b78caf7c6
commit 0cd8bd7780
95 changed files with 74 additions and 107 deletions
--- a/building_blocks/alias.lua
+++ b/building_blocks/alias.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
 	minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar")
--- a/building_blocks/depends.txt
+++ b/building_blocks/depends.txt
@@ -1,5 +1,5 @@
 default
-homedecor_i18n
+homedecor_common
 moreblocks?
 gloopblocks?
 stairs?
--- a/building_blocks/init.lua
+++ b/building_blocks/init.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 local modpath = minetest.get_modpath("building_blocks")

 dofile(modpath.."/alias.lua")
--- a/building_blocks/node_stairs.lua
+++ b/building_blocks/node_stairs.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"}

--- a/building_blocks/others.lua
+++ b/building_blocks/others.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 minetest.register_craftitem("building_blocks:sticks", {
 	description = S("Small bundle of sticks"),
--- a/building_blocks/recipes.lua
+++ b/building_blocks/recipes.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 if minetest.get_modpath("moreblocks") then
 	minetest.register_craft({
--- a/computer/computers.lua
+++ b/computer/computers.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 -- Amiga 500 lookalike
 computer.register("computer:shefriendSOO", {
--- a/computer/depends.txt
+++ b/computer/depends.txt
@@ -1,2 +1,2 @@
 default
-homedecor_i18n
+homedecor_common
--- a/computer/miscitems.lua
+++ b/computer/miscitems.lua
@@ -2,7 +2,7 @@

 -- This file defines some items in order to not have to depend on other mods.

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 if (not minetest.get_modpath("homedecor")) then

--- a/computer/tetris.lua
+++ b/computer/tetris.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local shapes = {
   {  { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } },
--- a/fake_fire/depends.txt
+++ b/fake_fire/depends.txt
@@ -1,2 +1,2 @@
 default
-homedecor_i18n
+homedecor_common
--- a/fake_fire/init.lua
+++ b/fake_fire/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 screwdriver = screwdriver or {}

--- a/homedecor_bathroom/depends.txt
+++ b/homedecor_bathroom/depends.txt
@@ -2,5 +2,4 @@ homedecor_common
 default
 basic_materials
 unifieddyes
-homedecor_i18n
 building_blocks
--- a/homedecor_bathroom/init.lua
+++ b/homedecor_bathroom/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 minetest.register_node(":homedecor:bathroom_tiles_dark", {
 	description = S("Bathroom/kitchen tiles (dark)"),
@@ -115,9 +115,6 @@ homedecor.register("medicine_cabinet_open", {

 -- "Sanitation" related

-
-local S = homedecor_i18n.gettext
-
 local toilet_sbox = {
 	type = "fixed",
 	fixed = { -6/16, -8/16, -8/16, 6/16, 9/16, 8/16 },
--- a/homedecor_bedroom/depends.txt
+++ b/homedecor_bedroom/depends.txt
@@ -2,5 +2,4 @@ homedecor_common
 default
 basic_materials
 unifieddyes
-homedecor_i18n
 creative
--- a/homedecor_bedroom/init.lua
+++ b/homedecor_bedroom/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local function N_(x) return x end

--- a/homedecor_books/depends.txt
+++ b/homedecor_books/depends.txt
@@ -1,6 +1,5 @@
 homedecor_common
 default
 unifieddyes
-homedecor_i18n
 creative

--- a/homedecor_books/init.lua
+++ b/homedecor_books/init.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local function N_(x) return x end

--- a/homedecor_climate_control/depends.txt
+++ b/homedecor_climate_control/depends.txt
@@ -1,5 +1,4 @@
 homedecor_common
 default
 basic_materials
-homedecor_i18n
 building_blocks?
--- a/homedecor_climate_control/init.lua
+++ b/homedecor_climate_control/init.lua
@@ -1,6 +1,6 @@
 -- Nodes that would affect the local temperature e.g. fans, heater, A/C

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 homedecor.register("air_conditioner", {
 	description = S("Air Conditioner"),
--- a/homedecor_clocks/depends.txt
+++ b/homedecor_clocks/depends.txt
@@ -2,5 +2,4 @@ homedecor_common
 default
 basic_materials
 dye
-homedecor_i18n
 building_blocks?
--- a/homedecor_clocks/init.lua
+++ b/homedecor_clocks/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local clock_sbox = {
 	type = "fixed",
--- a/homedecor_cobweb/depends.txt
+++ b/homedecor_cobweb/depends.txt
@@ -1,3 +1,2 @@
 homedecor_common
 default
-homedecor_i18n
--- a/homedecor_cobweb/init.lua
+++ b/homedecor_cobweb/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 minetest.register_node(":homedecor:cobweb_corner", {
 	description = S("Cobweb"),
--- a/homedecor_common/crafts.lua
+++ b/homedecor_common/crafts.lua
@@ -1,6 +1,6 @@
 -- crafts for common items that are used by more than one home decor component

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 -- items

--- a/homedecor_common/depends.txt
+++ b/homedecor_common/depends.txt
@@ -1,4 +1,3 @@
 default
-homedecor_i18n
 creative
-building_blocks?
+
--- a/homedecor_common/expansion.lua
+++ b/homedecor_common/expansion.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 -- vectors to place one node next to or behind another

--- a/homedecor_common/furnaces.lua
+++ b/homedecor_common/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 S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local function swap_node(pos, name)
 	local node = minetest.get_node(pos)
--- a/homedecor_common/init.lua
+++ b/homedecor_common/init.lua
@@ -3,11 +3,14 @@

 local modpath = minetest.get_modpath("homedecor_common")

-local S = homedecor_i18n.gettext
-
 homedecor = {}
 homedecor.modpath = modpath

+-- Intllib support
+homedecor.gettext, homedecor.ngettext = dofile(modpath.."/intllib.lua")
+
+local S = homedecor.gettext
+
 -- Determine if the item being pointed at is the underside of a node (e.g a ceiling)
 function homedecor.find_ceiling(itemstack, placer, pointed_thing)
 	-- most of this is copied from the rotate-and-place function in builtin
--- a/homedecor_common/intllib.lua
+++ b/homedecor_common/intllib.lua
--- a/homedecor_common/inventory.lua
+++ b/homedecor_common/inventory.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local default_can_dig = function(pos,player)
 	local meta = minetest.get_meta(pos)
--- a/homedecor_common/locale/de.po
+++ b/homedecor_common/locale/de.po
--- a/homedecor_common/locale/es.po
+++ b/homedecor_common/locale/es.po
--- a/homedecor_common/locale/fr.po
+++ b/homedecor_common/locale/fr.po
--- a/homedecor_common/locale/it.po
+++ b/homedecor_common/locale/it.po
--- a/homedecor_common/locale/ms.po
+++ b/homedecor_common/locale/ms.po
--- a/homedecor_common/locale/pt.po
+++ b/homedecor_common/locale/pt.po
--- a/homedecor_common/locale/pt_BR.po
+++ b/homedecor_common/locale/pt_BR.po
--- a/homedecor_common/locale/ru.po
+++ b/homedecor_common/locale/ru.po
--- a/homedecor_common/locale/template.pot
+++ b/homedecor_common/locale/template.pot
--- a/homedecor_common/tools/updatepo.sh
+++ b/homedecor_common/tools/updatepo.sh
--- a/homedecor_doors_and_gates/depends.txt
+++ b/homedecor_doors_and_gates/depends.txt
@@ -2,6 +2,5 @@ homedecor_common
 default
 basic_materials
 dye
-homedecor_i18n
 doors
 mesecons?
--- a/homedecor_doors_and_gates/init.lua
+++ b/homedecor_doors_and_gates/init.lua
@@ -1,10 +1,13 @@
 -- Node definitions for Homedecor doors

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local function N_(x) return x end

-local m_rules = mesecon and mesecon.rules and mesecon.rules.pplate
+local m_rules
+if minetest.global_exists("mesecon") then
+	m_rules = mesecon and mesecon.rules and mesecon.rules.pplate
+end

 -- doors

--- a/homedecor_electrical/depends.txt
+++ b/homedecor_electrical/depends.txt
@@ -1,4 +1,3 @@
 homedecor_common
 default
 basic_materials
-homedecor_i18n
--- a/homedecor_electrical/init.lua
+++ b/homedecor_electrical/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 homedecor.register("power_outlet", {
 	description = S("Power Outlet"),
--- a/homedecor_electronics/depends.txt
+++ b/homedecor_electronics/depends.txt
@@ -1,5 +1,4 @@
 homedecor_common
 default
 basic_materials
-homedecor_i18n
 moreblocks?
--- a/homedecor_electronics/init.lua
+++ b/homedecor_electronics/init.lua
@@ -1,6 +1,6 @@
 -- Various home electronics

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 homedecor.register("speaker", {
 	description = S("Large Stereo Speaker"),
--- a/homedecor_exterior/depends.txt
+++ b/homedecor_exterior/depends.txt
@@ -1,7 +1,6 @@
 homedecor_common
 default
 dye
-homedecor_i18n
 creative
 moreblocks?
 building_blocks?
--- a/homedecor_exterior/init.lua
+++ b/homedecor_exterior/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local function N_(x) return x end

--- a/homedecor_fences/depends.txt
+++ b/homedecor_fences/depends.txt
@@ -2,5 +2,4 @@ homedecor_common
 default
 basic_materials
 dye
-homedecor_i18n
 signs_lib?
--- a/homedecor_fences/init.lua
+++ b/homedecor_fences/init.lua
@@ -14,7 +14,7 @@ if signs_modpath then
 	sign_post_model = signs_lib.sign_post_model.nodebox
 end

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local materials = {
 	{ S("brass"), "brass" },
--- a/homedecor_foyer/depends.txt
+++ b/homedecor_foyer/depends.txt
@@ -1,4 +1,3 @@
 homedecor_common
 default
 dye
-homedecor_i18n
--- a/homedecor_foyer/init.lua
+++ b/homedecor_foyer/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 homedecor.register("coatrack_wallmount", {
 	tiles = { homedecor.plain_wood },
--- a/homedecor_furniture/depends.txt
+++ b/homedecor_furniture/depends.txt
@@ -1,7 +1,6 @@
 homedecor_common
 default
 unifieddyes
-homedecor_i18n
 wool
 moreblocks?
 technic?
--- a/homedecor_furniture/init.lua
+++ b/homedecor_furniture/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local table_colors = {
 	{ "",           S("Table"),           homedecor.plain_wood },
--- a/homedecor_furniture_medieval/depends.txt
+++ b/homedecor_furniture_medieval/depends.txt
@@ -1,4 +1,3 @@
 homedecor_common
 default
-homedecor_i18n
 creative
--- a/homedecor_furniture_medieval/init.lua
+++ b/homedecor_furniture_medieval/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 homedecor.register("bars", {
 	description = S("Bars"),
--- a/homedecor_gastronomy/depends.txt
+++ b/homedecor_gastronomy/depends.txt
@@ -2,7 +2,6 @@ homedecor_common
 default
 basic_materials
 dye
-homedecor_i18n
 creative
 currency?
 bucket?
--- a/homedecor_gastronomy/init.lua
+++ b/homedecor_gastronomy/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local cutlery_cbox = {
 	type = "fixed",
--- a/homedecor_i18n/depends.txt
+++ b/homedecor_i18n/depends.txt
@@ -1 +0,0 @@
-intllib?
--- a/homedecor_i18n/init.lua
+++ b/homedecor_i18n/init.lua
@@ -1,7 +0,0 @@
-
-- This file intentionally left blank.
-
-homedecor_i18n = { }
-
-local MP = minetest.get_modpath(minetest.get_current_modname())
-homedecor_i18n.gettext, homedecor_i18n.ngettext = dofile(MP.."/intllib.lua")
--- a/homedecor_kitchen/depends.txt
+++ b/homedecor_kitchen/depends.txt
@@ -2,7 +2,6 @@ homedecor_common
 default
 basic_materials
 dye
-homedecor_i18n
 moreblocks?
 building_blocks?
 technic?
--- a/homedecor_kitchen/init.lua
+++ b/homedecor_kitchen/init.lua
@@ -1,6 +1,6 @@
 -- This file supplies Kitchen stuff like refrigerators, sinks, etc.

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local function N_(x) return x end

@@ -138,8 +138,6 @@ homedecor.register("dishwasher_"..m, {
 })
 end

-local S = homedecor_i18n.gettext
-
 local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png"
 local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)"

--- a/homedecor_laundry/depends.txt
+++ b/homedecor_laundry/depends.txt
@@ -1,5 +1,4 @@
 homedecor_common
 default
 basic_materials
-homedecor_i18n
 bucket?
--- a/homedecor_lighting/depends.txt
+++ b/homedecor_lighting/depends.txt
@@ -2,7 +2,6 @@ homedecor_common
 default
 basic_materials
 unifieddyes
-homedecor_i18n
 creative
 moreblocks?
 building_blocks?
--- a/homedecor_lighting/init.lua
+++ b/homedecor_lighting/init.lua
@@ -1,6 +1,6 @@
 -- This file supplies glowlights

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local glowlight_nodebox = {
 	half = homedecor.nodebox.slab_y(1/2),
--- a/homedecor_misc/depends.txt
+++ b/homedecor_misc/depends.txt
@@ -2,7 +2,6 @@ homedecor_common
 default
 basic_materials
 unifieddyes
-homedecor_i18n
 building_blocks?
 technic?
 bucket?
--- a/homedecor_misc/init.lua
+++ b/homedecor_misc/init.lua
@@ -7,7 +7,7 @@
 -- The code for ovens, nightstands, refrigerators are basically modified
 -- copies of the code for chests and furnaces.

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 homedecor.register("ceiling_paint", {
 	description = S("Textured Ceiling Paint"),
@@ -630,7 +630,7 @@ homedecor.register("dartboard", {
 --
 -- Mostly my own code; overall template borrowed from game default

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 minetest.register_craft( {
        output = "homedecor:flower_pot_terracotta",
--- a/homedecor_office/depends.txt
+++ b/homedecor_office/depends.txt
@@ -2,6 +2,5 @@ homedecor_common
 default
 basic_materials
 dye
-homedecor_i18n
 moreblocks?
 building_blocks?
--- a/homedecor_office/init.lua
+++ b/homedecor_office/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 homedecor.register("filing_cabinet", {
 	description = S("Filing cabinet"),
--- a/homedecor_pictures_and_paintings/depends.txt
+++ b/homedecor_pictures_and_paintings/depends.txt
@@ -1,4 +1,3 @@
 homedecor_common
 default
 dye
-homedecor_i18n
--- a/homedecor_pictures_and_paintings/init.lua
+++ b/homedecor_pictures_and_paintings/init.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local pframe_cbox = {
 	type = "fixed",
--- a/homedecor_roofing/depends.txt
+++ b/homedecor_roofing/depends.txt
@@ -1,4 +1,3 @@
 homedecor_common
 default
 dye
-homedecor_i18n
--- a/homedecor_roofing/init.lua
+++ b/homedecor_roofing/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local function N_(x) return x end

--- a/homedecor_tables/depends.txt
+++ b/homedecor_tables/depends.txt
@@ -1,4 +1,3 @@
 homedecor_common
 default
 basic_materials
-homedecor_i18n
--- a/homedecor_tables/init.lua
+++ b/homedecor_tables/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 -- Various kinds of tables

--- a/homedecor_trash_cans/depends.txt
+++ b/homedecor_trash_cans/depends.txt
@@ -2,4 +2,3 @@ homedecor_common
 default
 basic_materials
 dye
-homedecor_i18n
--- a/homedecor_trash_cans/init.lua
+++ b/homedecor_trash_cans/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local tg_cbox = {
 	type = "fixed",
--- a/homedecor_windows_and_treatments/depends.txt
+++ b/homedecor_windows_and_treatments/depends.txt
@@ -2,5 +2,4 @@ homedecor_common
 default
 basic_materials
 unifieddyes
-homedecor_i18n
 building_blocks?
--- a/homedecor_windows_and_treatments/init.lua
+++ b/homedecor_windows_and_treatments/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 homedecor.register("window_quartered", {
 	description = S("Window (quartered)"),
--- a/inbox/depends.txt
+++ b/inbox/depends.txt
@@ -1,3 +1,3 @@
 default
-homedecor_i18n
+homedecor_common
 screwdriver?
--- a/inbox/init.lua
+++ b/inbox/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local inbox = {}
 local screwdriver = rawget(_G, "screwdriver") or {}
--- a/itemframes/depends.txt
+++ b/itemframes/depends.txt
@@ -1,3 +1,3 @@
 default
-homedecor_i18n
+homedecor_common
 mesecons_mvps?
--- a/itemframes/init.lua
+++ b/itemframes/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local tmp = {}
 screwdriver = screwdriver or {}
--- a/lavalamp/depends.txt
+++ b/lavalamp/depends.txt
@@ -1,4 +1,4 @@
 wool
 bucket
-homedecor_i18n
+homedecor_common
 unifieddyes
--- a/lavalamp/init.lua
+++ b/lavalamp/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 lavalamp = {}

--- a/lrfurn/armchairs.lua
+++ b/lrfurn/armchairs.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 local armchair_cbox = {
 	type = "fixed",
 	fixed = {
--- a/lrfurn/coffeetable.lua
+++ b/lrfurn/coffeetable.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 minetest.register_alias("lrfurn:coffeetable_back", "lrfurn:coffeetable")
 minetest.register_alias("lrfurn:coffeetable_front", "air")
--- a/lrfurn/depends.txt
+++ b/lrfurn/depends.txt
@@ -1,4 +1,4 @@
 default
 wool
-homedecor_i18n
+homedecor_common
 unifieddyes
--- a/lrfurn/endtable.lua
+++ b/lrfurn/endtable.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 minetest.register_node("lrfurn:endtable", {
 	description = S("End Table"),
--- a/lrfurn/init.lua
+++ b/lrfurn/init.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 lrfurn = {}
 screwdriver = screwdriver or {}
--- a/lrfurn/longsofas.lua
+++ b/lrfurn/longsofas.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local longsofa_cbox = {
 	type = "wallmounted",
--- a/lrfurn/sofas.lua
+++ b/lrfurn/sofas.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 local sofa_cbox = {
 	type = "wallmounted",
--- a/plasmascreen/depends.txt
+++ b/plasmascreen/depends.txt
@@ -1,3 +1,3 @@
 default
-homedecor_i18n
+homedecor_common
 homedecor_electronics
--- a/plasmascreen/init.lua
+++ b/plasmascreen/init.lua
@@ -1,5 +1,5 @@

-local S = homedecor_i18n.gettext
+local S = homedecor.gettext

 screwdriver = screwdriver or {}