Changeset 725

Timestamp:

Dec 29, 2007, 11:17:08 PM (16 years ago)

Author:

landauf

Message:

it's now possible to use a translation without already existing translation_default.lang file

Location:

code/branches/FICN/src/orxonox/core

Files:

• ConfigValueContainer.cc (modified) (1 diff)
• Language.cc (modified) (5 diffs)
• Language.h (modified) (2 diffs)

code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc

@@ -948 +948 @@
         {
             this->description_ = std::string("ConfigValueDescription::" + this->classname_ + "::" + this->varname_);
-            Language::getLanguage().addEntry(description_, description);
+            Language::getLanguage().addEntry(this->description_, description);
             this->bAddedDescription_ = true;
+            COUT(4) << "Added description " << this->description_ << std::endl;
+            COUT(4) << "Translation is: " << Language::getLanguage().getTranslation(this->description_) << std::endl;
         }
     }

code/branches/FICN/src/orxonox/core/Language.cc

@@ -51 +51 @@
         this->fallbackEntry_ = fallbackEntry;
         this->translatedEntry_ = fallbackEntry; // Set the translation to the fallback entry, for the case that no translation gets assigned
+        this->bTranslationSet_ = false;
     }
 
@@ -61 +62 @@
         // Check if the translation is more than just an empty string
         if (translation.compare("") != 0)
+        {
             this->translatedEntry_ = translation;
+            this->bTranslationSet_ = true;
+        }
         else
             this->translatedEntry_ = this->fallbackEntry_;
@@ -73 +77 @@
     {
         // If the default entry changes and the translation wasn't set yet, use the new default entry as translation
-        if (this->translatedEntry_.compare(this->fallbackEntry_) == 0)
+        if (!this->bTranslationSet_)
             this->translatedEntry_ = fallbackEntry;
 
@@ -131 +135 @@
         @param name The name of the entry
         @param entry The default entry
-    */
-    void Language::createEntry(const LanguageEntryName& name, const std::string& entry)
-    {
+        @return The created LanguageEntry object
+    */
+    LanguageEntry* Language::createEntry(const LanguageEntryName& name, const std::string& entry)
+    {
+        std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.find(name);
+
         // Make sure we don't create a duplicate entry
-        if (!this->languageEntries_[name])
+        if (!it->second)
         {
             LanguageEntry* newEntry = new LanguageEntry(entry);
             newEntry->setName(name);
             this->languageEntries_[name] = newEntry;
-        }
-        else
-        {
-            COUT(2) << "Warning: Language entry " << name << " is duplicate in " << getFileName(this->defaultLanguage_) << "!" << std::endl;
-        }
+            return newEntry;
+        }
+
+        COUT(2) << "Warning: Language entry " << name << " is duplicate in " << getFileName(this->defaultLanguage_) << "!" << std::endl;
+        return it->second;
     }
 
@@ -290 +297 @@
                         it->second->setTranslation(lineString.substr(pos + 1));
                     else
-                        COUT(2) << "Warning: Unknown language entry \"" << lineString.substr(0, pos) << "\" in " << getFileName(this->language_) << std::endl;
+                        this->createEntry(lineString.substr(0, pos), this->defaultTranslation_)->setTranslation(lineString.substr(pos + 1));
                 }
                 else

code/branches/FICN/src/orxonox/core/Language.h

@@ -74 +74 @@
             std::string fallbackEntry_;                             //!< The default entry: Used, if no translation is available or no language configured
             std::string translatedEntry_;                           //!< The translated entry in the configured language
+            bool bTranslationSet_;                                  //!< True if the translation was set
     };
 
@@ -94 +95 @@
             void writeDefaultLanguageFile() const;
             static const std::string getFileName(const std::string& language);
-            void createEntry(const LanguageEntryName& name, const std::string& entry);
+            LanguageEntry* createEntry(const LanguageEntryName& name, const std::string& entry);
 
             std::string language_;                                  //!< The configured language