[Supertuxkart-commit] SF.net SVN: supertuxkart:[8204] main/trunk/src/challenges

[<hik...@us...>]

Revision: 8204
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=8204&view=rev
Author:   hikerstk
Date:     2011-04-03 23:34:26 +0000 (Sun, 03 Apr 2011)

Log Message:
-----------
Fixed ticket #134: challenges would stay in the langauge with which STK
was started up, ignoring a language switch via the UI.

Modified Paths:
--------------
    main/trunk/src/challenges/challenge.hpp
    main/trunk/src/challenges/challenge_data.cpp

Modified: main/trunk/src/challenges/challenge.hpp
===================================================================
--- main/trunk/src/challenges/challenge.hpp	2011-04-03 23:20:17 UTC (rev 8203)
+++ main/trunk/src/challenges/challenge.hpp	2011-04-03 23:34:26 UTC (rev 8204)
@@ -30,6 +30,7 @@
 #include <irrlicht.h>
 
 #include "utils/no_copy.hpp"
+#include "utils/translation.hpp"
 
 class XMLNode;
 
@@ -98,7 +99,8 @@
     const std::string &getId() const              { return m_id;              }
     // ------------------------------------------------------------------------
     /** Returns the name of the challenge. */
-    const irr::core::stringw &getName() const     { return m_name;            }
+    const irr::core::stringw getName() const
+                              { return irr::core::stringw(_(m_name.c_str())); }
     // ------------------------------------------------------------------------
     /** Sets the name of the challenge. */
     void  setName(const irr::core::stringw & s)   { m_name = s;               }
@@ -112,8 +114,9 @@
     void  setChallengeDescription(const irr::core::stringw& d) 
                                                  {m_challenge_description=d;  }
     // ------------------------------------------------------------------------
-    const irr::core::stringw& 
-          getChallengeDescription() const    {return m_challenge_description; }
+    const irr::core::stringw
+          getChallengeDescription() const 
+                                  {return _(m_challenge_description.c_str()); }
     // ------------------------------------------------------------------------
     void  addDependency(const std::string id)  {m_prerequisites.push_back(id);}
     // ------------------------------------------------------------------------

Modified: main/trunk/src/challenges/challenge_data.cpp
===================================================================
--- main/trunk/src/challenges/challenge_data.cpp	2011-04-03 23:20:17 UTC (rev 8203)
+++ main/trunk/src/challenges/challenge_data.cpp	2011-04-03 23:34:26 UTC (rev 8204)
@@ -30,7 +30,6 @@
 #include "race/race_manager.hpp"
 #include "tracks/track.hpp"
 #include "tracks/track_manager.hpp"
-#include "utils/translation.hpp"
 
 ChallengeData::ChallengeData(const std::string& filename)
 #ifndef WIN32
@@ -94,10 +93,10 @@
 
     if(!root->get("name", &s) ) error("name");
     //std::cout << "    // Challenge name = <" << s.c_str() << ">\n";
-    setName( _(s.c_str()) );
+    setName( s.c_str() );
 
     if(!root->get("description", &s) ) error("description");
-    setChallengeDescription( _(s.c_str()) );
+    setChallengeDescription( s.c_str() );
     //std::cout << "    // Challenge description = <" << s.c_str() << ">\n";
 
     if(!root->get("karts", &m_num_karts)  ) error("karts");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.