widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1556218-escape-characters into lp:widelands.

Commit message:
Replaced "\\< ... \\>" with "&lt; ... &gt;"

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1556218 in widelands: "Escape characters visible to the user"
  https://bugs.launchpad.net/widelands/+bug/1556218

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1556218-escape-characters/+merge/290191

Fixed bug where parent directory entry in the map selection table is displayed as "\<parent\>", including the backslashes, etc.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1556218-escape-characters into lp:widelands.

=== modified file 'src/network/internet_gaming.cc'
--- src/network/internet_gaming.cc	2016-02-16 11:43:06 +0000
+++ src/network/internet_gaming.cc	2016-03-28 10:42:29 +0000
@@ -854,7 +854,7 @@
 	ChatMessage c;
 	if (!system && from.empty()) {
 		std::string unkown_string =
-			(boost::format("\\<%s\\>") % _("unknown")).str();
+			(boost::format("&lt;%s&gt;") % _("unknown")).str();
 		c.sender = unkown_string;
 	} else {
 		c.sender = from;

=== modified file 'src/ui_fsmenu/launch_mpg.cc'
--- src/ui_fsmenu/launch_mpg.cc	2016-02-18 18:27:52 +0000
+++ src/ui_fsmenu/launch_mpg.cc	2016-03-28 10:42:29 +0000
@@ -581,7 +581,7 @@
 		infotext += (boost::format(_("Player %u")) % static_cast<unsigned int>(i)).str();
 		if (player_save_tribe[i - 1].empty()) {
 			std::string closed_string =
-				(boost::format("\\<%s\\>") % _("closed")).str();
+				(boost::format("&lt;%s&gt;") % _("closed")).str();
 			infotext += ":\n    ";
 			infotext += closed_string;
 			// Close the player

=== modified file 'src/wui/chat_msg_layout.cc'
--- src/wui/chat_msg_layout.cc	2016-02-06 11:11:24 +0000
+++ src/wui/chat_msg_layout.cc	2016-03-28 10:42:29 +0000
@@ -180,7 +180,7 @@
 				}
 			}
 
-			sanitized += "\\<";
+			sanitized += "&lt;";
 		} else {
 			sanitized += chat_message.msg[pos];
 		}
@@ -205,7 +205,7 @@
 					% sanitized).str();
 
 		} else {
-			message = (boost::format("%s>@%s \\> </font><font size=14 face=%s color=%s italic=1 shadow=1> %s%s")
+			message = (boost::format("%s>@%s &gt; </font><font size=14 face=%s color=%s italic=1 shadow=1> %s%s")
 					% message
 					% chat_message.recipient
 					% font_face
@@ -216,7 +216,7 @@
 	} else {
 		// Normal messages handling
 		if (!sanitized.compare(0, 3, "/me")) {
-			message += " italic=1>-\\> ";
+			message += " italic=1>-&gt; ";
 			if (chat_message.sender.size())
 				message += chat_message.sender;
 			else

=== modified file 'src/wui/mapdata.cc'
--- src/wui/mapdata.cc	2016-02-07 06:06:18 +0000
+++ src/wui/mapdata.cc	2016-03-28 10:42:29 +0000
@@ -125,7 +125,7 @@
 // static
 std::string MapData::parent_name() {
 	/** TRANSLATORS: Parent directory/folder */
-	return (boost::format("\\<%s\\>") % _("parent")).str();
+	return (boost::format("&lt;%s&gt;") % _("parent")).str();
 }
 
 // static

=== modified file 'src/wui/multiplayersetupgroup.cc'
--- src/wui/multiplayersetupgroup.cc	2016-03-08 07:24:38 +0000
+++ src/wui/multiplayersetupgroup.cc	2016-03-28 10:42:29 +0000
@@ -124,10 +124,7 @@
 	void refresh() {
 		UserSettings us = s->settings().users.at(id_);
 		if (us.position == UserSettings::not_connected()) {
-			std::string free_i18n = _("free");
-			std::string free_text =
-				(boost::format("\\<%s\\>") % free_i18n).str();
-			name->set_text(free_text);
+			name->set_text((boost::format("&lt;%s&gt;") % _("free")).str());
 			if (type)
 				type->set_visible(false);
 			else