Point fix, earlier forgotten

[lyx.git] / src / messages.C

diff --git a/src/messages.C b/src/messages.C
index 663da2a8f2317413cfcb224b971d6c2aa04b7ac0..a933fbacdc55e6fd95f07fa3d00662ede5c6d719 100644 (file)
--- a/src/messages.C
+++ b/src/messages.C
@@ -4,7 +4,7 @@
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -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());