Changeset 7186 for code/branches/consolecommands3/src/libraries/core/Language.cc

Timestamp:

Aug 19, 2010, 2:14:54 AM (14 years ago)

Author:

landauf

Message:

Moved ability to possess descriptions from Executor to ConsoleCommand, since no other executors use this feature. Also simplified this code a little by introducing a new shortcut in Language.h. XMLPort has to use a temporary solution for descriptions without Language support atm.

File:

• code/branches/consolecommands3/src/libraries/core/Language.cc (modified) (3 diffs)

code/branches/consolecommands3/src/libraries/core/Language.cc

@@ -36 +36 @@
 #include <fstream>
 #include "util/Debug.h"
+#include "util/StringUtils.h"
 #include "Core.h"
 #include "PathConfig.h"
@@ -169 +170 @@
         @return The localisation
     */
-    const std::string& Language::getLocalisation(const LanguageEntryLabel& label) const
+    const std::string& Language::getLocalisation(const LanguageEntryLabel& label, bool bError) const
     {
         std::map<std::string, LanguageEntry*>::const_iterator it = this->languageEntries_.find(label);
         if (it != this->languageEntries_.end())
             return it->second->getLocalisation();
-        else
+        else if (bError)
         {
             // Uh, oh, an undefined entry was requested: return the default string
@@ -180 +181 @@
             return this->defaultLocalisation_;
         }
+        else
+            return BLANKSTRING;
     }