From 47f7b211903472c68b7026b26cb2496e8bb189ec Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 9 Dec 2019 22:02:35 +0100 Subject: [PATCH] Add missing translation for some redstone nodes --- mods/ITEMS/REDSTONE/mcl_comparators/init.lua | 16 +++++++++------- .../mcl_comparators/locale/mcl_comparators.de.tr | 3 +++ .../REDSTONE/mcl_comparators/locale/template.txt | 3 +++ mods/ITEMS/REDSTONE/mesecons_torch/init.lua | 4 ++-- .../mesecons_torch/locale/mesecons_torch.de.tr | 2 ++ .../REDSTONE/mesecons_torch/locale/template.txt | 2 ++ 6 files changed, 21 insertions(+), 9 deletions(-) diff --git a/mods/ITEMS/REDSTONE/mcl_comparators/init.lua b/mods/ITEMS/REDSTONE/mcl_comparators/init.lua index f85586b50..48bd18bfe 100644 --- a/mods/ITEMS/REDSTONE/mcl_comparators/init.lua +++ b/mods/ITEMS/REDSTONE/mcl_comparators/init.lua @@ -287,16 +287,18 @@ for _, state in pairs{mesecon.state.on, mesecon.state.off} do nodedef.groups = table.copy(nodedef.groups) nodedef.groups.not_in_creative_inventory = 1 local extra_desc = {} - if mode == "sub" then - table.insert(extra_desc, "Subtract") + if mode == "sub" or state == mesecon.state.on then nodedef.inventory_image = nil end - if state == mesecon.state.on then - table.insert(extra_desc, "Powered") - nodedef.inventory_image = nil + local desc = nodedef.description + if mode ~= "sub" and state == mesecon.state.on then + desc = S("Redstone Comparator (Powered)") + elseif mode == "sub" and state ~= mesecon.state.on then + desc = S("Redstone Comparator (Subtract)") + elseif mode == "sub" and state == mesecon.state.on then + desc = S("Redstone Comparator (Subtract, Powered)") end - nodedef.description = nodedef.description.. - " ("..table.concat(extra_desc, ", ")..")" + nodedef.description = desc end minetest.register_node(nodename, nodedef) diff --git a/mods/ITEMS/REDSTONE/mcl_comparators/locale/mcl_comparators.de.tr b/mods/ITEMS/REDSTONE/mcl_comparators/locale/mcl_comparators.de.tr index dbbd51a23..d9f6eb463 100644 --- a/mods/ITEMS/REDSTONE/mcl_comparators/locale/mcl_comparators.de.tr +++ b/mods/ITEMS/REDSTONE/mcl_comparators/locale/mcl_comparators.de.tr @@ -7,3 +7,6 @@ The side inputs are only powered by normal redstone power. The redstone comparat Transmission mode:@nThe front torch is unlit and lowered. The output is powered if, and only if the main input is powered. The two side inputs are ignored.=Übertragungsmodus:@nDie vordere Fackel ist eingefahren und leuchtet nicht auf. Die Ausgabe gibt ein Signal, wenn, nur nur wenn der Haupteingang bestromt wird. Die zwei Seiteneingänge werden ignoriert. Subtraction mode:@nThe front torch is lit. The output is powered if, and only if the main input is powered and none of the side inputs is powered.=Subtraktionsmodus:@nDie vordere Fackel leuchtet auf. Die Ausgabe gibt ein Signal wenn, nur nur wenn der Haupteingang versorgt wird und keiner der Seiteneingänge bestromt ist. Redstone Comparator=Redstonekomparator +Redstone Comparator (Subtract)=Redstonekomparator (subtrahieren) +Redstone Comparator (Powered)=Redstonekomparator (bestromt) +Redstone Comparator (Subtract, Powered)=Redstonekomparator (subtrahieren, bestromt) diff --git a/mods/ITEMS/REDSTONE/mcl_comparators/locale/template.txt b/mods/ITEMS/REDSTONE/mcl_comparators/locale/template.txt index 0f7cb9aba..d22d01765 100644 --- a/mods/ITEMS/REDSTONE/mcl_comparators/locale/template.txt +++ b/mods/ITEMS/REDSTONE/mcl_comparators/locale/template.txt @@ -7,3 +7,6 @@ The side inputs are only powered by normal redstone power. The redstone comparat Transmission mode:@nThe front torch is unlit and lowered. The output is powered if, and only if the main input is powered. The two side inputs are ignored.= Subtraction mode:@nThe front torch is lit. The output is powered if, and only if the main input is powered and none of the side inputs is powered.= Redstone Comparator= +Redstone Comparator (Subtract)= +Redstone Comparator (Powered)= +Redstone Comparator (Subtract, Powered)= diff --git a/mods/ITEMS/REDSTONE/mesecons_torch/init.lua b/mods/ITEMS/REDSTONE/mesecons_torch/init.lua index dabc292e6..81ca4cc4d 100644 --- a/mods/ITEMS/REDSTONE/mesecons_torch/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_torch/init.lua @@ -117,7 +117,7 @@ minetest.register_craft({ {"mcl_core:stick"},} }) -mcl_torches.register_torch("mesecon_torch_off", "Redstone Torch (off)", +mcl_torches.register_torch("mesecon_torch_off", S("Redstone Torch (off)"), nil, nil, "jeija_torches_off.png", @@ -143,7 +143,7 @@ mcl_torches.register_torch("mesecon_torch_off", "Redstone Torch (off)", } ) -mcl_torches.register_torch("mesecon_torch_overheated", "Redstone Torch (overheated)", +mcl_torches.register_torch("mesecon_torch_overheated", S("Redstone Torch (overheated)"), nil, nil, "jeija_torches_off.png", diff --git a/mods/ITEMS/REDSTONE/mesecons_torch/locale/mesecons_torch.de.tr b/mods/ITEMS/REDSTONE/mesecons_torch/locale/mesecons_torch.de.tr index 2166ccdda..c10fb7dce 100644 --- a/mods/ITEMS/REDSTONE/mesecons_torch/locale/mesecons_torch.de.tr +++ b/mods/ITEMS/REDSTONE/mesecons_torch/locale/mesecons_torch.de.tr @@ -1,5 +1,7 @@ # textdomain: mesecons_torch Redstone Torch=Redstonefackel +Redstone Torch (off)=Redstonefackel (aus) +Redstone Torch (overheated)=Redstonefackel (überhitzt) A redstone torch is a redstone component which can be used to invert a redstone signal. It supplies its surrounding blocks with redstone power, except for the block it is attached to. A redstone torch is normally lit, but it can also be turned off by powering the block it is attached to. While unlit, a redstone torch does not power anything.=Eine Redstonefackel ist eine Redstonekomponente, die benutzt werden kann, um ein Redstonesignal zu invertieren. Sie versorgt die benachbarten Blöcke mit Redstoneenergie, ausgenommen den Block, an dem sie befestigt wurde. Eine Redstonefackel leuchtet normalerweise, aber sie kann auch ausgeschaltet werden, indem der Block, an dem sie befestigt ist, bestromt wird. Wenn sie aus ist, wird sie nichts mit Redstoneenergie versorgen. Redstone torches can be placed at the side and on the top of full solid opaque blocks.=Redstonefackeln können an der Seite und auf der Oberseite der meisten undurchsichtigen ganzen Blöcke platziert werden. Block of Redstone=Redstoneblock diff --git a/mods/ITEMS/REDSTONE/mesecons_torch/locale/template.txt b/mods/ITEMS/REDSTONE/mesecons_torch/locale/template.txt index fb5ba71f0..387462c97 100644 --- a/mods/ITEMS/REDSTONE/mesecons_torch/locale/template.txt +++ b/mods/ITEMS/REDSTONE/mesecons_torch/locale/template.txt @@ -1,5 +1,7 @@ # textdomain: mesecons_torch Redstone Torch= +Redstone Torch (off)= +Redstone Torch (overheated)= A redstone torch is a redstone component which can be used to invert a redstone signal. It supplies its surrounding blocks with redstone power, except for the block it is attached to. A redstone torch is normally lit, but it can also be turned off by powering the block it is attached to. While unlit, a redstone torch does not power anything.= Redstone torches can be placed at the side and on the top of full solid opaque blocks.= Block of Redstone=