More 'standard conformant blurb' nonsense.

[lyx.git] / src / messages.C

diff --git a/src/messages.C b/src/messages.C
index 77ee44a4a7c5f863e411820255ee0ea30f1af313..a8e5576a120ef52eb4442d1cfaffe4915d78c474 100644 (file)
--- a/src/messages.C
+++ b/src/messages.C
@@ -12,6 +12,9 @@
 #include "messages.h"
 #include "debug.h"
 #include "support/filetools.h"
+#include "support/path_defines.h"
+
+using namespace lyx::support;
 
 
 #ifdef ENABLE_NLS
@@ -25,7 +28,7 @@ string const & getLocaleDir()
        if (locale_dir.empty()) {
                locale_dir = GetEnvPath("LYX_LOCALEDIR");
                if (locale_dir.empty())
-                       locale_dir = LOCALEDIR;
+                       locale_dir = lyx_localedir();
        }
        return locale_dir;
 }
@@ -102,6 +105,9 @@ public:
 
        string const get(string const & m) const
        {
+               if (m.empty())
+                       return m;
+
                char * old = strdup(setlocale(LC_ALL, 0));
                char * n = setlocale(LC_ALL, lang_.c_str());
                const char* msg = gettext(m.c_str());
@@ -114,8 +120,6 @@ public:
 private:
        ///
        string lang_;
-       ///
-       string localedir_;
 };
 #endif