Move most translatable strings in headers to a source file

At least one case was missed in src/gui/status_label_helper.hpp.
Need a helper function for this case.

projectfiles/VC12/wesnoth.vcxproj

@@ -2836,6 +2836,7 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Map\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Map\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\src\map_command_handler.cpp" />
     <ClCompile Include="..\..\src\md5.cpp" />
     <ClCompile Include="..\..\src\menu_events.cpp" />
     <ClCompile Include="..\..\src\minimap.cpp" />

projectfiles/VC12/wesnoth.vcxproj.filters

@@ -1522,6 +1522,7 @@
     <ClCompile Include="..\..\src\font\text_surface.cpp">
       <Filter>Font</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\map_command_handler.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\addon\client.hpp">

source_lists/wesnoth

@@ -303,6 +303,7 @@ hotkey/hotkey_handler_mp.cpp
 hotkey/hotkey_handler_sp.cpp
 intro.cpp
 lobby_preferences.cpp
+map_command_handler.cpp
 menu_events.cpp
 mouse_events.cpp
 mouse_handler_base.cpp

src/chat_command_handler.cpp

@@ -224,4 +224,90 @@ void chat_command_handler::do_details() {
 	chat_handler_.send_to_server(data);
 }
 
+std::string chat_command_handler::get_flags_description() const {
+	return _("(A) — admin command");
+}
+
+std::string chat_command_handler::get_command_flags_description(
+	const map_command_handler<chat_command_handler>::command& c) const {
+	if(c.has_flag('A')) {
+		return std::string(" ") + _("(admin only)");
+	} else {
+		return "";
+	}
+}
+
+void chat_command_handler::init_map() {
+	set_cmd_prefix("/");
+	register_command("query", &chat_command_handler::do_network_send,
+		_("Send a query to the server. Without arguments the server should tell you the available commands."));
+	register_alias("query", "q");
+	register_command("ban", &chat_command_handler::do_network_send_req_arg,
+		_("Ban and kick a player or observer. If he is not in the game but on the server he will only be banned."), _("<nickname>"));
+	register_command("unban", &chat_command_handler::do_network_send_req_arg,
+		_("Unban a user. He does not have to be in the game but only on the server."), _("<nickname>"));
+		register_command("kick", &chat_command_handler::do_network_send_req_arg,
+		_("Kick a player or observer."), _("<nickname>"));
+	register_command("mute", &chat_command_handler::do_network_send,
+		_("Mute an observer. Without an argument displays the mute status."), _("<nickname>"));
+	register_command("unmute", &chat_command_handler::do_network_send,
+		_("Unmute an observer. Without an argument unmutes everyone."), _("<nickname>"));
+	register_command("muteall", &chat_command_handler::do_network_send,
+		_("Mute/Unmute all observers. (toggles)"), "");
+	register_command("ping", &chat_command_handler::do_network_send,
+		"");
+	register_command("green", &chat_command_handler::do_network_send_req_arg,
+		"", "", "A");
+	register_command("red", &chat_command_handler::do_network_send_req_arg,
+		"", "", "A");
+	register_command("yellow", &chat_command_handler::do_network_send_req_arg,
+		"", "", "A");
+	register_command("report", &chat_command_handler::do_network_send_req_arg,
+		_("Report abuse, rule violations, etc. to the server moderators. Make sure to mention relevant nicknames, etc."), "");
+	register_alias("report", "adminmsg");  // deprecated
+	register_command("emote", &chat_command_handler::do_emote,
+		_("Send an emotion or personal action in chat."), _("<message>"));
+	register_alias("emote", "me");
+	register_command("whisper", &chat_command_handler::do_whisper,
+		_("Sends a private message. You cannot send private messages to players in a running game you observe or play in."),
+		_("<nickname> <message>"));
+	register_alias("whisper", "msg");
+	register_alias("whisper", "m");
+	register_command("log", &chat_command_handler::do_log,
+		_("Change the log level of a log domain."), _("<level> <domain>"));
+	register_command("ignore", &chat_command_handler::do_ignore,
+		_("Add a nickname to your ignores list."), _("<nickname>"));
+	register_command("friend", &chat_command_handler::do_friend,
+		_("Add a nickname to your friends list."), _("<nickname>"));
+	register_command("remove", &chat_command_handler::do_remove,
+		_("Remove a nickname from your ignores or friends list."), _("<nickname>"));
+	register_command("version", &chat_command_handler::do_version,
+		_("Display version information."));
+	register_command("register", &chat_command_handler::do_register,
+		_("Register your nickname"), _("<password> <email (optional)>"));
+	register_command("drop", &chat_command_handler::do_drop,
+		_("Drop your nickname."));
+	register_command("set", &chat_command_handler::do_set,
+		_("Update details for your nickname. For possible details see '/details'."),
+		_("<detail> <value>"));
+	register_command("info", &chat_command_handler::do_info,
+		_("Request information about a nickname."), _("<nickname>"));
+	register_command("details", &chat_command_handler::do_details,
+		_("Request a list of details you can set for your registered nickname."));
+	register_command("join", &chat_command_handler::do_network_send_req_arg,
+		_("Join a room."), _("<room>"));
+	register_alias("join", "j");
+	register_command("part", &chat_command_handler::do_network_send_req_arg,
+		_("Part a room."), _("<room>"));
+	register_command("names", &chat_command_handler::do_room_query,
+		_("List room members."), _("<room>"));
+	register_command("rooms", &chat_command_handler::do_room_query_noarg,
+		_("List available rooms."));
+	register_command("room", &chat_command_handler::do_chanmsg,
+		_("Room message."), _("<room> <msg>"));
+	register_command("room_query", &chat_command_handler::do_gen_room_query,
+		_("Room query."), _("<room> <type> [value]"));
+	register_alias("room_query", "rq");
+}
+
 }

src/chat_command_handler.hpp

@@ -5,6 +5,8 @@
 
 namespace events {
 	class chat_handler;
+	class chat_command_handler;
+	extern template class map_command_handler<chat_command_handler>;
 //command handler for chat /commands
 class chat_command_handler : public map_command_handler<chat_command_handler>
 {
@@ -49,103 +51,15 @@ class chat_command_handler : public map_command_handler<chat_command_handler>
 	*/
 	void do_details();
 
-	std::string get_flags_description() const {
-		return _("(A) — admin command");
-	}
+	std::string get_flags_description() const;
 
-	std::string get_command_flags_description(
-		const map_command_handler<chat_command_handler>::command& c) const
-	{
-		if (c.has_flag('A')) {
-			return std::string(" ") + _("(admin only)");
-		}
-		else {
-			return "";
-		}
-	}
+	std::string get_command_flags_description(const map_command_handler<chat_command_handler>::command& c) const;
 
 	bool is_enabled(const map_command_handler<chat_command_handler>::command& c) const;
 
 	void print(const std::string& title, const std::string& message);
 
-	void init_map()
-	{
-		set_cmd_prefix("/");
-		register_command("query", &chat_command_handler::do_network_send,
-			_("Send a query to the server. Without arguments the server"
-				" should tell you the available commands."));
-		register_alias("query", "q");
-		register_command("ban", &chat_command_handler::do_network_send_req_arg,
-			_("Ban and kick a player or observer. If he is not in the"
-				" game but on the server he will only be banned."), _("<nickname>"));
-		register_command("unban", &chat_command_handler::do_network_send_req_arg,
-			_("Unban a user. He does not have to be in the game but on"
-				" the server."), _("<nickname>"));
-		register_command("kick", &chat_command_handler::do_network_send_req_arg,
-			_("Kick a player or observer."), _("<nickname>"));
-		register_command("mute", &chat_command_handler::do_network_send,
-			_("Mute an observer. Without an argument displays the mute status."), _("<nickname>"));
-		register_command("unmute", &chat_command_handler::do_network_send,
-			_("Unmute an observer. Without an argument unmutes everyone."), _("<nickname>"));
-		register_command("muteall", &chat_command_handler::do_network_send,
-			_("Mute/Unmute all observers. (toggles)"), "");
-		register_command("ping", &chat_command_handler::do_network_send,
-			"");
-		register_command("green", &chat_command_handler::do_network_send_req_arg,
-			"", "", "A");
-		register_command("red", &chat_command_handler::do_network_send_req_arg,
-			"", "", "A");
-		register_command("yellow", &chat_command_handler::do_network_send_req_arg,
-			"", "", "A");
-		register_command("report", &chat_command_handler::do_network_send_req_arg,
-			_("Report abuse, rule violations, etc. to the server moderators. "
-				"Make sure to mention relevant nicknames, etc."), "");
-		register_alias("report", "adminmsg");  // deprecated
-		register_command("emote", &chat_command_handler::do_emote,
-			_("Send an emotion or personal action in chat."), _("<message>"));
-		register_alias("emote", "me");
-		register_command("whisper", &chat_command_handler::do_whisper,
-			_("Sends a private message. "
-				"You cannot send private messages to players in a running game you observe or play in."),
-			_("<nickname> <message>"));
-		register_alias("whisper", "msg");
-		register_alias("whisper", "m");
-		register_command("log", &chat_command_handler::do_log,
-			_("Change the log level of a log domain."), _("<level> <domain>"));
-		register_command("ignore", &chat_command_handler::do_ignore,
-			_("Add a nickname to your ignores list."), _("<nickname>"));
-		register_command("friend", &chat_command_handler::do_friend,
-			_("Add a nickname to your friends list."), _("<nickname>"));
-		register_command("remove", &chat_command_handler::do_remove,
-			_("Remove a nickname from your ignores or friends list."), _("<nickname>"));
-		register_command("version", &chat_command_handler::do_version,
-			_("Display version information."));
-		register_command("register", &chat_command_handler::do_register,
-			_("Register your nickname"), _("<password> <email (optional)>"));
-		register_command("drop", &chat_command_handler::do_drop,
-			_("Drop your nickname."));
-		register_command("set", &chat_command_handler::do_set,
-			_("Update details for your nickname. For possible details see '/details'."),
-			_("<detail> <value>"));
-		register_command("info", &chat_command_handler::do_info,
-			_("Request information about a nickname."), _("<nickname>"));
-		register_command("details", &chat_command_handler::do_details,
-			_("Request a list of details you can set for your registered nickname."));
-		register_command("join", &chat_command_handler::do_network_send_req_arg,
-			_("Join a room."), _("<room>"));
-		register_alias("join", "j");
-		register_command("part", &chat_command_handler::do_network_send_req_arg,
-			_("Part a room."), _("<room>"));
-		register_command("names", &chat_command_handler::do_room_query,
-			_("List room members."), _("<room>"));
-		register_command("rooms", &chat_command_handler::do_room_query_noarg,
-			_("List available rooms."));
-		register_command("room", &chat_command_handler::do_chanmsg,
-			_("Room message."), _("<room> <msg>"));
-		register_command("room_query", &chat_command_handler::do_gen_room_query,
-			_("Room query."), _("<room> <type> [value]"));
-		register_alias("room_query", "rq");
-	}
+	void init_map();
 private:
 	chat_handler& chat_handler_;
 	bool allies_only_;

src/game_initialization/depcheck.cpp

@@ -431,26 +431,26 @@ bool manager::is_modification_active(const std::string id) const
 }
 
 bool manager::enable_mods_dialog(const std::vector<std::string>& mods,
-								 const std::string& requester)
+								 boost::optional<std::string> requester)
 {
 	std::vector<std::string> items;
 	for (const std::string& mod : mods) {
 		items.push_back(depinfo_.find_child("modification", "id", mod)["name"]);
 	}
 
-	gui2::dialogs::depcheck_confirm_change dialog(true, items, requester);
+	gui2::dialogs::depcheck_confirm_change dialog(true, items, requester ? requester.get() : _("A component"));
 	return dialog.show(video_);
 }
 
 bool manager::disable_mods_dialog(const std::vector<std::string>& mods,
-								  const std::string& requester)
+								  boost::optional<std::string> requester)
 {
 	std::vector<std::string> items;
 	for (const std::string& mod : mods) {
 		items.push_back(depinfo_.find_child("modification", "id", mod)["name"]);
 	}
 
-	gui2::dialogs::depcheck_confirm_change dialog(false, items, requester);
+	gui2::dialogs::depcheck_confirm_change dialog(false, items, requester ? requester.get() : _("A component"));
 	return dialog.show(video_);
 }
 

src/game_initialization/depcheck.hpp

@@ -20,6 +20,7 @@
 #include "config.hpp"
 #include "gettext.hpp"
 #include "utils/make_enum.hpp"
+#include <boost/optional.hpp>
 
 class CVideo;
 
@@ -315,7 +316,7 @@ class manager
 	 * @return 			true, if the user accepted the change, false if not
 	 */
 	bool enable_mods_dialog(const std::vector<std::string>& mods,
-							const std::string& requester = _("A component"));
+							boost::optional<std::string> requester = boost::none);
 
 	/**
 	 * Display a dialog requesting confirmation for disabling some
@@ -327,7 +328,7 @@ class manager
 	 * @return 			true, if the user accepted the change, false if not
 	 */
 	bool disable_mods_dialog(const std::vector<std::string>& mods,
-							 const std::string& requester = _("A component"));
+							 boost::optional<std::string> requester = boost::none);
 
 	/**
 	 * Display a dialog requesting the user to select a new era

src/gui/dialogs/game_load.cpp

@@ -103,6 +103,15 @@ game_load::game_load(const config& cache_config, savegame::load_game_metadata& d
 {
 }
 
+bool game_load::execute(const config& cache_config, savegame::load_game_metadata& data, CVideo& video) {
+	if(savegame::get_saves_list().empty()) {
+		gui2::show_transient_message(video, _("No Saved Games"), _("There are no save files to load"));
+		return false;
+	}
+
+	return game_load(cache_config, data).show(video);
+}
+
 void game_load::pre_show(window& window)
 {
 	find_widget<minimap>(&window, "minimap", false).set_config(&cache_config_);

src/gui/dialogs/game_load.hpp

@@ -36,15 +36,7 @@ class game_load : public modal_dialog
 public:
 	game_load(const config& cache_config, savegame::load_game_metadata& data);
 
-	static bool execute(const config& cache_config, savegame::load_game_metadata& data, CVideo& video)
-	{
-		if(savegame::get_saves_list().empty()) {
-			gui2::show_transient_message(video, _("No Saved Games"), _("There are no save files to load"));
-			return false;
-		}
-
-		return game_load(cache_config, data).show(video);
-	}
+	static bool execute(const config& cache_config, savegame::load_game_metadata& data, CVideo& video);
 
 private:
 	/** Inherited from modal_dialog. */

src/gui/dialogs/game_stats.cpp

@@ -63,6 +63,15 @@ game_stats::game_stats(const display_context& board, const int viewing_team, int
 	}
 }
 
+bool game_stats::execute(game_board& board, const int viewing_team, int& selected_index, CVideo& video) {
+	if(std::all_of(board.teams().begin(), board.teams().end(), [](team& team) { return team.hidden(); })) {
+		show_transient_message(video, "", _("No visible sides found."));
+		return false;
+	}
+
+	return game_stats(board, viewing_team, selected_index).show(video);
+}
+
 unit_const_ptr game_stats::get_leader(const int side)
 {
 	unit_map::const_iterator leader = board_.units().find_leader(side);

src/gui/dialogs/game_stats.hpp

@@ -38,15 +38,7 @@ class game_stats : public modal_dialog
 public:
 	game_stats(const display_context& board, const int viewing_team, int& selected_index);
 
-	static bool execute(game_board& board, const int viewing_team, int& selected_index, CVideo& video)
-	{
-		if(std::all_of(board.teams().begin(), board.teams().end(), [](team& team) { return team.hidden(); })) {
-			show_transient_message(video, "", _("No visible sides found."));
-			return false;
-		}
-
-		return game_stats(board, viewing_team, selected_index).show(video);
-	}
+	static bool execute(game_board& board, const int viewing_team, int& selected_index, CVideo& video);
 
 private:
 	// TODO: don't like having this

src/gui/dialogs/unit_list.cpp

@@ -58,6 +58,15 @@ unit_list::unit_list(unit_ptr_vector& unit_list, map_location& scroll_to)
 {
 }
 
+bool unit_list::execute(unit_ptr_vector& units, map_location& scroll_to, CVideo& video) {
+	if(units.empty()) {
+		show_transient_message(video, "", _("No units found."));
+		return false;
+	}
+
+	return unit_list(units, scroll_to).show(video);
+}
+
 static std::string format_level_string(const int level)
 {
 	std::string lvl = std::to_string(level);

src/gui/dialogs/unit_list.hpp

@@ -40,15 +40,7 @@ class unit_list : public modal_dialog
 public:
 	explicit unit_list(unit_ptr_vector& unit_list, map_location& scroll_to);
 
-	static bool execute(unit_ptr_vector& units, map_location& scroll_to, CVideo& video)
-	{
-		if(units.empty()) {
-			show_transient_message(video, "", _("No units found."));
-			return false;
-		}
-
-		return unit_list(units, scroll_to).show(video);
-	}
+	static bool execute(unit_ptr_vector& units, map_location& scroll_to, CVideo& video);
 
 private:
 	unit_ptr_vector& unit_list_;