From 5b4c87ab3c4b82b72546fda6dba8fd3379b15b84 Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Wed, 8 Feb 2017 23:17:02 +0100 Subject: [PATCH] Fix for dynamic translations --- decor.cpp | 372 +++++++++++++++++++++++++++--------------------------- 1 file changed, 186 insertions(+), 186 deletions(-) diff --git a/decor.cpp b/decor.cpp index a48e4a3..72aa2a9 100644 --- a/decor.cpp +++ b/decor.cpp @@ -3024,193 +3024,193 @@ const char *CDecor::GetResHili(POINT posMouse) }; static const std::unordered_map tableObject = { - { 6, { false, gettext ("Tree") } }, - { 7, { false, gettext ("Tree") } }, - { 8, { false, gettext ("Tree") } }, - { 9, { false, gettext ("Tree") } }, - { 10, { false, gettext ("Tree") } }, - { 11, { false, gettext ("Tree") } }, - { 12, { false, gettext ("Enemy rocket") } }, - { 14, { false, gettext ("Platinium") } }, - { 16, { true, gettext ("Armour") } }, - { 20, { false, gettext ("Wall") } }, - { 21, { false, gettext ("Wall") } }, - { 22, { false, gettext ("Wall") } }, - { 23, { false, gettext ("Wall") } }, - { 24, { false, gettext ("Wall") } }, - { 25, { false, gettext ("Wall") } }, - { 26, { false, gettext ("Wall") } }, - { 27, { false, gettext ("Protection tower") } }, - { 28, { false, gettext ("Laboratory") } }, - { 29, { false, gettext ("Laboratory") } }, - { 30, { false, gettext ("Tree trunks") } }, - { 31, { false, gettext ("Tree trunks") } }, - { 32, { false, gettext ("Tree trunks") } }, - { 33, { false, gettext ("Tree trunks") } }, - { 34, { false, gettext ("Tree trunks") } }, - { 35, { false, gettext ("Tree trunks") } }, - { 36, { true, gettext ("Planks") } }, - { 37, { false, gettext ("Rocks") } }, - { 38, { false, gettext ("Rocks") } }, - { 39, { false, gettext ("Rocks") } }, - { 40, { false, gettext ("Rocks") } }, - { 41, { false, gettext ("Rocks") } }, - { 42, { false, gettext ("Rocks") } }, - { 43, { false, gettext ("Rocks") } }, - { 44, { true, gettext ("Stones") } }, - { 45, { false, gettext ("Fire") } }, - { 46, { false, gettext ("Fire") } }, - { 47, { false, gettext ("Fire") } }, - { 48, { false, gettext ("Fire") } }, - { 49, { false, gettext ("Fire") } }, - { 50, { false, gettext ("Fire") } }, - { 51, { false, gettext ("Fire") } }, - { 52, { false, gettext ("Fire") } }, - { 57, { true, gettext ("Tomatoes") } }, - { 58, { true, gettext ("Tomatoes") } }, - { 59, { true, gettext ("Tomatoes") } }, - { 60, { true, gettext ("Tomatoes") } }, - { 61, { false, gettext ("Garden shed") } }, - { 62, { false, gettext ("Garden shed") } }, - { 63, { true, gettext ("Eggs") } }, - { 64, { false, gettext ("Eggs") } }, - { 65, { false, gettext ("Palisade") } }, - { 66, { false, gettext ("Palisade") } }, - { 67, { false, gettext ("Palisade") } }, - { 68, { false, gettext ("Palisade") } }, - { 69, { false, gettext ("Palisade") } }, - { 70, { false, gettext ("Palisade") } }, - { 71, { false, gettext ("Palisade") } }, - { 72, { false, gettext ("Bridge") } }, - { 73, { false, gettext ("Bridge") } }, - { 80, { true, gettext ("Medical potion") } }, - { 81, { false, pgettext ("Flower|1|", "Flowers") } }, - { 82, { true, pgettext ("Flower|1|", "Bunch of flowers") } }, - { 83, { false, pgettext ("Flower|2|", "Flowers") } }, - { 84, { true, pgettext ("Flower|2|", "Bunch of flowers") } }, - { 85, { true, gettext ("Dynamite") } }, - { 86, { true, gettext ("Dynamite") } }, - { 87, { true, gettext ("Dynamite") } }, - { 92, { true, gettext ("Poison") } }, - { 93, { true, gettext ("Sticky trap") } }, - { 94, { false, pgettext ("Flower|3|", "Flowers") } }, - { 95, { true, pgettext ("Flower|3|", "Bunch of flowers") } }, - { 96, { true, gettext ("Trapped enemy") } }, - { 97, { true, gettext ("Trapped enemy") } }, - { 98, { true, gettext ("Trapped enemy") } }, - { 99, { false, gettext ("Enemy construction") } }, - { 100, { false, gettext ("Enemy construction") } }, - { 101, { false, gettext ("Enemy construction") } }, - { 102, { false, gettext ("Enemy construction") } }, - { 103, { false, gettext ("Enemy construction") } }, - { 104, { false, gettext ("Enemy construction") } }, - { 105, { false, gettext ("Enemy construction") } }, - { 106, { false, gettext ("Enemy construction") } }, - { 107, { false, gettext ("Enemy construction") } }, - { 108, { false, gettext ("Enemy construction") } }, - { 109, { false, gettext ("Enemy construction") } }, - { 110, { false, gettext ("Enemy construction") } }, - { 111, { false, gettext ("Enemy construction") } }, - { 112, { false, gettext ("Enemy construction") } }, - { 113, { false, gettext ("Blupi's house") } }, - { 114, { true, gettext ("Trapped enemy") } }, - { 115, { false, gettext ("Enemy construction") } }, - { 116, { false, gettext ("Enemy construction") } }, - { 117, { true, gettext ("Boat") } }, - { 118, { true, gettext ("Jeep") } }, - { 119, { false, gettext ("Workshop") } }, - { 120, { false, gettext ("Workshop") } }, - { 121, { false, gettext ("Mine") } }, - { 122, { false, gettext ("Mine") } }, - { 123, { true, gettext ("Iron") } }, - { 124, { false, gettext ("Flag") } }, - { 125, { true, gettext ("Time bomb") } }, - { 126, { false, gettext ("Mine") } }, - { 127, { true, gettext ("Time bomb") } }, - { 128, { false, gettext ("Enemy construction") } }, - { 129, { false, gettext ("Enemy construction") } }, - { 130, { true, gettext ("Trapped enemy") } }, + { 6, { false, translate ("Tree") } }, + { 7, { false, translate ("Tree") } }, + { 8, { false, translate ("Tree") } }, + { 9, { false, translate ("Tree") } }, + { 10, { false, translate ("Tree") } }, + { 11, { false, translate ("Tree") } }, + { 12, { false, translate ("Enemy rocket") } }, + { 14, { false, translate ("Platinium") } }, + { 16, { true, translate ("Armour") } }, + { 20, { false, translate ("Wall") } }, + { 21, { false, translate ("Wall") } }, + { 22, { false, translate ("Wall") } }, + { 23, { false, translate ("Wall") } }, + { 24, { false, translate ("Wall") } }, + { 25, { false, translate ("Wall") } }, + { 26, { false, translate ("Wall") } }, + { 27, { false, translate ("Protection tower") } }, + { 28, { false, translate ("Laboratory") } }, + { 29, { false, translate ("Laboratory") } }, + { 30, { false, translate ("Tree trunks") } }, + { 31, { false, translate ("Tree trunks") } }, + { 32, { false, translate ("Tree trunks") } }, + { 33, { false, translate ("Tree trunks") } }, + { 34, { false, translate ("Tree trunks") } }, + { 35, { false, translate ("Tree trunks") } }, + { 36, { true, translate ("Planks") } }, + { 37, { false, translate ("Rocks") } }, + { 38, { false, translate ("Rocks") } }, + { 39, { false, translate ("Rocks") } }, + { 40, { false, translate ("Rocks") } }, + { 41, { false, translate ("Rocks") } }, + { 42, { false, translate ("Rocks") } }, + { 43, { false, translate ("Rocks") } }, + { 44, { true, translate ("Stones") } }, + { 45, { false, translate ("Fire") } }, + { 46, { false, translate ("Fire") } }, + { 47, { false, translate ("Fire") } }, + { 48, { false, translate ("Fire") } }, + { 49, { false, translate ("Fire") } }, + { 50, { false, translate ("Fire") } }, + { 51, { false, translate ("Fire") } }, + { 52, { false, translate ("Fire") } }, + { 57, { true, translate ("Tomatoes") } }, + { 58, { true, translate ("Tomatoes") } }, + { 59, { true, translate ("Tomatoes") } }, + { 60, { true, translate ("Tomatoes") } }, + { 61, { false, translate ("Garden shed") } }, + { 62, { false, translate ("Garden shed") } }, + { 63, { true, translate ("Eggs") } }, + { 64, { false, translate ("Eggs") } }, + { 65, { false, translate ("Palisade") } }, + { 66, { false, translate ("Palisade") } }, + { 67, { false, translate ("Palisade") } }, + { 68, { false, translate ("Palisade") } }, + { 69, { false, translate ("Palisade") } }, + { 70, { false, translate ("Palisade") } }, + { 71, { false, translate ("Palisade") } }, + { 72, { false, translate ("Bridge") } }, + { 73, { false, translate ("Bridge") } }, + { 80, { true, translate ("Medical potion") } }, + { 81, { false, ptranslate ("Flower|1|", "Flowers") } }, + { 82, { true, ptranslate ("Flower|1|", "Bunch of flowers") } }, + { 83, { false, ptranslate ("Flower|2|", "Flowers") } }, + { 84, { true, ptranslate ("Flower|2|", "Bunch of flowers") } }, + { 85, { true, translate ("Dynamite") } }, + { 86, { true, translate ("Dynamite") } }, + { 87, { true, translate ("Dynamite") } }, + { 92, { true, translate ("Poison") } }, + { 93, { true, translate ("Sticky trap") } }, + { 94, { false, ptranslate ("Flower|3|", "Flowers") } }, + { 95, { true, ptranslate ("Flower|3|", "Bunch of flowers") } }, + { 96, { true, translate ("Trapped enemy") } }, + { 97, { true, translate ("Trapped enemy") } }, + { 98, { true, translate ("Trapped enemy") } }, + { 99, { false, translate ("Enemy construction") } }, + { 100, { false, translate ("Enemy construction") } }, + { 101, { false, translate ("Enemy construction") } }, + { 102, { false, translate ("Enemy construction") } }, + { 103, { false, translate ("Enemy construction") } }, + { 104, { false, translate ("Enemy construction") } }, + { 105, { false, translate ("Enemy construction") } }, + { 106, { false, translate ("Enemy construction") } }, + { 107, { false, translate ("Enemy construction") } }, + { 108, { false, translate ("Enemy construction") } }, + { 109, { false, translate ("Enemy construction") } }, + { 110, { false, translate ("Enemy construction") } }, + { 111, { false, translate ("Enemy construction") } }, + { 112, { false, translate ("Enemy construction") } }, + { 113, { false, translate ("Blupi's house") } }, + { 114, { true, translate ("Trapped enemy") } }, + { 115, { false, translate ("Enemy construction") } }, + { 116, { false, translate ("Enemy construction") } }, + { 117, { true, translate ("Boat") } }, + { 118, { true, translate ("Jeep") } }, + { 119, { false, translate ("Workshop") } }, + { 120, { false, translate ("Workshop") } }, + { 121, { false, translate ("Mine") } }, + { 122, { false, translate ("Mine") } }, + { 123, { true, translate ("Iron") } }, + { 124, { false, translate ("Flag") } }, + { 125, { true, translate ("Time bomb") } }, + { 126, { false, translate ("Mine") } }, + { 127, { true, translate ("Time bomb") } }, + { 128, { false, translate ("Enemy construction") } }, + { 129, { false, translate ("Enemy construction") } }, + { 130, { true, translate ("Trapped enemy") } }, }; static const std::unordered_map tableFloor = { - { 1, { false, gettext ("Normal ground") } }, - { 2, { false, gettext ("Bank") } }, - { 3, { false, gettext ("Bank") } }, - { 4, { false, gettext ("Bank") } }, - { 5, { false, gettext ("Bank") } }, - { 6, { false, gettext ("Bank") } }, - { 7, { false, gettext ("Bank") } }, - { 8, { false, gettext ("Bank") } }, - { 9, { false, gettext ("Bank") } }, - { 10, { false, gettext ("Bank") } }, - { 11, { false, gettext ("Bank") } }, - { 12, { false, gettext ("Bank") } }, - { 13, { false, gettext ("Bank") } }, - { 14, { false, gettext ("Water") } }, - { 15, { false, gettext ("Paving stones") } }, - { 16, { false, gettext ("Paving stones") } }, - { 17, { false, gettext ("Striped paving stones") } }, - { 18, { false, gettext ("Ice") } }, - { 19, { false, gettext ("Burnt ground") } }, - { 20, { false, gettext ("Inflammable ground") } }, - { 21, { false, gettext ("Miscellaneous ground") } }, - { 22, { false, gettext ("Miscellaneous ground") } }, - { 23, { false, gettext ("Miscellaneous ground") } }, - { 24, { false, gettext ("Miscellaneous ground") } }, - { 25, { false, gettext ("Miscellaneous ground") } }, - { 26, { false, gettext ("Miscellaneous ground") } }, - { 27, { false, gettext ("Miscellaneous ground") } }, - { 28, { false, gettext ("Miscellaneous ground") } }, - { 29, { false, gettext ("Miscellaneous ground") } }, - { 30, { false, gettext ("Miscellaneous ground") } }, - { 31, { false, gettext ("Miscellaneous ground") } }, - { 32, { false, gettext ("Miscellaneous ground") } }, - { 33, { false, gettext ("Sterile ground") } }, - { 34, { false, gettext ("Miscellaneous ground") } }, - { 35, { false, gettext ("Miscellaneous ground") } }, - { 36, { false, gettext ("Miscellaneous ground") } }, - { 37, { false, gettext ("Miscellaneous ground") } }, - { 38, { false, gettext ("Miscellaneous ground") } }, - { 39, { false, gettext ("Miscellaneous ground") } }, - { 40, { false, gettext ("Miscellaneous ground") } }, - { 41, { false, gettext ("Miscellaneous ground") } }, - { 42, { false, gettext ("Miscellaneous ground") } }, - { 43, { false, gettext ("Miscellaneous ground") } }, - { 44, { false, gettext ("Miscellaneous ground") } }, - { 45, { false, gettext ("Miscellaneous ground") } }, - { 46, { false, gettext ("Sterile ground") } }, - { 47, { false, gettext ("Sterile ground") } }, - { 48, { false, gettext ("Sterile ground") } }, - { 49, { false, gettext ("Normal ground") } }, - { 50, { false, gettext ("Normal ground") } }, - { 51, { false, gettext ("Normal ground") } }, - { 52, { false, gettext ("Incubator") } }, - { 53, { false, gettext ("Incubator") } }, - { 54, { false, gettext ("Incubator") } }, - { 55, { false, gettext ("Incubator") } }, - { 56, { false, gettext ("Incubator") } }, - { 57, { false, gettext ("Normal ground") } }, - { 58, { false, gettext ("Inflammable ground") } }, - { 59, { false, gettext ("Bridge") } }, - { 60, { false, gettext ("Bridge") } }, - { 61, { false, gettext ("Bridge") } }, - { 62, { false, gettext ("Bridge") } }, - { 63, { false, gettext ("Bridge") } }, - { 64, { false, gettext ("Bridge") } }, - { 65, { false, gettext ("Enemy ground") } }, - { 66, { false, gettext ("Miscellaneous ground") } }, - { 67, { false, gettext ("Enemy ground") } }, - { 68, { false, gettext ("Water") } }, - { 69, { false, gettext ("Water") } }, - { 70, { false, gettext ("Water") } }, - { 71, { false, gettext ("Sterile ground") } }, - { 78, { false, gettext ("Miscellaneous ground") } }, - { 79, { false, gettext ("Miscellaneous ground") } }, - { 80, { false, gettext ("Teleporter") } }, - { 81, { false, gettext ("Teleporter") } }, - { 82, { false, gettext ("Teleporter") } }, - { 83, { false, gettext ("Teleporter") } }, - { 84, { false, gettext ("Teleporter") } }, + { 1, { false, translate ("Normal ground") } }, + { 2, { false, translate ("Bank") } }, + { 3, { false, translate ("Bank") } }, + { 4, { false, translate ("Bank") } }, + { 5, { false, translate ("Bank") } }, + { 6, { false, translate ("Bank") } }, + { 7, { false, translate ("Bank") } }, + { 8, { false, translate ("Bank") } }, + { 9, { false, translate ("Bank") } }, + { 10, { false, translate ("Bank") } }, + { 11, { false, translate ("Bank") } }, + { 12, { false, translate ("Bank") } }, + { 13, { false, translate ("Bank") } }, + { 14, { false, translate ("Water") } }, + { 15, { false, translate ("Paving stones") } }, + { 16, { false, translate ("Paving stones") } }, + { 17, { false, translate ("Striped paving stones") } }, + { 18, { false, translate ("Ice") } }, + { 19, { false, translate ("Burnt ground") } }, + { 20, { false, translate ("Inflammable ground") } }, + { 21, { false, translate ("Miscellaneous ground") } }, + { 22, { false, translate ("Miscellaneous ground") } }, + { 23, { false, translate ("Miscellaneous ground") } }, + { 24, { false, translate ("Miscellaneous ground") } }, + { 25, { false, translate ("Miscellaneous ground") } }, + { 26, { false, translate ("Miscellaneous ground") } }, + { 27, { false, translate ("Miscellaneous ground") } }, + { 28, { false, translate ("Miscellaneous ground") } }, + { 29, { false, translate ("Miscellaneous ground") } }, + { 30, { false, translate ("Miscellaneous ground") } }, + { 31, { false, translate ("Miscellaneous ground") } }, + { 32, { false, translate ("Miscellaneous ground") } }, + { 33, { false, translate ("Sterile ground") } }, + { 34, { false, translate ("Miscellaneous ground") } }, + { 35, { false, translate ("Miscellaneous ground") } }, + { 36, { false, translate ("Miscellaneous ground") } }, + { 37, { false, translate ("Miscellaneous ground") } }, + { 38, { false, translate ("Miscellaneous ground") } }, + { 39, { false, translate ("Miscellaneous ground") } }, + { 40, { false, translate ("Miscellaneous ground") } }, + { 41, { false, translate ("Miscellaneous ground") } }, + { 42, { false, translate ("Miscellaneous ground") } }, + { 43, { false, translate ("Miscellaneous ground") } }, + { 44, { false, translate ("Miscellaneous ground") } }, + { 45, { false, translate ("Miscellaneous ground") } }, + { 46, { false, translate ("Sterile ground") } }, + { 47, { false, translate ("Sterile ground") } }, + { 48, { false, translate ("Sterile ground") } }, + { 49, { false, translate ("Normal ground") } }, + { 50, { false, translate ("Normal ground") } }, + { 51, { false, translate ("Normal ground") } }, + { 52, { false, translate ("Incubator") } }, + { 53, { false, translate ("Incubator") } }, + { 54, { false, translate ("Incubator") } }, + { 55, { false, translate ("Incubator") } }, + { 56, { false, translate ("Incubator") } }, + { 57, { false, translate ("Normal ground") } }, + { 58, { false, translate ("Inflammable ground") } }, + { 59, { false, translate ("Bridge") } }, + { 60, { false, translate ("Bridge") } }, + { 61, { false, translate ("Bridge") } }, + { 62, { false, translate ("Bridge") } }, + { 63, { false, translate ("Bridge") } }, + { 64, { false, translate ("Bridge") } }, + { 65, { false, translate ("Enemy ground") } }, + { 66, { false, translate ("Miscellaneous ground") } }, + { 67, { false, translate ("Enemy ground") } }, + { 68, { false, translate ("Water") } }, + { 69, { false, translate ("Water") } }, + { 70, { false, translate ("Water") } }, + { 71, { false, translate ("Sterile ground") } }, + { 78, { false, translate ("Miscellaneous ground") } }, + { 79, { false, translate ("Miscellaneous ground") } }, + { 80, { false, translate ("Teleporter") } }, + { 81, { false, translate ("Teleporter") } }, + { 82, { false, translate ("Teleporter") } }, + { 83, { false, translate ("Teleporter") } }, + { 84, { false, translate ("Teleporter") } }, }; if (m_bHideTooltips) @@ -3264,7 +3264,7 @@ const char *CDecor::GetResHili(POINT posMouse) if ( m_celHili.x % 2 && m_celHili.y % 2) - return obj->second.text; + return gettext (obj->second.text); } } @@ -3273,7 +3273,7 @@ const char *CDecor::GetResHili(POINT posMouse) { const auto obj = tableFloor.find (icon); if (obj != tableFloor.end ()) - return obj->second.text; + return gettext (obj->second.text); } }