Merge lp:~widelands-dev/widelands/bug-1818909-web-encyclopedia into lp:widelands

[GunChleoc]

Web encyclopedia fixes
- Add tribe-specific ware purpose texts to web encyclopedia
- Add missing purpose helptext to Frisian well

[hessenfarmer (stephan-lutz)]

Ok for the frisians well.

for the Other fix we will now have a leading space in the helptexts if "default" doesn't exist. And that is pretty much the case for all tribe specific wares.

Furthermore all help texts are coded in a way that "default" is used if tribe is not specified, although the "default" text is written in a style that it is general info applicable for all tribes.
so for me a proper fix would be to fix this in the coding (if loop) of all help texts for multi tribe wares rather than doing it like in this branch.

review: Needs Fixing

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4567. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/503493489.
Appveyor build 4354. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1818909_web_encyclopedia-4354.

[GunChleoc (gunchleoc)]

Rather than doing a complete redesign of all the wares, I call trim on the strings.

The leading and trailing whitespaces do not matter in-game, because the font renderer will kill them. The same is true for HTML, but I fixed it anyway because I don't like it if the JSON data is not clean.

[hessenfarmer (stephan-lutz)]

Ok
should be working for b20, but we should probably add some consistency after that. In a way that it is clear that default is not a default value (i.e. if no tribe specific text exists) but general (i.e. the same for all tribes)

review: Approve (code review)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4570. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/503717637.
Appveyor build 4357. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1818909_web_encyclopedia-4357.

[GunChleoc (gunchleoc)]

If you can come up with a better name for the variable, I'm all ears :)

Thanks for the review!

Input queue test timeout again

@bunnybot merge force

=== 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 17:27:45 +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 17:27:45 +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
 }

=== modified file 'src/website/map_object_info.cc'
--- src/website/map_object_info.cc	2019-02-23 11:00:49 +0000
+++ src/website/map_object_info.cc	2019-03-08 17:27:45 +0000
@@ -194,7 +194,8 @@
 			cr->push_arg(tribe.name());
 			cr->push_arg(ware.helptext_script());
 			cr->resume();
-			const std::string help_text = cr->pop_string();
+			std::string help_text = cr->pop_string();
+			boost::algorithm::trim(help_text);
 			json_ware->add_string("helptext", help_text);
 		} catch (LuaError& err) {
 			json_ware->add_string("helptext", err.what());