From 41842c73c6a0a02ecb5135cf583195349367a9dd Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 14 Mar 2019 08:33:28 +0100 Subject: [PATCH] Fix translations in mcl_death_messages not working --- mods/HUD/mcl_death_messages/init.lua | 119 +++++++++--------- .../locale/mcl_death_messages.de.tr | 104 +++++++-------- .../mcl_death_messages/locale/template.txt | 104 +++++++-------- 3 files changed, 164 insertions(+), 163 deletions(-) diff --git a/mods/HUD/mcl_death_messages/init.lua b/mods/HUD/mcl_death_messages/init.lua index f0f6285cef..90943ecbf2 100644 --- a/mods/HUD/mcl_death_messages/init.lua +++ b/mods/HUD/mcl_death_messages/init.lua @@ -1,100 +1,101 @@ local S = minetest.get_translator("mcl_death_messages") +local N = function(s) return s end mcl_death_messages = {} -- Death messages local msgs = { ["arrow"] = { - S("%s was fatally hit by an arrow."), - S("%s has been killed with an arrow."), + N("@1 was fatally hit by an arrow."), + N("@1 has been killed with an arrow."), }, ["arrow_name"] = { - S("%s was shot by an arrow from %s."), + N("@1 was shot by an arrow from %s."), }, ["drown"] = { - S("%s forgot to breathe."), - S("%s drowned."), - S("%s ran out of oxygen."), + N("@1 forgot to breathe."), + N("@1 drowned."), + N("@1 ran out of oxygen."), }, ["murder"] = { - S("%s was killed by %s."), + N("@1 was killed by %s."), }, ["mob_kill"] = { - S("%s was killed by a mob."), + N("@1 was killed by a mob."), }, ["blaze_fireball"] = { - S("%s was burned to death by a blaze's fireball."), - S("%s was killed by a fireball from a blaze."), + N("@1 was burned to death by a blaze's fireball."), + N("@1 was killed by a fireball from a blaze."), }, ["fire_charge"] = { - S("%s was burned by a fire charge."), + N("@1 was burned by a fire charge."), }, ["ghast_fireball"] = { - S("A ghast scared %s to death."), - S("%s has been fireballed by a ghast."), + N("A ghast scared @1 to death."), + N("@1 has been fireballed by a ghast."), }, ["fall"] = { - S("%s fell from a high cliff."), - S("%s took fatal fall damage."), - S("%s fell victim to gravity."), + N("@1 fell from a high cliff."), + N("@1 took fatal fall damage."), + N("@1 fell victim to gravity."), }, ["other"] = { - S("%s died."), + N("@1 died."), } } local mobkills = { - ["mobs_mc:zombie"] = S("%s was killed by a zombie."), - ["mobs_mc:baby_zombie"] = S("%s was killed by a baby zombie."), - ["mobs_mc:blaze"] = S("%s was killed by a blaze."), - ["mobs_mc:slime"] = S("%s was killed by a slime."), - ["mobs_mc:witch"] = S("%s was killed by a witch."), - ["mobs_mc:magma_cube_tiny"] = S("%s was killed by a magma cube."), - ["mobs_mc:magma_cube_small"] = S("%s was killed by a magma cube."), - ["mobs_mc:magma_cube_big"] = S("%s was killed by a magma cube."), - ["mobs_mc:wolf"] = S("%s was killed by a wolf."), - ["mobs_mc:cat"] = S("%s was killed by a cat."), - ["mobs_mc:ocelot"] = S("%s was killed by an ocelot."), - ["mobs_mc:ender_dragon"] = S("%s was killed by an ender dragon."), - ["mobs_mc:wither"] = S("%s was killed by a wither."), - ["mobs_mc:enderman"] = S("%s was killed by an enderman."), - ["mobs_mc:endermite"] = S("%s was killed by an endermite."), - ["mobs_mc:ghast"] = S("%s was killed by a ghast."), - ["mobs_mc:guardian_elder"] = S("%s was killed by an elder guardian."), - ["mobs_mc:guardian"] = S("%s was killed by a guardian."), - ["mobs_mc:iron_golem"] = S("%s was killed by an iron golem."), - ["mobs_mc:polar_bear"] = S("%s was killed by a polar_bear."), - ["mobs_mc:killer_bunny"] = S("%s was killed by a killer bunny."), - ["mobs_mc:shulker"] = S("%s was killed by a shulker."), - ["mobs_mc:silverfish"] = S("%s was killed by a silverfish."), - ["mobs_mc:skeleton"] = S("%s was killed by a skeleton."), - ["mobs_mc:stray"] = S("%s was killed by a stray."), - ["mobs_mc:slime_tiny"] = S("%s was killed by a slime."), - ["mobs_mc:slime_small"] = S("%s was killed by a slime."), - ["mobs_mc:slime_big"] = S("%s was killed by a slime."), - ["mobs_mc:spider"] = S("%s was killed by a spider."), - ["mobs_mc:cave_spider"] = S("%s was killed by a cave spider."), - ["mobs_mc:vex"] = S("%s was killed by a vex."), - ["mobs_mc:evoker"] = S("%s was killed by an evoker."), - ["mobs_mc:illusioner"] = S("%s was killed by an illusioner."), - ["mobs_mc:vindicator"] = S("%s was killed by a vindicator."), - ["mobs_mc:villager_zombie"] = S("%s was killed by a zombie villager."), - ["mobs_mc:husk"] = S("%s was killed by a husk."), - ["mobs_mc:baby_husk"] = S("%s was killed by a baby husk."), - ["mobs_mc:pigman"] = S("%s was killed by a zombie pigman."), - ["mobs_mc:baby_pigman"] = S("%s was killed by a baby zombie pigman."), + ["mobs_mc:zombie"] = N("@1 was killed by a zombie."), + ["mobs_mc:baby_zombie"] = N("@1 was killed by a baby zombie."), + ["mobs_mc:blaze"] = N("@1 was killed by a blaze."), + ["mobs_mc:slime"] = N("@1 was killed by a slime."), + ["mobs_mc:witch"] = N("@1 was killed by a witch."), + ["mobs_mc:magma_cube_tiny"] = N("@1 was killed by a magma cube."), + ["mobs_mc:magma_cube_small"] = N("@1 was killed by a magma cube."), + ["mobs_mc:magma_cube_big"] = N("@1 was killed by a magma cube."), + ["mobs_mc:wolf"] = N("@1 was killed by a wolf."), + ["mobs_mc:cat"] = N("@1 was killed by a cat."), + ["mobs_mc:ocelot"] = N("@1 was killed by an ocelot."), + ["mobs_mc:ender_dragon"] = N("@1 was killed by an ender dragon."), + ["mobs_mc:wither"] = N("@1 was killed by a wither."), + ["mobs_mc:enderman"] = N("@1 was killed by an enderman."), + ["mobs_mc:endermite"] = N("@1 was killed by an endermite."), + ["mobs_mc:ghast"] = N("@1 was killed by a ghast."), + ["mobs_mc:guardian_elder"] = N("@1 was killed by an elder guardian."), + ["mobs_mc:guardian"] = N("@1 was killed by a guardian."), + ["mobs_mc:iron_golem"] = N("@1 was killed by an iron golem."), + ["mobs_mc:polar_bear"] = N("@1 was killed by a polar_bear."), + ["mobs_mc:killer_bunny"] = N("@1 was killed by a killer bunny."), + ["mobs_mc:shulker"] = N("@1 was killed by a shulker."), + ["mobs_mc:silverfish"] = N("@1 was killed by a silverfish."), + ["mobs_mc:skeleton"] = N("@1 was killed by a skeleton."), + ["mobs_mc:stray"] = N("@1 was killed by a stray."), + ["mobs_mc:slime_tiny"] = N("@1 was killed by a slime."), + ["mobs_mc:slime_small"] = N("@1 was killed by a slime."), + ["mobs_mc:slime_big"] = N("@1 was killed by a slime."), + ["mobs_mc:spider"] = N("@1 was killed by a spider."), + ["mobs_mc:cave_spider"] = N("@1 was killed by a cave spider."), + ["mobs_mc:vex"] = N("@1 was killed by a vex."), + ["mobs_mc:evoker"] = N("@1 was killed by an evoker."), + ["mobs_mc:illusioner"] = N("@1 was killed by an illusioner."), + ["mobs_mc:vindicator"] = N("@1 was killed by a vindicator."), + ["mobs_mc:villager_zombie"] = N("@1 was killed by a zombie villager."), + ["mobs_mc:husk"] = N("@1 was killed by a husk."), + ["mobs_mc:baby_husk"] = N("@1 was killed by a baby husk."), + ["mobs_mc:pigman"] = N("@1 was killed by a zombie pigman."), + ["mobs_mc:baby_pigman"] = N("@1 was killed by a baby zombie pigman."), } -- Select death message local dmsg = function(mtype, ...) local r = math.random(1, #msgs[mtype]) - return string.format(msgs[mtype][r], ...) + return S(msgs[mtype][r], ...) end -- Select death message for death by mob local mmsg = function(mtype, ...) if mobkills[mtype] then - return string.format(mobkills[mtype], ...) + return S(mobkills[mtype], ...) else return dmsg("mob_kill", ...) end @@ -139,7 +140,7 @@ minetest.register_on_dieplayer(function(player, reason) else field_msg = field end - msg = string.format(field_msg, name) + msg = S(field_msg, name) end elseif reason.type == "drown" then msg = dmsg("drown", name) diff --git a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.de.tr b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.de.tr index 4a65a08cde..11b0eb3da9 100644 --- a/mods/HUD/mcl_death_messages/locale/mcl_death_messages.de.tr +++ b/mods/HUD/mcl_death_messages/locale/mcl_death_messages.de.tr @@ -1,53 +1,53 @@ # textdomain: mcl_death_messages -%s was fatally hit by an arrow.=%s wurde tödlich von einem Pfeil getroffen. -%s has been killed with an arrow.=%s wurde mit einem Pfeil getötet. -%s was shot by an arrow from %s.=%s wurde mit einem Pfeil von %s abgeschossen. -%s forgot to breathe.=%s vergaß, zu atmen. -%s drowned.=%s ertrank. -%s ran out of oxygen.=%s ging die Luft aus. -%s was killed by %s.=%s wurde von %s getötet. -%s was killed by a mob.=%s wurde von einem Mob getötet. -%s was burned to death by a blaze's fireball.=%s wurde von einem Feuerball einer Lohe zu Tode verbrannt. -%s was killed by a fireball from a blaze.=%s wurde von einem Feuerball einer Lohe getötet. -%s was burned by a fire charge.=%s wurde von einer Feuerkugel verbrannt. -A ghast scared %s to death.=Ein Ghast hat %s zu Tode erschrocken. -%s has been fireballed by a ghast.=%s wurde von einem Ghast mit einer Feuerkugel abgeschossen. -%s fell from a high cliff.=%s stürzte von einer hohen Klippe. -%s took fatal fall damage.=%s nahm tödlichen Fallschaden. -%s fell victim to gravity.=%s fiel der Schwerkraft zum Opfer. -%s died.=%s starb. -%s was killed by a zombie.=%s wurde von einem Zombie getötet. -%s was killed by a baby zombie.=%s wurde von einem Zombiebaby getötet. -%s was killed by a blaze.=%s wurde von einer Lohe getötet. -%s was killed by a slime.=%s wurde von einem Schleim getötet. -%s was killed by a witch.=%s wurde von einer Hexe getötet. -%s was killed by a magma cube.=%s wurde von einem Magmakubus getötet. -%s was killed by a wolf.=%s wurde von einem Wolf getötet. -%s was killed by a cat.=%s wurde von einer Katze getötet. -%s was killed by an ocelot.=%s wurde von einem Ozelot getötet. -%s was killed by an ender dragon.=%s wurde von einem Enderdrachen getötet. -%s was killed by a wither.=%s wurde von einem Wither getötet. -%s was killed by an enderman.=%s wurde von einem Enderman getötet. -%s was killed by an endermite.=%s wurde von einer Endermilbe getötet. -%s was killed by a ghast.=%s wurde von einem Ghast getötet. -%s was killed by an elder guardian.=%s wurde von einem Großen Wächter getötet. -%s was killed by a guardian.=%s wurde von einem Wächter getötet. -%s was killed by an iron golem.=%s wurde von einem Eisengolem getötet. -%s was killed by a polar_bear.=%s wurde von einem Eisbären getötet. -%s was killed by a killer bunny.=%s wurde von einem Killerkaninchen getötet. -%s was killed by a shulker.=%s wurde von einem Shulker getötet. -%s was killed by a silverfish.=%s wurde von einem Silberfischchen getötet. -%s was killed by a skeleton.=%s wurde von einem Skelett getötet. -%s was killed by a stray.=%s wurde von einem Eiswanderer getötet. -%s was killed by a slime.=%s wurde von einem Schleim getötet. -%s was killed by a spider.=%s wurde von einer Spinne getötet. -%s was killed by a cave spider.=%s wurde von einer Höhlenspinne getötet. -%s was killed by a vex.=%s wurde von einem Plagegeist getötet. -%s was killed by an evoker.=%s wurde von einem Magier getötet. -%s was killed by an illusioner.=%s wurde von einem Illusionisten getötet. -%s was killed by a vindicator.=%s wurde von einem Diener getötet. -%s was killed by a zombie villager.=%s wurde von einem Dorfbewohnerzombie getötet. -%s was killed by a husk.=%s wurde von einem Wüstenzombie getötet. -%s was killed by a baby husk.=%s wurde von einem Wüstenzombiebaby getötet. -%s was killed by a zombie pigman.=%s wurde von einem Schweinezombie getötet. -%s was killed by a baby zombie pigman.=%s wurde von einem Schweinezombiebaby getötet. +@1 was fatally hit by an arrow.=@1 wurde tödlich von einem Pfeil getroffen. +@1 has been killed with an arrow.=@1 wurde mit einem Pfeil getötet. +@1 was shot by an arrow from @1.=@1 wurde mit einem Pfeil von @1 abgeschossen. +@1 forgot to breathe.=@1 vergaß, zu atmen. +@1 drowned.=@1 ertrank. +@1 ran out of oxygen.=@1 ging die Luft aus. +@1 was killed by @1.=@1 wurde von @1 getötet. +@1 was killed by a mob.=@1 wurde von einem Mob getötet. +@1 was burned to death by a blaze's fireball.=@1 wurde von einem Feuerball einer Lohe zu Tode verbrannt. +@1 was killed by a fireball from a blaze.=@1 wurde von einem Feuerball einer Lohe getötet. +@1 was burned by a fire charge.=@1 wurde von einer Feuerkugel verbrannt. +A ghast scared @1 to death.=Ein Ghast hat @1 zu Tode erschrocken. +@1 has been fireballed by a ghast.=@1 wurde von einem Ghast mit einer Feuerkugel abgeschossen. +@1 fell from a high cliff.=@1 stürzte von einer hohen Klippe. +@1 took fatal fall damage.=@1 nahm tödlichen Fallschaden. +@1 fell victim to gravity.=@1 fiel der Schwerkraft zum Opfer. +@1 died.=@1 starb. +@1 was killed by a zombie.=@1 wurde von einem Zombie getötet. +@1 was killed by a baby zombie.=@1 wurde von einem Zombiebaby getötet. +@1 was killed by a blaze.=@1 wurde von einer Lohe getötet. +@1 was killed by a slime.=@1 wurde von einem Schleim getötet. +@1 was killed by a witch.=@1 wurde von einer Hexe getötet. +@1 was killed by a magma cube.=@1 wurde von einem Magmakubus getötet. +@1 was killed by a wolf.=@1 wurde von einem Wolf getötet. +@1 was killed by a cat.=@1 wurde von einer Katze getötet. +@1 was killed by an ocelot.=@1 wurde von einem Ozelot getötet. +@1 was killed by an ender dragon.=@1 wurde von einem Enderdrachen getötet. +@1 was killed by a wither.=@1 wurde von einem Wither getötet. +@1 was killed by an enderman.=@1 wurde von einem Enderman getötet. +@1 was killed by an endermite.=@1 wurde von einer Endermilbe getötet. +@1 was killed by a ghast.=@1 wurde von einem Ghast getötet. +@1 was killed by an elder guardian.=@1 wurde von einem Großen Wächter getötet. +@1 was killed by a guardian.=@1 wurde von einem Wächter getötet. +@1 was killed by an iron golem.=@1 wurde von einem Eisengolem getötet. +@1 was killed by a polar_bear.=@1 wurde von einem Eisbären getötet. +@1 was killed by a killer bunny.=@1 wurde von einem Killerkaninchen getötet. +@1 was killed by a shulker.=@1 wurde von einem Shulker getötet. +@1 was killed by a silverfish.=@1 wurde von einem Silberfischchen getötet. +@1 was killed by a skeleton.=@1 wurde von einem Skelett getötet. +@1 was killed by a stray.=@1 wurde von einem Eiswanderer getötet. +@1 was killed by a slime.=@1 wurde von einem Schleim getötet. +@1 was killed by a spider.=@1 wurde von einer Spinne getötet. +@1 was killed by a cave spider.=@1 wurde von einer Höhlenspinne getötet. +@1 was killed by a vex.=@1 wurde von einem Plagegeist getötet. +@1 was killed by an evoker.=@1 wurde von einem Magier getötet. +@1 was killed by an illusioner.=@1 wurde von einem Illusionisten getötet. +@1 was killed by a vindicator.=@1 wurde von einem Diener getötet. +@1 was killed by a zombie villager.=@1 wurde von einem Dorfbewohnerzombie getötet. +@1 was killed by a husk.=@1 wurde von einem Wüstenzombie getötet. +@1 was killed by a baby husk.=@1 wurde von einem Wüstenzombiebaby getötet. +@1 was killed by a zombie pigman.=@1 wurde von einem Schweinezombie getötet. +@1 was killed by a baby zombie pigman.=@1 wurde von einem Schweinezombiebaby getötet. diff --git a/mods/HUD/mcl_death_messages/locale/template.txt b/mods/HUD/mcl_death_messages/locale/template.txt index 654b4c66e4..ce809b3533 100644 --- a/mods/HUD/mcl_death_messages/locale/template.txt +++ b/mods/HUD/mcl_death_messages/locale/template.txt @@ -1,53 +1,53 @@ # textdomain: mcl_death_messages -%s was fatally hit by an arrow.= -%s has been killed with an arrow.= -%s was shot by an arrow from %s.= -%s forgot to breathe.= -%s drowned.= -%s ran out of oxygen.= -%s was killed by %s.= -%s was killed by a mob.= -%s was burned to death by a blaze's fireball.= -%s was killed by a fireball from a blaze.= -%s was burned by a fire charge.= -A ghast scared %s to death.= -%s has been fireballed by a ghast.= -%s fell from a high cliff.= -%s took fatal fall damage.= -%s fell victim to gravity.= -%s died.= -%s was killed by a zombie.= -%s was killed by a baby zombie.= -%s was killed by a blaze.= -%s was killed by a slime.= -%s was killed by a witch.= -%s was killed by a magma cube.= -%s was killed by a wolf.= -%s was killed by a cat.= -%s was killed by an ocelot.= -%s was killed by an ender dragon.= -%s was killed by a wither.= -%s was killed by an enderman.= -%s was killed by an endermite.= -%s was killed by a ghast.= -%s was killed by an elder guardian.= -%s was killed by a guardian.= -%s was killed by an iron golem.= -%s was killed by a polar_bear.= -%s was killed by a killer bunny.= -%s was killed by a shulker.= -%s was killed by a silverfish.= -%s was killed by a skeleton.= -%s was killed by a stray.= -%s was killed by a slime.= -%s was killed by a spider.= -%s was killed by a cave spider.= -%s was killed by a vex.= -%s was killed by an evoker.= -%s was killed by an illusioner.= -%s was killed by a vindicator.= -%s was killed by a zombie villager.= -%s was killed by a husk.= -%s was killed by a baby husk.= -%s was killed by a zombie pigman.= -%s was killed by a baby zombie pigman.= +@1 was fatally hit by an arrow.= +@1 has been killed with an arrow.= +@1 was shot by an arrow from @1.= +@1 forgot to breathe.= +@1 drowned.= +@1 ran out of oxygen.= +@1 was killed by @1.= +@1 was killed by a mob.= +@1 was burned to death by a blaze's fireball.= +@1 was killed by a fireball from a blaze.= +@1 was burned by a fire charge.= +A ghast scared @1 to death.= +@1 has been fireballed by a ghast.= +@1 fell from a high cliff.= +@1 took fatal fall damage.= +@1 fell victim to gravity.= +@1 died.= +@1 was killed by a zombie.= +@1 was killed by a baby zombie.= +@1 was killed by a blaze.= +@1 was killed by a slime.= +@1 was killed by a witch.= +@1 was killed by a magma cube.= +@1 was killed by a wolf.= +@1 was killed by a cat.= +@1 was killed by an ocelot.= +@1 was killed by an ender dragon.= +@1 was killed by a wither.= +@1 was killed by an enderman.= +@1 was killed by an endermite.= +@1 was killed by a ghast.= +@1 was killed by an elder guardian.= +@1 was killed by a guardian.= +@1 was killed by an iron golem.= +@1 was killed by a polar_bear.= +@1 was killed by a killer bunny.= +@1 was killed by a shulker.= +@1 was killed by a silverfish.= +@1 was killed by a skeleton.= +@1 was killed by a stray.= +@1 was killed by a slime.= +@1 was killed by a spider.= +@1 was killed by a cave spider.= +@1 was killed by a vex.= +@1 was killed by an evoker.= +@1 was killed by an illusioner.= +@1 was killed by a vindicator.= +@1 was killed by a zombie villager.= +@1 was killed by a husk.= +@1 was killed by a baby husk.= +@1 was killed by a zombie pigman.= +@1 was killed by a baby zombie pigman.=