Remove the inset and view member functions from PreviewedInset.

[lyx.git] / src / messages.C

diff --git a/src/messages.C b/src/messages.C
index 466d9e2240ca8376e19b3866886adcd6a2eff460..0fcf097708f33bccf4eca75225e2270050aa5e56 100644 (file)
--- a/src/messages.C
+++ b/src/messages.C
@@ -4,36 +4,58 @@
  *
  * \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>
 
 #include "messages.h"
-#include "debug.h"
+#include "support/filetools.h"
+#include "support/path_defines.h"
+
+using lyx::support::GetEnvPath;
+using lyx::support::lyx_localedir;
+
+using std::string;
 
 
 #ifdef ENABLE_NLS
 
+namespace {
+
+string const & getLocaleDir()
+{
+       static string locale_dir;
+
+       if (locale_dir.empty()) {
+               locale_dir = GetEnvPath("LYX_LOCALEDIR");
+               if (locale_dir.empty())
+                       locale_dir = lyx_localedir();
+       }
+       return locale_dir;
+}
+
+} // anon namespace
+
 #if 0
 
-#include <locale>
+-#include <locale>
 
 // This version of the Pimpl utilizes the message capability of
-// libstdc++ that is distributed with GNU G++
+// libstdc++ that is distributed with GNU G++.
 class Messages::Pimpl {
 public:
        typedef std::messages<char>::catalog catalog;
 
-       Pimpl(string const & l, string const & dir)
-               : lang_(l), localedir_(dir),
+       Pimpl(string const & l)
+               : lang_(l),
                  loc_gl(lang_.c_str()),
                  mssg_gl(std::use_facet<std::messages<char> >(loc_gl))
        {
                //lyxerr << "Messages: language(" << l
                //       << ") in dir(" << dir << ")" << std::endl;
 
-               cat_gl = mssg_gl.open(PACKAGE, loc_gl, localedir_.c_str());
+               cat_gl = mssg_gl.open(PACKAGE, loc_gl, getLocaleDir().c_str());
 
        }
 
@@ -50,8 +72,6 @@ private:
        ///
        string lang_;
        ///
-       string localedir_;
-       ///
        std::locale loc_gl;
        ///
        std::messages<char> const & mssg_gl;
@@ -73,13 +93,13 @@ private:
 // This is a more traditional variant.
 class Messages::Pimpl {
 public:
-       Pimpl(string const & l, string const & dir)
-               : lang_(l), localedir_(dir)
+       Pimpl(string const & l)
+               : lang_(l)
        {
                //lyxerr << "Messages: language(" << l
                //       << ") in dir(" << dir << ")" << std::endl;
 
-             bindtextdomain(PACKAGE, localedir_.c_str());
+             bindtextdomain(PACKAGE, getLocaleDir().c_str());
              textdomain(PACKAGE);
        }
 
@@ -87,6 +107,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());
@@ -99,8 +122,6 @@ public:
 private:
        ///
        string lang_;
-       ///
-       string localedir_;
 };
 #endif
 
@@ -108,7 +129,7 @@ private:
 // This is the dummy variant.
 class Messages::Pimpl {
 public:
-       Pimpl(string const &, string const &) {}
+       Pimpl(string const &) {}
 
        ~Pimpl() {}
 
@@ -119,8 +140,14 @@ public:
 };
 #endif
 
-Messages::Messages(string const & l, string const & dir)
-       : pimpl_(new Pimpl(l, dir))
+
+Messages::Messages()
+       : pimpl_(new Pimpl(""))
+{}
+
+
+Messages::Messages(string const & l)
+       : pimpl_(new Pimpl(l))
 {}