GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1818909-web-encyclopedia into lp:widelands.
Commit message:
Web encyclopedia fixes
- Add tribe-specific ware purpose texts to web encyclopedia
- Add missing purpose helptext to Frisian well
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1818909 in widelands: "wl_map_object_info returns wrong helptext for
frisians well"
https://bugs.launchpad.net/widelands/+bug/1818909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1818909-web-encyclopedia/+merge/364141
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1818909-web-encyclopedia into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/frisians/well/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/well/helptexts.lua 2018-04-25 07:55:28 +0000
+++ data/tribes/buildings/productionsites/frisians/well/helptexts.lua 2019-03-08 07:48:46 +0000
@@ -8,6 +8,11 @@
return pgettext ("frisians_building", "Chieftain Arldor’s retort when he was asked why his tribe can’t drink salt water")
end
+function building_helptext_purpose()
+ -- TRANSLATORS: Purpose helptext for a building
+ return pgettext("building", "Draws water out of the deep.")
+end
+
function building_helptext_note()
-- TRANSLATORS#: Note helptext for a building
return ""
=== modified file 'data/tribes/scripting/mapobject_info/ware_helptext.lua'
--- data/tribes/scripting/mapobject_info/ware_helptext.lua 2016-05-13 07:43:27 +0000
+++ data/tribes/scripting/mapobject_info/ware_helptext.lua 2019-03-08 07:48:46 +0000
@@ -4,6 +4,6 @@
return {
func = function(tribename, helptext_script)
include(helptext_script)
- return ware_helptext(tribename)
+ return ware_helptext() .. " " .. ware_helptext(tribename)
end
}
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
