Author: suokko
Date: Sun Jun 29 17:18:23 2008
New Revision: 27591
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27591&view=rev
Log:
* Teams are now translated localy for all clients (bug: #3676)
Modified:
trunk/changelog
trunk/src/multiplayer_connect.cpp
trunk/src/multiplayer_wait.cpp
trunk/src/team.cpp
trunk/src/team.hpp
trunk/src/tstring.hpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=27591&r1=27590&r2=27591&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Sun Jun 29 17:18:23 2008
@@ -19,6 +19,7 @@
* Added support for multiple sides per client in MP start
* Added support for reserving slots when reloading game
* Fixed timer end warning not to play in opponents turn (bug: #11517)
+ * Teams are now translated localy for all clients (bug: #3676)
* miscellaneous and bug fixes:
* Fixed droiding not to make wesnoth think player is observer (bug: #9675)
* Fixed statitics not add turn data from previus scenarios (bug: #11719)
Modified: trunk/src/multiplayer_connect.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer_connect.cpp?rev=27591&r1=27590&r2=27591&view=diff
==============================================================================
--- trunk/src/multiplayer_connect.cpp (original)
+++ trunk/src/multiplayer_connect.cpp Sun Jun 29 17:18:23 2008
@@ -1438,7 +1438,7 @@
team_names_.end(), team_name);
if(itor == team_names_.end()) {
team_names_.push_back(team_name);
- user_team_names_.push_back(user_team_name);
+
user_team_names_.push_back(user_team_name.to_serialized());
player_teams_.push_back(user_team_name.str());
}
}
Modified: trunk/src/multiplayer_wait.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer_wait.cpp?rev=27591&r1=27590&r2=27591&view=diff
==============================================================================
--- trunk/src/multiplayer_wait.cpp (original)
+++ trunk/src/multiplayer_wait.cpp Sun Jun 29 17:18:23 2008
@@ -521,7 +521,7 @@
str << sd["income"] << _(")");
}
- str << COLUMN_SEPARATOR << sd["user_team_name"];
+ str << COLUMN_SEPARATOR <<
t_string().from_serialized(sd["user_team_name"].str());
int disp_color = lexical_cast_default<int>(sd["colour"], 0) - 1;
if(!sd["colour"].empty()) {
try {
Modified: trunk/src/team.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/team.cpp?rev=27591&r1=27590&r2=27591&view=diff
==============================================================================
--- trunk/src/team.cpp (original)
+++ trunk/src/team.cpp Sun Jun 29 17:18:23 2008
@@ -110,6 +110,8 @@
music(cfg["music"]),
colour(cfg["colour"].size() ? cfg["colour"] : cfg["side"])
{
+ if (!user_team_name.translatable())
+ user_team_name = user_team_name.from_serialized(user_team_name);
config global_ai_params;
const config::child_list& ai_parameters = cfg.get_children("ai");
for(config::child_list::const_iterator aiparam = ai_parameters.begin();
aiparam != ai_parameters.end(); ++aiparam) {
Modified: trunk/src/team.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/team.hpp?rev=27591&r1=27590&r2=27591&view=diff
==============================================================================
--- trunk/src/team.hpp (original)
+++ trunk/src/team.hpp Sun Jun 29 17:18:23 2008
@@ -77,7 +77,7 @@
std::vector<std::string> recruitment_pattern;
std::vector<int> enemies;
std::string team_name;
- std::string user_team_name;
+ t_string user_team_name;
std::string save_id;
// 'id' of the current player (not necessarily unique)
std::string current_player;
Modified: trunk/src/tstring.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tstring.hpp?rev=27591&r1=27590&r2=27591&view=diff
==============================================================================
--- trunk/src/tstring.hpp (original)
+++ trunk/src/tstring.hpp Sun Jun 29 17:18:23 2008
@@ -81,7 +81,7 @@
operator const std::string&() const { return str(); }
const std::string& str() const;
const char* c_str() const { return
str().c_str(); }
-
+ bool translatable() const
{ return translatable_; }
// Warning: value() may contain platform dependant prefix bytes !
// Consider base_str() for a more reliable untranslated string
const std::string& value() const { return value_; }
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
