r11447 - packages/trunk/between/debian/patches

[Paul Wise]

Author: pabs
Date: 2010-10-31 11:22:24 +0000 (Sun, 31 Oct 2010)
New Revision: 11447

Modified:
   packages/trunk/between/debian/patches/abs_path.patch
Log:
Also use an absolute path to the language stuff

Modified: packages/trunk/between/debian/patches/abs_path.patch
===================================================================
--- packages/trunk/between/debian/patches/abs_path.patch	2010-10-31 11:11:28 UTC (rev 11446)
+++ packages/trunk/between/debian/patches/abs_path.patch	2010-10-31 11:22:24 UTC (rev 11447)
@@ -68,3 +68,33 @@
                      }
                  else {
                      resultWellFormatted = false;
+--- a/minorGems/util/TranslationManager.cpp
++++ b/minorGems/util/TranslationManager.cpp
+@@ -162,7 +162,7 @@
+       mNaturalLanguageStrings( NULL ) {
+ 
+     // default
+-    setDirectoryAndLanguage( "languages", "English" );
++    setDirectoryAndLanguage( DATADIR"languages", "English" );
+     }
+ 
+ 
+--- a/game7/gameSource/game.cpp
++++ b/game7/gameSource/game.cpp
+@@ -1411,7 +1411,7 @@
+ void GameSceneHandler::initFromFiles() {
+     
+     // translation language
+-    File languageNameFile( NULL, "language.txt" );
++    File languageNameFile( new Path(DATADIR), "language.txt" );
+ 
+     if( languageNameFile.exists() ) {
+         char *languageNameText = languageNameFile.readFileContents();
+@@ -1424,6 +1424,7 @@
+         if( numTokens > 0 ) {
+             char *languageName = *( tokens->getElement( 0 ) );
+         
++            TranslationManager::setDirectoryName( DATADIR "/languages" );
+             TranslationManager::setLanguage( languageName );
+             }
+         else {