[Wesnoth-cvs-commits] wesnoth ./changelog src/playcampaign.cpp

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/07/10 17:27:08

Modified files:
        .              : changelog 
        src            : playcampaign.cpp 

Log message:
        Fix #13558: replay savegame name not translated

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.780&tr2=1.781&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playcampaign.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.780 wesnoth/changelog:1.781
--- wesnoth/changelog:1.780     Sun Jul 10 11:28:55 2005
+++ wesnoth/changelog   Sun Jul 10 17:27:08 2005
@@ -5,6 +5,7 @@
    * fixed help description of income and upkeep (#13565)
    * updated several unit descriptions
    * document that Woses receive no traits (#13630)
+   * replay suggested save game now translated (#13558)
  * unit balancing and modifications:
    * max level units given After-Max-Level-Advancement (AMLA) of 3 HP/100XP
      with no auto-heal; Necrophage has healing AMLA with no bonus HP
Index: wesnoth/src/playcampaign.cpp
diff -u wesnoth/src/playcampaign.cpp:1.8 wesnoth/src/playcampaign.cpp:1.9
--- wesnoth/src/playcampaign.cpp:1.8    Sat Jul  2 21:37:19 2005
+++ wesnoth/src/playcampaign.cpp        Sun Jul 10 17:27:08 2005
@@ -1,4 +1,4 @@
-/* $Id: playcampaign.cpp,v 1.8 2005/07/02 21:37:19 ott Exp $ */
+/* $Id: playcampaign.cpp,v 1.9 2005/07/10 17:27:08 ott Exp $ */
 /*
    Copyright (C) 2003-2005 by David White <address@hidden>
    Copyright (C) 2005 by Philippe Plantier <address@hidden>
@@ -127,7 +127,9 @@
                bool save_game_after_scenario = true;
 
                try {
-                       state.label = (*scenario)["name"];
+                       // preserve old label eg. replay
+                       if (state.label.empty())
+                               state.label = (*scenario)["name"];
 
                        LEVEL_RESULT res = 
play_level(units_data,game_config,scenario,video,state,story);
 
@@ -138,7 +140,7 @@
                                const std::string orig_scenario = 
state.scenario;
                                state.scenario = current_scenario;
 
-                               std::string label = state.label + " replay";
+                               std::string label = state.label + _(" replay");
 
                                bool retry = true;