[Supertuxkart-commit] SF.net SVN: supertuxkart:[8939] main/branches/0.7.2/src/race

[<au...@us...>]

Revision: 8939
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=8939&view=rev
Author:   auria
Date:     2011-06-17 01:47:48 +0000 (Fri, 17 Jun 2011)

Log Message:
-----------
Don't cache GP names translations so that if you switch the language they apepar in the new language

Modified Paths:
--------------
    main/branches/0.7.2/src/race/grand_prix_data.cpp
    main/branches/0.7.2/src/race/grand_prix_data.hpp

Modified: main/branches/0.7.2/src/race/grand_prix_data.cpp
===================================================================
--- main/branches/0.7.2/src/race/grand_prix_data.cpp	2011-06-17 01:46:30 UTC (rev 8938)
+++ main/branches/0.7.2/src/race/grand_prix_data.cpp	2011-06-17 01:47:48 UTC (rev 8939)
@@ -52,7 +52,7 @@
             delete root;
             throw std::logic_error("File contents are incomplete or corrupt");
         }
-        m_name = _LTR(temp_name.c_str());
+        m_name = temp_name.c_str();
         foundName = true;                
     }
     else

Modified: main/branches/0.7.2/src/race/grand_prix_data.hpp
===================================================================
--- main/branches/0.7.2/src/race/grand_prix_data.hpp	2011-06-17 01:46:30 UTC (rev 8938)
+++ main/branches/0.7.2/src/race/grand_prix_data.hpp	2011-06-17 01:47:48 UTC (rev 8939)
@@ -27,15 +27,15 @@
 #include <irrString.h>
 #include <stdexcept>
 
+#include "utils/translation.hpp"
+
 /** Simple class that hold the data relevant to a 'grand_prix', aka. a number
   * of races that has to be completed one after the other
   * \ingroup race
   */
 class GrandPrixData
 {
-    irr::core::stringw m_name;         //!< The name of the grand prix - might be translated!
-
-    //irr::core::stringw m_description;  //!< Description for this GP
+    irr::core::stringw m_name;         //!< The name of the grand prix
     
     std::string m_id;                  //!< Internal name of the grand prix, not translated
     std::string m_filename;            //!< Original filename, only for error handling needed
@@ -58,8 +58,8 @@
                        GrandPrixData  (const std::string filename) throw(std::logic_error);
                        GrandPrixData  ()       {}; // empty for initialising
     
-    /** @return the (potentially translated) user-visible name of the Grand Prix */
-    const irr::core::stringw& getName ()        const { return m_name;          }
+    /** @return the (potentially translated) user-visible name of the Grand Prix (apply fribidi as needed) */
+    const irr::core::stringw getName ()        const { return _LTR(m_name.c_str());    }
     
     /** @return the (potentially translated) user-visible description of the Grand Prix */
     //const irr::core::stringw& getDescription () const { return m_description;   }


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