From 27e1175fb04d7d401256b91f13b5702a0507e423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Mart=C3=ADnez?= Date: Sun, 29 Jan 2017 18:41:03 -0300 Subject: [PATCH] Add missing translations. --- building_blocks/depends.txt | 3 +- building_blocks/init.lua | 67 ++++++++++++++++++++----------------- chains/depends.txt | 3 +- chains/init.lua | 15 +++++---- computer/computers.lua | 18 +++++----- computer/depends.txt | 3 +- computer/miscitems.lua | 3 +- computer/tetris.lua | 12 ++++--- fake_fire/depends.txt | 1 + fake_fire/init.lua | 23 ++++++++----- inbox/depends.txt | 1 + inbox/init.lua | 7 ++-- itemframes/depends.txt | 1 + itemframes/init.lua | 11 +++--- lavalamp/depends.txt | 1 + lavalamp/init.lua | 6 ++-- lrfurn/armchairs.lua | 11 +++--- lrfurn/coffeetable.lua | 10 ++++-- lrfurn/depends.txt | 1 + lrfurn/endtable.lua | 7 ++-- lrfurn/init.lua | 33 +++++++++--------- lrfurn/longsofas.lua | 14 ++++---- lrfurn/sofas.lua | 10 +++--- plasmascreen/depends.txt | 3 +- plasmascreen/init.lua | 9 +++-- 25 files changed, 162 insertions(+), 111 deletions(-) diff --git a/building_blocks/depends.txt b/building_blocks/depends.txt index 9771003..792f5cd 100644 --- a/building_blocks/depends.txt +++ b/building_blocks/depends.txt @@ -1,2 +1,3 @@ default -moreblocks? \ No newline at end of file +homedecor_i18n +moreblocks? diff --git a/building_blocks/init.lua b/building_blocks/init.lua index 86cd126..39260ac 100644 --- a/building_blocks/init.lua +++ b/building_blocks/init.lua @@ -1,6 +1,9 @@ + +local S = homedecor_i18n.gettext + minetest.register_node("building_blocks:Adobe", { tiles = {"building_blocks_Adobe.png"}, - description = "Adobe", + description = S("Adobe"), is_ground_content = true, groups = {crumbly=3}, sounds = default.node_sound_stone_defaults(), @@ -8,7 +11,7 @@ minetest.register_node("building_blocks:Adobe", { minetest.register_node("building_blocks:Roofing", { tiles = {"building_blocks_Roofing.png"}, is_ground_content = true, - description = "Roof block", + description = S("Roof block"), groups = {snappy=3}, }) minetest.register_craft({ @@ -150,7 +153,7 @@ minetest.register_craft({ }) minetest.register_node("building_blocks:smoothglass", { drawtype = "glasslike", - description = "Streak Free Glass", + description = S("Streak Free Glass"), tiles = {"building_blocks_sglass.png"}, inventory_image = minetest.inventorycube("building_blocks_sglass.png"), paramtype = "light", @@ -161,7 +164,7 @@ minetest.register_node("building_blocks:smoothglass", { }) minetest.register_node("building_blocks:grate", { drawtype = "glasslike", - description = "Grate", + description = S("Grate"), tiles = {"building_blocks_grate.png"}, inventory_image = minetest.inventorycube("building_blocks_grate.png"), paramtype = "light", @@ -171,7 +174,7 @@ minetest.register_node("building_blocks:grate", { }) minetest.register_node("building_blocks:Fireplace", { - description = "Fireplace", + description = S("Fireplace"), tiles = { "building_blocks_cast_iron.png", "building_blocks_cast_iron.png", @@ -188,7 +191,7 @@ minetest.register_node("building_blocks:Fireplace", { minetest.register_node("building_blocks:woodglass", { drawtype = "glasslike", - description = "Wood Framed Glass", + description = S("Wood Framed Glass"), tiles = {"building_blocks_wglass.png"}, inventory_image = minetest.inventorycube("building_blocks_wglass.png"), paramtype = "light", @@ -199,7 +202,7 @@ minetest.register_node("building_blocks:woodglass", { }) minetest.register_node("building_blocks:terrycloth_towel", { drawtype = "raillike", - description = "Terrycloth towel", + description = S("Terrycloth towel"), tiles = {"building_blocks_towel.png"}, inventory_image = "building_blocks_towel_inv.png", paramtype = "light", @@ -215,7 +218,7 @@ minetest.register_node("building_blocks:terrycloth_towel", { }) minetest.register_node("building_blocks:Tarmac_spread", { drawtype = "raillike", - description = "Tarmac Spread", + description = S("Tarmac Spread"), tiles = {"building_blocks_tar.png"}, inventory_image = "building_blocks_tar_spread_inv.png", paramtype = "light", @@ -232,7 +235,7 @@ minetest.register_node("building_blocks:Tarmac_spread", { }) minetest.register_node("building_blocks:BWtile", { drawtype = "raillike", - description = "Chess board tiling", + description = S("Chess board tiling"), tiles = {"building_blocks_BWtile.png"}, inventory_image = "building_blocks_bwtile_inv.png", paramtype = "light", @@ -248,7 +251,9 @@ minetest.register_node("building_blocks:BWtile", { }) minetest.register_node("building_blocks:brobble_spread", { drawtype = "raillike", - description = "Brobble Spread", + -- Translators: "Brobble" is a portmanteau of "Brick" and "Cobble". + -- Translate however you see fit. + description = S("Brobble Spread"), tiles = {"building_blocks_brobble.png"}, inventory_image = "building_blocks_brobble_spread_inv.png", paramtype = "light", @@ -264,7 +269,7 @@ minetest.register_node("building_blocks:brobble_spread", { }) minetest.register_node("building_blocks:gravel_spread", { drawtype = "raillike", - description = "Gravel Spread", + description = S("Gravel Spread"), tiles = {"default_gravel.png"}, inventory_image = "building_blocks_gravel_spread_inv.png", paramtype = "light", @@ -285,7 +290,7 @@ minetest.register_node("building_blocks:gravel_spread", { minetest.register_node("building_blocks:hardwood", { tiles = {"building_blocks_hardwood.png"}, is_ground_content = true, - description = "Hardwood", + description = S("Hardwood"), groups = {choppy=1,flammable=1}, sounds = default.node_sound_wood_defaults(), }) @@ -448,44 +453,44 @@ else bb_stairs.register_stair_and_slab("marble","building_blocks:Marble", {cracky=3}, {"building_blocks_marble.png"}, - "Marble stair", - "Marble slab" + S("Marble stair"), + S("Marble slab") ) bb_stairs.register_stair_and_slab("hardwood","building_blocks:hardwood", {choppy=1,flammable=1}, {"building_blocks_hardwood.png"}, - "Hardwood stair", - "Hardwood slab" + S("Hardwood stair"), + S("Hardwood slab") ) bb_stairs.register_stair_and_slab("fakegrass","building_blocks:fakegrass", {crumbly=3}, {"default_grass.png"}, - "Grass stair", - "Grass slab" + S("Grass stair"), + S("Grass slab") ) bb_stairs.register_stair_and_slab("tar","building_blocks:Tar", {crumbly=1}, {"building_blocks_tar.png"}, - "Tar stair", - "Tar slab" + S("Tar stair"), + S("Tar slab") ) bb_stairs.register_stair_and_slab("grate","building_blocks:grate", {cracky=1}, {"building_blocks_grate.png"}, - "Grate Stair", - "Grate Slab" + S("Grate Stair"), + S("Grate Slab") ) bb_stairs.register_stair_and_slab("Adobe", "building_blocks:Adobe", {crumbly=3}, {"building_blocks_Adobe.png"}, - "Adobe stair", - "Adobe slab" + S("Adobe stair"), + S("Adobe slab") ) bb_stairs.register_stair_and_slab("Roofing", "building_blocks:Roofing", {snappy=3}, {"building_blocks_Roofing.png"}, - "Roofing stair", - "Roofing slab" + S("Roofing stair"), + S("Roofing slab") ) end @@ -537,14 +542,14 @@ minetest.register_alias("building_blocks:faggot", "building_blocks:sticks") minetest.register_alias("marble", "building_blocks:Marble") minetest.register_node("building_blocks:Tar", { - description = "Tar", + description = S("Tar"), tiles = {"building_blocks_tar.png"}, is_ground_content = true, groups = {crumbly=1, tar_block = 1}, sounds = default.node_sound_stone_defaults(), }) minetest.register_node("building_blocks:Marble", { - description = "Marble", + description = S("Marble"), tiles = {"building_blocks_marble.png"}, is_ground_content = true, groups = {cracky=3, marble = 1}, @@ -568,7 +573,7 @@ minetest.register_craft({ }) minetest.register_tool("building_blocks:knife", { - description = "Tar Knife", + description = S("Tar Knife"), inventory_image = "building_blocks_knife.png", tool_capabilities = { max_drop_level=0, @@ -590,7 +595,7 @@ minetest.register_craft({ if not minetest.get_modpath("technic") then minetest.register_node( ":technic:granite", { - description = "Granite", + description = S("Granite"), tiles = { "technic_granite.png" }, is_ground_content = true, groups = {cracky=1}, @@ -608,7 +613,7 @@ if not minetest.get_modpath("technic") then if minetest.get_modpath("moreblocks") then stairsplus:register_all("technic", "granite", "technic:granite", { - description="Granite", + description=S("Granite"), groups={cracky=1, not_in_creative_inventory=1}, tiles={"technic_granite.png"}, }) diff --git a/chains/depends.txt b/chains/depends.txt index 331d858..7b3e79f 100644 --- a/chains/depends.txt +++ b/chains/depends.txt @@ -1 +1,2 @@ -default \ No newline at end of file +default +homedecor diff --git a/chains/init.lua b/chains/init.lua index becbb35..4a0f500 100644 --- a/chains/init.lua +++ b/chains/init.lua @@ -1,3 +1,6 @@ + +local S = homedecor_i18n.gettext + local chains_sbox = { type = "fixed", fixed = { -0.1, -0.625, -0.1, 0.1, 0.5, 0.1 } @@ -12,7 +15,7 @@ local topchains_sbox = { } minetest.register_node("chains:chain", { - description = "Hanging chain (wrought iron)", + description = S("Hanging chain (wrought iron)"), drawtype = "mesh", mesh = "chains.obj", tiles = {"chains_wrought_iron.png"}, @@ -26,7 +29,7 @@ minetest.register_node("chains:chain", { }) minetest.register_node("chains:chain_brass", { - description = "Hanging chain (brass)", + description = S("Hanging chain (brass)"), drawtype = "mesh", mesh = "chains.obj", tiles = {"chains_brass.png"}, @@ -40,7 +43,7 @@ minetest.register_node("chains:chain_brass", { }) minetest.register_node("chains:chain_top", { - description = "Hanging chain (ceiling mount, wrought iron)", + description = S("Hanging chain (ceiling mount, wrought iron)"), drawtype = "mesh", mesh = "top_chains.obj", tiles = {"chains_wrought_iron.png"}, @@ -54,7 +57,7 @@ minetest.register_node("chains:chain_top", { }) minetest.register_node("chains:chain_top_brass", { - description = "Hanging chain (ceiling mount, brass)", + description = S("Hanging chain (ceiling mount, brass)"), drawtype = "mesh", mesh = "top_chains.obj", tiles = {"chains_brass.png"}, @@ -68,7 +71,7 @@ minetest.register_node("chains:chain_top_brass", { }) minetest.register_node("chains:chandelier", { - description = "Chandelier (wrought iron)", + description = S("Chandelier (wrought iron)"), paramtype = "light", light_source = default.LIGHT_MAX-2, walkable = false, @@ -95,7 +98,7 @@ minetest.register_node("chains:chandelier", { }) minetest.register_node("chains:chandelier_brass", { - description = "Chandelier (brass)", + description = S("Chandelier (brass)"), paramtype = "light", light_source = default.LIGHT_MAX-2, walkable = false, diff --git a/computer/computers.lua b/computer/computers.lua index 877ccbd..5a7fed4 100644 --- a/computer/computers.lua +++ b/computer/computers.lua @@ -1,3 +1,6 @@ + +local S = homedecor_i18n.gettext + -- Amiga 500 lookalike computer.register("computer:shefriendSOO", { description = "SheFriendSOO", @@ -157,7 +160,7 @@ local mo_sbox = { } minetest.register_node("computer:monitor", { - description = "Monitor and keyboard", + description = S("Monitor and keyboard"), inventory_image = "computer_monitor_inv.png", drawtype = "mesh", mesh = "computer_monitor.obj", @@ -175,7 +178,6 @@ minetest.register_node("computer:monitor", { }) minetest.register_node("computer:monitor_on", { - description = "Monitor and keyboard", drawtype = "mesh", mesh = "computer_monitor.obj", tiles = {"monitor_display.png^[transformFX", "monitor_plastic.png", "computer_black.png", "monitor_plastic.png"}, @@ -200,7 +202,7 @@ minetest.register_alias("computer:monitor_desktop", "computer:monitor") --WIFI Router (linksys look-a-like) minetest.register_node("computer:router", { - description = "WIFI Router", + description = S("WIFI Router"), inventory_image = "computer_router_inv.png", tiles = {"computer_router_t.png","computer_router_bt.png","computer_router_l.png","computer_router_r.png","computer_router_b.png", {name="computer_router_f_animated.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=1.0}},}, --"computer_router_f.png"}, @@ -228,7 +230,7 @@ local pct_cbox = { --Modern PC Tower minetest.register_node("computer:tower", { - description = "Computer Tower", + description = S("Computer Tower"), inventory_image = "computer_tower_inv.png", drawtype = "mesh", mesh = "computer_tower.obj", @@ -245,7 +247,7 @@ minetest.register_alias("computer:tower_on", "computer:tower") -- Printer/scaner combo minetest.register_node("computer:printer", { - description = "Printer Scaner Combo", + description = S("Printer-Scanner Combo"), inventory_image = "computer_printer_inv.png", tiles = {"computer_printer_t.png","computer_printer_bt.png","computer_printer_l.png", "computer_printer_r.png","computer_printer_b.png","computer_printer_f.png"}, @@ -273,7 +275,7 @@ minetest.register_node("computer:printer", { --Rack Server minetest.register_node("computer:server", { drawtype = "nodebox", - description = "Rack Server", + description = S("Rack Server"), tiles = { 'computer_server_t.png', 'computer_server_bt.png', @@ -303,7 +305,8 @@ minetest.register_node("computer:server", { on_place = function(itemstack, placer, pointed_thing) local pos = pointed_thing.above if minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name ~= "air" then - minetest.chat_send_player( placer:get_player_name(), "Not enough vertical space to place a server!" ) + minetest.chat_send_player( placer:get_player_name(), + S("Not enough vertical space to place a server!" )) return itemstack end return minetest.item_place(itemstack, placer, pointed_thing) @@ -312,7 +315,6 @@ minetest.register_node("computer:server", { minetest.register_node("computer:server_on", { drawtype = "nodebox", - description = "Rack Server", tiles = { 'computer_server_t.png', 'computer_server_bt.png', diff --git a/computer/depends.txt b/computer/depends.txt index c48fe0d..947d2a7 100644 --- a/computer/depends.txt +++ b/computer/depends.txt @@ -1,3 +1,2 @@ default -intllib? - +homedecor_i18n diff --git a/computer/miscitems.lua b/computer/miscitems.lua index c5017a7..5f63c7d 100644 --- a/computer/miscitems.lua +++ b/computer/miscitems.lua @@ -4,8 +4,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 = rawget(_G, "intllib") and intllib.Getter() or function(s) return s end +local S = homedecor_i18n.gettext if (not minetest.get_modpath("homedecor")) then diff --git a/computer/tetris.lua b/computer/tetris.lua index 55e7b50..1683dcc 100644 --- a/computer/tetris.lua +++ b/computer/tetris.lua @@ -1,3 +1,6 @@ + +local S = homedecor_i18n.gettext + local shapes = { { { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } }, @@ -35,7 +38,7 @@ local buttons = "button[3,4.5;0.6,0.6;left;<]" .."button[4.2,5.3;0.6,0.6;drop;V]" .."button[4.8,4.5;0.6,0.6;rotateright;R]" .."button[5.4,4.5;0.6,0.6;right;>]" - .."button[3.5,3;2,2;new;New Game]" + .."button[3.5,3;2,2;new;"..minetest.formspec_escape(S("New Game")).."]" local formsize = "size[5.9,5.7]" local boardx, boardy = 0, 0 @@ -241,7 +244,7 @@ local function step(pos, fields) end minetest.register_node("computer:tetris_arcade", { - description="Tetris Arcade", + description=S("Tetris Arcade"), drawtype = "mesh", mesh = "tetris_arcade.obj", tiles = {"tetris_arcade.png"}, @@ -259,7 +262,8 @@ minetest.register_node("computer:tetris_arcade", { }, on_construct = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("formspec", formsize.."button[2,2.5;2,2;new;New Game]" + meta:set_string("formspec", formsize + .."button[2,2.5;2,2;new;"..minetest.formspec_escape(S("New Game")).."]" ..default.gui_bg..default.gui_bg_img..default.gui_slots) end, on_timer = function(pos) @@ -275,7 +279,7 @@ minetest.register_node("computer:tetris_arcade", { return itemstack end if minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name ~= "air" then - minetest.chat_send_player(placer:get_player_name(), "No room for place the Arcade!") + minetest.chat_send_player(placer:get_player_name(), S("No room for place the Arcade!")) return itemstack end local dir = placer:get_look_dir() diff --git a/fake_fire/depends.txt b/fake_fire/depends.txt index 562cf63..f91fb9f 100644 --- a/fake_fire/depends.txt +++ b/fake_fire/depends.txt @@ -1 +1,2 @@ default +homedecor diff --git a/fake_fire/init.lua b/fake_fire/init.lua index 63dcb24..ffedce7 100644 --- a/fake_fire/init.lua +++ b/fake_fire/init.lua @@ -1,3 +1,6 @@ + +local S = homedecor_i18n.gettext + screwdriver = screwdriver or {} local function start_smoke(pos, node, clicker, chimney) @@ -64,12 +67,16 @@ local function stop_smoke(pos) end -- FLAME TYPES -local flame_types = {"fake", "ice"} +local flame_types = { + { "fake", S("Fake fire") }, + { "ice", S("Ice fire") }, +} for _, f in ipairs(flame_types) do - minetest.register_node("fake_fire:"..f.."_fire", { - inventory_image = f.."_fire_inv.png", - description = f.." fire", + local name, desc = unpack(f) + minetest.register_node("fake_fire:"..name.."_fire", { + inventory_image = name.."_fire_inv.png", + description = desc, drawtype = "plantlike", paramtype = "light", paramtype2 = "facedir", @@ -80,7 +87,7 @@ for _, f in ipairs(flame_types) do light_source = 14, waving = 1, tiles = { - {name=f.."_fire_animated.png", animation={type="vertical_frames", + {name=name.."_fire_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}}, }, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) @@ -99,7 +106,7 @@ end minetest.register_node("fake_fire:fancy_fire", { inventory_image = "fancy_fire_inv.png", - description = "Fancy Fire", + description = S("Fancy Fire"), drawtype = "mesh", mesh = "fancy_fire.obj", paramtype = "light", @@ -136,7 +143,7 @@ minetest.register_node("fake_fire:fancy_fire", { -- EMBERS minetest.register_node("fake_fire:embers", { - description = "Glowing Embers", + description = S("Glowing Embers"), tiles = { {name="embers_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2}}, @@ -181,7 +188,7 @@ end -- FLINT and STEEL minetest.register_tool("fake_fire:flint_and_steel", { - description = "Flint and steel", + description = S("Flint and steel"), inventory_image = "flint_and_steel.png", liquids_pointable = false, stack_max = 1, diff --git a/inbox/depends.txt b/inbox/depends.txt index 4ad96d5..947d2a7 100644 --- a/inbox/depends.txt +++ b/inbox/depends.txt @@ -1 +1,2 @@ default +homedecor_i18n diff --git a/inbox/init.lua b/inbox/init.lua index 8aac0aa..7262e9f 100644 --- a/inbox/init.lua +++ b/inbox/init.lua @@ -1,3 +1,6 @@ + +local S = homedecor_i18n.gettext + local inbox = {} screwdriver = screwdriver or {} @@ -19,7 +22,7 @@ minetest.register_node("inbox:empty", { paramtype = "light", drawtype = "mesh", mesh = "inbox_mailbox.obj", - description = "Mailbox", + description = S("Mailbox"), tiles = { "inbox_red_metal.png", "inbox_white_metal.png", @@ -36,7 +39,7 @@ minetest.register_node("inbox:empty", { local meta = minetest.get_meta(pos) local owner = placer:get_player_name() meta:set_string("owner", owner) - meta:set_string("infotext", owner.."'s Mailbox") + meta:set_string("infotext", S("@1's Mailbox", owner)) local inv = meta:get_inventory() inv:set_size("main", 8*4) inv:set_size("drop", 1) diff --git a/itemframes/depends.txt b/itemframes/depends.txt index 85a4dc2..29ebd95 100644 --- a/itemframes/depends.txt +++ b/itemframes/depends.txt @@ -1,2 +1,3 @@ default +homedecor_i18n mesecons_mvps? diff --git a/itemframes/init.lua b/itemframes/init.lua index 13e688c..94004a2 100644 --- a/itemframes/init.lua +++ b/itemframes/init.lua @@ -1,3 +1,6 @@ + +local S = homedecor_i18n.gettext + local tmp = {} screwdriver = screwdriver or {} @@ -98,7 +101,7 @@ local drop_item = function(pos, node) end minetest.register_node("itemframes:frame",{ - description = "Item frame", + description = S("Item frame"), drawtype = "nodebox", node_box = { type = "fixed", @@ -121,7 +124,7 @@ minetest.register_node("itemframes:frame",{ after_place_node = function(pos, placer, itemstack) local meta = minetest.get_meta(pos) meta:set_string("owner",placer:get_player_name()) - meta:set_string("infotext","Item frame (owned by "..placer:get_player_name()..")") + meta:set_string("infotext", S("Item frame (owned by @1)", placer:get_player_name())) end, on_rightclick = function(pos, node, clicker, itemstack) if not itemstack then return end @@ -159,7 +162,7 @@ minetest.register_node("itemframes:frame",{ minetest.register_node("itemframes:pedestal",{ - description = "Pedestal", + description = S("Pedestal"), drawtype = "nodebox", node_box = { type = "fixed", fixed = { @@ -181,7 +184,7 @@ minetest.register_node("itemframes:pedestal",{ after_place_node = function(pos, placer, itemstack) local meta = minetest.get_meta(pos) meta:set_string("owner",placer:get_player_name()) - meta:set_string("infotext","Pedestal (owned by "..placer:get_player_name()..")") + meta:set_string("infotext", S("Pedestal (owned by @1)", placer:get_player_name())) end, on_rightclick = function(pos, node, clicker, itemstack) if not itemstack then return end diff --git a/lavalamp/depends.txt b/lavalamp/depends.txt index c3a2ab0..9944202 100644 --- a/lavalamp/depends.txt +++ b/lavalamp/depends.txt @@ -1,3 +1,4 @@ wool bucket +homedecor_i18n unifieddyes diff --git a/lavalamp/init.lua b/lavalamp/init.lua index 98f4767..eec843a 100644 --- a/lavalamp/init.lua +++ b/lavalamp/init.lua @@ -1,8 +1,10 @@ +local S = homedecor_i18n.gettext + lavalamp = {} minetest.register_node("lavalamp:lavalamp", { - description = "Lava Lamp", + description = S("Lava Lamp"), drawtype = "mesh", mesh = "lavalamp.obj", tiles = { @@ -45,7 +47,7 @@ minetest.register_node("lavalamp:lavalamp", { }) minetest.register_node("lavalamp:lavalamp_off", { - description = "Lava Lamp (off)", + description = S("Lava Lamp (off)"), drawtype = "mesh", mesh = "lavalamp.obj", tiles = { diff --git a/lrfurn/armchairs.lua b/lrfurn/armchairs.lua index c2b087c..1c32924 100644 --- a/lrfurn/armchairs.lua +++ b/lrfurn/armchairs.lua @@ -1,4 +1,6 @@ +local S = homedecor_i18n.gettext + local armchair_cbox = { type = "fixed", fixed = { @@ -7,12 +9,11 @@ local armchair_cbox = { } } -for i in ipairs(lrfurn.colors) do - local colour = lrfurn.colors[i][1] - local hue = lrfurn.colors[i][2] +for i, c in ipairs(lrfurn.colors) do + local colour, coldesc, hue = unpack(c) minetest.register_node("lrfurn:armchair_"..colour, { - description = "Armchair ("..colour..")", + description = S("Armchair (@1)", coldesc), drawtype = "mesh", mesh = "lrfurn_armchair.obj", tiles = { @@ -56,5 +57,5 @@ for i in ipairs(lrfurn.colors) do end if minetest.setting_get("log_mods") then - minetest.log("action", "armchairs loaded") + minetest.log("action", "[lrfurn/armchairs] "..S("Loaded!")) end diff --git a/lrfurn/coffeetable.lua b/lrfurn/coffeetable.lua index ca1cdfa..506a5bf 100644 --- a/lrfurn/coffeetable.lua +++ b/lrfurn/coffeetable.lua @@ -1,5 +1,8 @@ + +local S = homedecor_i18n.gettext + minetest.register_node("lrfurn:coffeetable_back", { - description = "Coffee Table", + description = S("Coffee Table"), drawtype = "nodebox", tiles = {"lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png"}, paramtype = "light", @@ -45,7 +48,8 @@ minetest.register_node("lrfurn:coffeetable_back", { end minetest.set_node(pos, node) else - minetest.chat_send_player(placer:get_player_name(), "No room to place the coffee table!") + minetest.chat_send_player(placer:get_player_name(), + S("No room to place the coffee table!")) minetest.set_node(pos, {name = "air"}) return true end @@ -122,5 +126,5 @@ minetest.register_craft({ }) if minetest.setting_get("log_mods") then - minetest.log("action", "coffeetable loaded") + minetest.log("action", "[lrfurn/coffeetable] "..S("Loaded!")) end diff --git a/lrfurn/depends.txt b/lrfurn/depends.txt index 470ec30..e7bb2cf 100644 --- a/lrfurn/depends.txt +++ b/lrfurn/depends.txt @@ -1,2 +1,3 @@ default wool +homedecor_i18n diff --git a/lrfurn/endtable.lua b/lrfurn/endtable.lua index fa3940a..b94da3b 100644 --- a/lrfurn/endtable.lua +++ b/lrfurn/endtable.lua @@ -1,5 +1,8 @@ + +local S = homedecor_i18n.gettext + minetest.register_node("lrfurn:endtable", { - description = "End Table", + description = S("End Table"), drawtype = "nodebox", tiles = {"lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png", "lrfurn_coffeetable_back.png"}, paramtype = "light", @@ -46,5 +49,5 @@ minetest.register_craft({ }) if minetest.setting_get("log_mods") then - minetest.log("action", "endtable loaded") + minetest.log("action", "[lrfurn/endtable] "..S("Loaded!")) end diff --git a/lrfurn/init.lua b/lrfurn/init.lua index 89bc157..9c44604 100644 --- a/lrfurn/init.lua +++ b/lrfurn/init.lua @@ -1,3 +1,6 @@ + +local S = homedecor_i18n.gettext + lrfurn = {} screwdriver = screwdriver or {} @@ -9,21 +12,21 @@ lrfurn.fdir_to_fwd = { } lrfurn.colors = { - { "black", 0xff181818 }, - { "brown", 0xff251005 }, - { "blue", 0xff0000d0 }, - { "cyan", 0xff009fa7 }, - { "dark_grey", 0xff101010 }, - { "dark_green", 0xff007000 }, - { "green", 0xff00d000 }, - { "grey", 0xff303030 }, - { "magenta", 0xffe0048b }, - { "orange", 0xffee9000 }, - { "pink", 0xffff90b0 }, - { "red", 0xff800000 }, - { "violet", 0xff9000d0 }, - { "white", 0xffffffff }, - { "yellow", 0xffdde000 } + { "black", S("black"), 0xff181818 }, + { "brown", S("brown"), 0xff251005 }, + { "blue", S("blue"), 0xff0000d0 }, + { "cyan", S("cyan"), 0xff009fa7 }, + { "dark_grey", S("dark grey"), 0xff101010 }, + { "dark_green", S("dark green"), 0xff007000 }, + { "green", S("green"), 0xff00d000 }, + { "grey", S("grey"), 0xff303030 }, + { "magenta", S("magenta"), 0xffe0048b }, + { "orange", S("orange"), 0xffee9000 }, + { "pink", S("pink"), 0xffff90b0 }, + { "red", S("red"), 0xff800000 }, + { "violet", S("violet"), 0xff9000d0 }, + { "white", S("white"), 0xffffffff }, + { "yellow", S("yellow"), 0xffdde000 } } function lrfurn.check_forward(pos, fdir, long, placer) diff --git a/lrfurn/longsofas.lua b/lrfurn/longsofas.lua index 8ca898c..ba087fb 100644 --- a/lrfurn/longsofas.lua +++ b/lrfurn/longsofas.lua @@ -1,4 +1,6 @@ +local S = homedecor_i18n.gettext + local longsofa_sbox = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 2.5} @@ -12,12 +14,11 @@ local longsofa_cbox = { } } -for i in ipairs(lrfurn.colors) do - local colour = lrfurn.colors[i][1] - local hue = lrfurn.colors[i][2] +for i, c in ipairs(lrfurn.colors) do + local colour, coldesc, hue = unpack(c) minetest.register_node("lrfurn:longsofa_"..colour, { - description = "Long Sofa ("..colour..")", + description = S("Long Sofa (@1)", coldesc), drawtype = "mesh", mesh = "lrfurn_sofa_long.obj", tiles = { @@ -41,7 +42,8 @@ for i in ipairs(lrfurn.colors) do minetest.set_node(pos, {name = "lrfurn:longsofa_"..colour, param2 = fdir}) itemstack:take_item() else - minetest.chat_send_player(placer:get_player_name(), "No room to place the sofa!") + minetest.chat_send_player(placer:get_player_name(), + S("No room to place the sofa!")) minetest.set_node(pos, { name = "air" }) end return itemstack @@ -82,5 +84,5 @@ for i in ipairs(lrfurn.colors) do end if minetest.setting_get("log_mods") then - minetest.log("action", "long sofas loaded") + minetest.log("action", "[lrfurn/longsofas] "..S("Loaded!")) end diff --git a/lrfurn/sofas.lua b/lrfurn/sofas.lua index 9ad910e..41d625a 100644 --- a/lrfurn/sofas.lua +++ b/lrfurn/sofas.lua @@ -1,4 +1,5 @@ +local S = homedecor_i18n.gettext local sofa_sbox = { type = "fixed", @@ -13,12 +14,11 @@ local sofa_cbox = { } } -for i in ipairs(lrfurn.colors) do - local colour = lrfurn.colors[i][1] - local hue = lrfurn.colors[i][2] +for i, c in ipairs(lrfurn.colors) do + local colour, coldesc, hue = unpack(c) minetest.register_node("lrfurn:sofa_"..colour, { - description = "Sofa ("..colour..")", + description = S("Sofa (@1)", coldesc), drawtype = "mesh", mesh = "lrfurn_sofa_short.obj", tiles = { @@ -83,5 +83,5 @@ for i in ipairs(lrfurn.colors) do end if minetest.setting_get("log_mods") then - minetest.log("action", "sofas loaded") + minetest.log("action", "[lrfurn/sofas] "..S("Loaded!")) end diff --git a/plasmascreen/depends.txt b/plasmascreen/depends.txt index 331d858..7b3e79f 100644 --- a/plasmascreen/depends.txt +++ b/plasmascreen/depends.txt @@ -1 +1,2 @@ -default \ No newline at end of file +default +homedecor diff --git a/plasmascreen/init.lua b/plasmascreen/init.lua index 25b2332..109e418 100644 --- a/plasmascreen/init.lua +++ b/plasmascreen/init.lua @@ -1,7 +1,10 @@ + +local S = homedecor_i18n.gettext + screwdriver = screwdriver or {} minetest.register_node("plasmascreen:stand", { - description = "Plasma Screen TV Stand", + description = S("Plasma Screen TV Stand"), tiles = {"plasmascreen_back.png"}, paramtype = "light", paramtype2 = "facedir", @@ -94,7 +97,7 @@ local function checkwall(pos) end minetest.register_node("plasmascreen:tv", { - description = "Plasma TV", + description = S("Plasma TV"), drawtype = "mesh", mesh = "plasmascreen_tv.obj", tiles = { @@ -130,7 +133,7 @@ minetest.register_node("plasmascreen:tv", { }) minetest.register_node("plasmascreen:tv_off", { - description = "Plasma TV (off)", + description = S("Plasma TV (off)"), drawtype = "mesh", mesh = "plasmascreen_tv.obj", tiles = {