Merge lp:~widelands-dev/widelands/bug-1636586-editor-player-menu-i18n into lp:widelands

[GunChleoc]

Fixed mix of localized / unlocalized default player names in editor. Default names are now saved as empty strings.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3504. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/378151938.
Appveyor build 3309. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1636586_editor_player_menu_i18n-3309.

[Notabilis (notabilis27)]

Not tested but code is looking good.
One question: Why checking for both the localized and "plain" name variant when saving? In English they should resolve to the same name anyway (right?) and I don't see where the plain version can appear otherwise.

review: Approve (diff)

[GunChleoc (gunchleoc)]

You're right, the plain version is already taken care of during loading, so no need to check it when saving.

Thanks for the review!

@bunnybot merge

=== modified file 'src/map_io/map_player_names_and_tribes_packet.cc'
--- src/map_io/map_player_names_and_tribes_packet.cc	2018-04-07 16:59:00 +0000
+++ src/map_io/map_player_names_and_tribes_packet.cc	2018-05-15 03:58:57 +0000
@@ -62,7 +62,13 @@
 			iterate_player_numbers(p, nr_players) {
 				Section& s = prof.get_safe_section(
 				   (boost::format("player_%u") % static_cast<unsigned int>(p)).str());
-				map->set_scenario_player_name(p, s.get_string("name", ""));
+
+				// Replace empty or standard player names with localized standard player name
+				std::string player_name = s.get_string("name", "");
+				if (player_name.empty() || player_name == (boost::format("Player %u") % static_cast<unsigned int>(p)).str()) {
+					player_name = (boost::format(_("Player %u")) % static_cast<unsigned int>(p)).str();
+				}
+				map->set_scenario_player_name(p, player_name);
 				map->set_scenario_player_tribe(p, s.get_string("tribe", ""));
 				map->set_scenario_player_ai(p, s.get_string("ai", ""));
 				map->set_scenario_player_closeable(p, s.get_bool("closeable", false));
@@ -90,8 +96,10 @@
 		// Make sure that no player name is empty, and trim leading/trailing whitespaces.
 		std::string player_name = map.get_scenario_player_name(p);
 		boost::trim(player_name);
-		if (player_name.empty()) {
-			player_name = (boost::format(_("Player %u")) % static_cast<unsigned int>(p)).str();
+
+		// Save default player names as empty
+		if (player_name == (boost::format(_("Player %u")) % static_cast<unsigned int>(p)).str()) {
+			player_name = "";
 		}
 
 		Section& s = prof.create_section(section_key.c_str());