Changeset 10624 for code/trunk/src/libraries/core/Language.h

Timestamp:

Oct 4, 2015, 9:12:21 PM (10 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/Language.h (modified) (2 diffs)

code/trunk/src/libraries/core/Language.h

@@ -161 +161 @@
     {
         friend class Singleton<Language>;
-        friend class Core;
+        friend class CoreConfig;
 
         public:
@@ -174 +174 @@
 
             void readDefaultLanguageFile();
-            void readTranslatedLanguageFile();
+            bool readTranslatedLanguageFile(const std::string& language);
             void writeDefaultLanguageFile() const;
             static std::string getFilename(const std::string& language);