Merge lp:~widelands-dev/widelands/bug-1374831 into lp:widelands

[GunChleoc]

Removed numbers and world names from terrain descnames. Added category info for terrains to editor into tool.

[SirVer (sirver)]

review: Approve

=== modified file 'src/base/i18n.cc'
--- src/base/i18n.cc	2014-11-27 09:40:39 +0000
+++ src/base/i18n.cc	2015-01-30 23:27:26 +0000
@@ -318,7 +318,7 @@
 const std::string & get_locale() {return locale;}
 
 
-std::string localize_item_list(const std::vector<std::string>& items, ConcatenateWith listtype) {
+std::string localize_list(const std::vector<std::string>& items, ConcatenateWith listtype) {
 	std::string result = "";
 	for (std::vector<std::string>::const_iterator it = items.begin(); it != items.end(); ++it) {
 		if (it == items.begin()) {

=== modified file 'src/base/i18n.h'
--- src/base/i18n.h	2014-11-27 09:40:39 +0000
+++ src/base/i18n.h	2015-01-30 23:27:26 +0000
@@ -57,7 +57,7 @@
 // Localize a list of 'items'. The last 2 items are concatenated with "and" or
 // "or", depending on 'concatenate_with'.
 enum class ConcatenateWith {AND, OR, AMPERSAND, COMMA};
-std::string localize_item_list(const std::vector<std::string>& items, ConcatenateWith concatenate_with);
+std::string localize_list(const std::vector<std::string>& items, ConcatenateWith concatenate_with);
 
 }
 

=== modified file 'src/editor/tools/editor_info_tool.cc'
--- src/editor/tools/editor_info_tool.cc	2014-11-27 07:53:21 +0000
+++ src/editor/tools/editor_info_tool.cc	2015-01-30 23:27:26 +0000
@@ -26,6 +26,7 @@
 #include "base/i18n.h"
 #include "editor/editorinteractive.h"
 #include "logic/map.h"
+#include "logic/world/editor_category.h"
 #include "logic/world/terrain_description.h"
 #include "logic/world/world.h"
 #include "ui_basic/multilinetextarea.h"
@@ -100,6 +101,31 @@
 
 	buf += "• " + (boost::format(_("Name: %s")) % ter.descname()).str() + "\n";
 
+	Widelands::TerrainDescription::Type terrain_is = ter.get_is();
+	std::vector<std::string> terrain_is_strings;
+
+	if (terrain_is == Widelands::TerrainDescription::Type::GREEN) {
+		terrain_is_strings.push_back(_("arable"));
+	}
+	if (terrain_is & Widelands::TerrainDescription::Type::DRY) {
+		terrain_is_strings.push_back(_("treeless"));
+	}
+	if (terrain_is & Widelands::TerrainDescription::Type::WATER) {
+		terrain_is_strings.push_back(_("aquatic"));
+	}
+	if (terrain_is & Widelands::TerrainDescription::Type::ACID) {
+		terrain_is_strings.push_back(_("dead"));
+	}
+	if (terrain_is & Widelands::TerrainDescription::Type::MOUNTAIN) {
+		terrain_is_strings.push_back(_("mountainous"));
+	}
+	if (terrain_is & Widelands::TerrainDescription::Type::UNPASSABLE) {
+		terrain_is_strings.push_back(_("unpassable"));
+	}
+	buf += "• " + (boost::format(_("Category: %s"))
+						% i18n::localize_list(terrain_is_strings, i18n::ConcatenateWith::AMPERSAND)).str() + "\n";
+	buf += "• " + (boost::format(_("Editor Category: %s")) % ter.editor_category().descname()).str() + "\n";
+
 	// *** Resources info
 	buf += std::string("\n") + _("Resources:") + "\n";
 

=== modified file 'src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc'
--- src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc	2014-12-07 20:52:55 +0000
+++ src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc	2015-01-30 23:27:26 +0000
@@ -156,7 +156,7 @@
 	/** TRANSLATORS: %1% = terrain name, %2% = list of terrain types  */
 	const std::string tooltip = ((boost::format("%1%: %2%"))
 								  % terrain_descr.descname()
-								  % i18n::localize_item_list(tooltips, i18n::ConcatenateWith::AND)).str();
+								  % i18n::localize_list(tooltips, i18n::ConcatenateWith::AND)).str();
 
 	std::unique_ptr<const Image>& image = offscreen_images->back();
 	UI::Checkbox* cb = new UI::Checkbox(parent, Point(0, 0), image.get(), tooltip);

=== modified file 'src/logic/production_program.cc'
--- src/logic/production_program.cc	2014-12-01 21:47:22 +0000
+++ src/logic/production_program.cc	2015-01-30 23:27:26 +0000
@@ -403,7 +403,7 @@
 	for (const WareIndex& temp_ware : group.first) {
 		condition_list.push_back(tribe.get_ware_descr(temp_ware)->descname());
 	}
-	std::string condition = i18n::localize_item_list(condition_list, i18n::ConcatenateWith::AND);
+	std::string condition = i18n::localize_list(condition_list, i18n::ConcatenateWith::AND);
 	if (1 < group.second) {
 		/** TRANSLATORS: This is an item in a list of wares, e.g. "3x water": */
 		/** TRANSLATORS:    %1$s = "3" */
@@ -425,7 +425,7 @@
 	for (const WareIndex& temp_ware : group.first) {
 		condition_list.push_back(tribe.get_ware_descr(temp_ware)->descname());
 	}
-	std::string condition = i18n::localize_item_list(condition_list, i18n::ConcatenateWith::AND);
+	std::string condition = i18n::localize_list(condition_list, i18n::ConcatenateWith::AND);
 	if (1 < group.second) {
 		/** TRANSLATORS: This is an item in a list of wares, e.g. "3x water": */
 		/** TRANSLATORS:    %1$i = "3" */
@@ -570,7 +570,7 @@
 				condition_list.push_back(condition->description_negation(ps.owner().tribe()));
 			}
 		}
-		std::string condition_string = i18n::localize_item_list(condition_list, i18n::ConcatenateWith::AND);
+		std::string condition_string = i18n::localize_list(condition_list, i18n::ConcatenateWith::AND);
 
 		std::string result_string = "";
 		if (m_result == Failed) {
@@ -934,7 +934,7 @@
 			for (const WareIndex& ware : group.first) {
 				ware_list.push_back(tribe.get_ware_descr(ware)->descname());
 			}
-			std::string ware_string = i18n::localize_item_list(ware_list, i18n::ConcatenateWith::OR);
+			std::string ware_string = i18n::localize_list(ware_list, i18n::ConcatenateWith::OR);
 
 			uint8_t const count = group.second;
 			if (1 < count) {
@@ -955,7 +955,7 @@
 				/** TRANSLATORS: e.g. 'Did not start working because 3x water and 3x wheat are missing' */
 				/** TRANSLATORS: e.g. 'Did not start working because fish, meat or pitta bread is missing' */
 				(boost::format(ngettext("%s is missing", "%s are missing", nr_missing_groups))
-				 % i18n::localize_item_list(group_list, i18n::ConcatenateWith::AND))
+				 % i18n::localize_list(group_list, i18n::ConcatenateWith::AND))
 				 .str();
 
 		std::string result_string =
@@ -1067,7 +1067,7 @@
 		}
 		ware_descnames.push_back(ware_descname);
 	}
-	std::string ware_list = i18n::localize_item_list(ware_descnames, i18n::ConcatenateWith::AND);
+	std::string ware_list = i18n::localize_list(ware_descnames, i18n::ConcatenateWith::AND);
 
 	/** TRANSLATORS: %s is a list of wares */
 	const std::string result_string = (boost::format(_("Produced %s")) % ware_list).str();
@@ -1162,7 +1162,7 @@
 		}
 		worker_descnames.push_back(worker_descname);
 	}
-	std::string unit_string = i18n::localize_item_list(worker_descnames, i18n::ConcatenateWith::AND);
+	std::string unit_string = i18n::localize_list(worker_descnames, i18n::ConcatenateWith::AND);
 
 	/** TRANSLATORS: %s is a list of workers */
 	const std::string result_string = (boost::format(_("Recruited %s")) % unit_string).str();

=== modified file 'src/ui_fsmenu/load_map_or_game.h'
--- src/ui_fsmenu/load_map_or_game.h	2014-12-06 12:22:35 +0000
+++ src/ui_fsmenu/load_map_or_game.h	2015-01-30 23:27:26 +0000
@@ -60,7 +60,7 @@
 	void parse(const std::string& author_list) {
 		std::vector<std::string> authors;
 		boost::split(authors, author_list, boost::is_any_of(","));
-		m_names = i18n::localize_item_list(authors, i18n::ConcatenateWith::AMPERSAND);
+		m_names = i18n::localize_list(authors, i18n::ConcatenateWith::AMPERSAND);
 		m_number = authors.size();
 	}
 

=== modified file 'src/ui_fsmenu/loadgame.cc'
--- src/ui_fsmenu/loadgame.cc	2015-01-26 11:14:39 +0000
+++ src/ui_fsmenu/loadgame.cc	2015-01-30 23:27:26 +0000
@@ -186,7 +186,7 @@
 				/** TRANSLATORS: Tooltip for the "Mode" column when choosing a game/replay to load. */
 				/** TRANSLATORS: %s is a list of game modes. */
 				((boost::format(_("Game Mode: %s."))
-				  % i18n::localize_item_list(modes, i18n::ConcatenateWith::COMMA))).str();
+				  % i18n::localize_list(modes, i18n::ConcatenateWith::COMMA))).str();
 		const std::string mode_tooltip_2 =
 				_("Numbers are the number of players.");
 

=== modified file 'src/wui/encyclopedia_window.cc'
--- src/wui/encyclopedia_window.cc	2014-11-30 18:49:38 +0000
+++ src/wui/encyclopedia_window.cc	2015-01-30 23:27:26 +0000
@@ -186,7 +186,7 @@
 					no_of_wares = no_of_wares + ware_types.size();
 
 					std::string ware_type_names =
-							i18n::localize_item_list(ware_type_descnames, i18n::ConcatenateWith::OR);
+							i18n::localize_list(ware_type_descnames, i18n::ConcatenateWith::OR);
 
 					//  Make sure to detect if someone changes the type so that it
 					//  needs more than 3 decimal digits to represent.

=== modified file 'world/terrains/init.lua'
--- world/terrains/init.lua	2015-01-20 18:34:53 +0000
+++ world/terrains/init.lua	2015-01-30 23:27:26 +0000
@@ -30,7 +30,7 @@
    name = "wiese1",
 
    -- The name that will be used in UI and translated.
-   descname = _ "Meadow 1",
+   descname = _ "Meadow",
 
    -- The category for sorting this into menus in the editor.
    editor_category = "green",
@@ -68,7 +68,7 @@
 
 world:new_terrain_type{
    name = "wiese2",
-   descname = _ "Meadow 2",
+   descname = _ "Meadow",
    editor_category = "green",
    is = "green",
    valid_resources = {"water"},
@@ -84,7 +84,7 @@
 
 world:new_terrain_type{
    name = "wiese3",
-   descname = _ "Meadow 3",
+   descname = _ "Meadow",
    editor_category = "green",
    is = "green",
    valid_resources = {"water"},
@@ -99,7 +99,7 @@
 
 world:new_terrain_type{
    name = "wiese4",
-   descname = _ "Meadow 4",
+   descname = _ "Meadow",
    editor_category = "green",
    is = "green",
    valid_resources = {"water"},
@@ -159,7 +159,7 @@
 
 world:new_terrain_type{
    name = "berg1",
-   descname = _ "Mountain 1",
+   descname = _ "Mountain",
    editor_category = "green",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -174,7 +174,7 @@
 
 world:new_terrain_type{
    name = "berg2",
-   descname = _ "Mountain 2",
+   descname = _ "Mountain",
    editor_category = "green",
    is = "mountain",
    valid_resources = {"coal", "iron", "gold", "granite"},
@@ -189,7 +189,7 @@
 
 world:new_terrain_type{
    name = "berg3",
-   descname = _ "Mountain 3",
+   descname = _ "Mountain",
    editor_category = "green",
    is = "mountain",
    valid_resources = {"coal", "iron", "gold", "granite"},
@@ -204,7 +204,7 @@
 
 world:new_terrain_type{
    name = "berg4",
-   descname = _ "Mountain 4",
+   descname = _ "Mountain",
    editor_category = "green",
    is = "mountain",
    valid_resources = {"coal", "iron", "gold", "granite"},
@@ -315,7 +315,7 @@
 
 world:new_terrain_type{
    name = "ashes2",
-   descname = _ "Ashes 2",
+   descname = _ "Ashes",
    editor_category = "wasteland",
    is = "green",
    valid_resources = { "water" },
@@ -330,7 +330,7 @@
 
 world:new_terrain_type{
    name = "hardground1",
-   descname = _ "Hard Ground 1",
+   descname = _ "Hard Ground",
    editor_category = "wasteland",
    is = "green",
    valid_resources = { "water" },
@@ -345,7 +345,7 @@
 
 world:new_terrain_type{
    name = "hardground2",
-   descname = _ "Hard Ground 2",
+   descname = _ "Hard Ground",
    editor_category = "wasteland",
    is = "green",
    valid_resources = { "water" },
@@ -360,7 +360,7 @@
 
 world:new_terrain_type{
    name = "hardground3",
-   descname = _ "Hard Ground 3",
+   descname = _ "Hard Ground",
    editor_category = "wasteland",
    is = "green",
    valid_resources = { "water" },
@@ -375,7 +375,7 @@
 
 world:new_terrain_type{
    name = "hardground4",
-   descname = _ "Hard Ground 4",
+   descname = _ "Hard Ground",
    editor_category = "wasteland",
    is = "green",
    valid_resources = { "water" },
@@ -405,7 +405,7 @@
 
 world:new_terrain_type{
    name = "wasteland_mountain1",
-   descname = _ "Mountain 1",
+   descname = _ "Mountain",
    editor_category = "wasteland",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -420,7 +420,7 @@
 
 world:new_terrain_type{
    name = "wasteland_mountain2",
-   descname = _ "Mountain 2",
+   descname = _ "Mountain",
    editor_category = "wasteland",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -435,7 +435,7 @@
 
 world:new_terrain_type{
    name = "wasteland_mountain3",
-   descname = _ "Mountain 3",
+   descname = _ "Mountain",
    editor_category = "wasteland",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -450,7 +450,7 @@
 
 world:new_terrain_type{
    name = "wasteland_mountain4",
-   descname = _ "Mountain 4",
+   descname = _ "Mountain",
    editor_category = "wasteland",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -465,7 +465,7 @@
 
 world:new_terrain_type{
    name = "wasteland_beach",
-   descname = _ "Beach (Wasteland)",
+   descname = _ "Beach",
    editor_category = "wasteland",
    is = "dry",
    valid_resources = {},
@@ -480,7 +480,7 @@
 
 world:new_terrain_type{
    name = "lava-stone1",
-   descname = _ "Lava Rocks 1",
+   descname = _ "Lava Rocks",
    editor_category = "wasteland",
    is = "acid",
    valid_resources = {},
@@ -496,7 +496,7 @@
 
 world:new_terrain_type{
    name = "lava-stone2",
-   descname = _ "Lava Rocks 2",
+   descname = _ "Lava Rocks",
    editor_category = "wasteland",
    is = "acid",
    valid_resources = {},
@@ -512,7 +512,7 @@
 
 world:new_terrain_type{
    name = "wasteland_water",
-   descname = _ "Water (Wasteland)",
+   descname = _ "Water",
    editor_category = "wasteland",
    is = "water",
    valid_resources = { "fish" },
@@ -547,7 +547,7 @@
 
 world:new_terrain_type{
    name = "tundra2",
-   descname = _ "Tundra 2",
+   descname = _ "Tundra",
    editor_category = "winter",
    is = "green",
    valid_resources = { "water" },
@@ -562,7 +562,7 @@
 
 world:new_terrain_type{
    name = "tundra3",
-   descname = _ "Tundra 3",
+   descname = _ "Tundra",
    editor_category = "winter",
    is = "green",
    valid_resources = { "water" },
@@ -622,7 +622,7 @@
 
 world:new_terrain_type{
    name = "winter_mountain1",
-   descname = _ "Mountain 1 (Winter)",
+   descname = _ "Mountain",
    editor_category = "winter",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -637,7 +637,7 @@
 
 world:new_terrain_type{
    name = "winter_mountain2",
-   descname = _ "Mountain 2 (Winter)",
+   descname = _ "Mountain",
    editor_category = "winter",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -652,7 +652,7 @@
 
 world:new_terrain_type{
    name = "winter_mountain3",
-   descname = _ "Mountain 3 (Winter)",
+   descname = _ "Mountain",
    editor_category = "winter",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -667,7 +667,7 @@
 
 world:new_terrain_type{
    name = "winter_mountain4",
-   descname = _ "Mountain 4 (Winter)",
+   descname = _ "Mountain",
    editor_category = "winter",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -697,7 +697,7 @@
 
 world:new_terrain_type{
    name = "winter_beach",
-   descname = _ "Beach (Winter)",
+   descname = _ "Beach",
    editor_category = "winter",
    is = "dry",
    valid_resources = {},
@@ -728,7 +728,7 @@
 
 world:new_terrain_type{
    name = "ice_floes2",
-   descname = _ "Ice Floes 2",
+   descname = _ "Ice Floes",
    editor_category = "winter",
    is = "water",
    valid_resources = {"fish"},
@@ -744,7 +744,7 @@
 
 world:new_terrain_type{
    name = "winter_water",
-   descname = _ "Water (Winter)",
+   descname = _ "Water",
    editor_category = "winter",
    is = "water",
    valid_resources = {"fish"},
@@ -764,7 +764,7 @@
 
 world:new_terrain_type{
    name = "desert4",
-   descname = _ "Desert 4",
+   descname = _ "Desert",
    editor_category = "desert",
    is = "green",
    valid_resources = {"water"},
@@ -794,7 +794,7 @@
 
 world:new_terrain_type{
    name = "desert_steppe",
-   descname = _ "Steppe (Desert)",
+   descname = _ "Steppe",
    editor_category = "desert",
    is = "green",
    valid_resources = {"water"},
@@ -809,7 +809,7 @@
 
 world:new_terrain_type{
    name = "meadow",
-   descname = _ "Meadow (Desert)",
+   descname = _ "Meadow",
    editor_category = "desert",
    is = "green",
    valid_resources = {"water"},
@@ -824,7 +824,7 @@
 
 world:new_terrain_type{
    name = "mountainmeadow",
-   descname = _ "Mountain Meadow (Desert)",
+   descname = _ "Mountain Meadow",
    editor_category = "desert",
    is = "green",
    valid_resources = {"water"},
@@ -839,7 +839,7 @@
 
 world:new_terrain_type{
    name = "highmountainmeadow",
-   descname = _ "High Mountain Meadow (Desert)",
+   descname = _ "High Mountain Meadow",
    editor_category = "desert",
    is = "green",
    valid_resources = {"water"},
@@ -854,7 +854,7 @@
 
 world:new_terrain_type{
    name = "mountain1",
-   descname = _ "Mountain 1 (Desert)",
+   descname = _ "Mountain",
    editor_category = "desert",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -869,7 +869,7 @@
 
 world:new_terrain_type{
    name = "mountain2",
-   descname = _ "Mountain 2 (Desert)",
+   descname = _ "Mountain",
    editor_category = "desert",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -884,7 +884,7 @@
 
 world:new_terrain_type{
    name = "mountain3",
-   descname = _ "Mountain 3 (Desert)",
+   descname = _ "Mountain",
    editor_category = "desert",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -899,7 +899,7 @@
 
 world:new_terrain_type{
    name = "mountain4",
-   descname = _ "Mountain 4 (Desert)",
+   descname = _ "Mountain",
    editor_category = "desert",
    is = "mountain",
    valid_resources = { "coal", "iron", "gold", "granite" },
@@ -914,7 +914,7 @@
 
 world:new_terrain_type{
    name = "desert1",
-   descname = _ "Desert 1",
+   descname = _ "Desert",
    editor_category = "desert",
    is = "dry",
    valid_resources = {},
@@ -929,7 +929,7 @@
 
 world:new_terrain_type{
    name = "desert2",
-   descname = _ "Desert 2",
+   descname = _ "Desert",
    editor_category = "desert",
    is = "dry",
    valid_resources = {},
@@ -944,7 +944,7 @@
 
 world:new_terrain_type{
    name = "desert3",
-   descname = _ "Desert 3",
+   descname = _ "Desert",
    editor_category = "desert",
    is = "dry",
    valid_resources = {},
@@ -959,7 +959,7 @@
 
 world:new_terrain_type{
    name = "desert_beach",
-   descname = _ "Beach (Desert)",
+   descname = _ "Beach",
    editor_category = "desert",
    is = "dry",
    valid_resources = {},
@@ -974,7 +974,7 @@
 
 world:new_terrain_type{
    name = "desert_water",
-   descname = _ "Water (Desert)",
+   descname = _ "Water",
    editor_category = "desert",
    is = "water",
    valid_resources = {"fish"},