cleanup and reorder initialisation code of GuiView and GuiToolbars. Move some things...

[lyx.git] / src / Messages.cpp

diff --git a/src/Messages.cpp b/src/Messages.cpp
index 66b974cfa16bfb4b291f048548c85e8ea42b2036..1056564619041d5928453522603c8a080ae711e2 100644 (file)
--- a/src/Messages.cpp
+++ b/src/Messages.cpp
@@ -15,24 +15,51 @@
 
 #include "support/docstring.h"
 #include "support/environment.h"
-#include "support/filetools.h"
 #include "support/Package.h"
 #include "support/unicode.h"
 
 #include <boost/current_function.hpp>
-#include <boost/regex.hpp>
 
 #include <cerrno>
 
+using std::endl;
+using std::map;
+using std::string;
+
 namespace {
-boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$");
-};
+
+using lyx::docstring;
+using lyx::from_ascii;
+
+void cleanTranslation(docstring & trans) 
+{
+       /*
+         Some english words have different translations, depending on
+         context. In these cases the original string is augmented by
+         context information (e.g. "To:[[as in 'From page x to page
+         y']]" and "To:[[as in 'From format x to format y']]". This
+         means that we need to filter out everything in double square
+         brackets at the end of the string, otherwise the user sees
+         bogus messages. If we are unable to honour the request we
+         just return what we got in.
+       */
+       docstring::size_type const pos1 = trans.find(from_ascii("[["));
+       if (pos1 != docstring::npos) {
+               docstring::size_type const pos2 
+                       = trans.find(from_ascii("]]"), pos1);
+               if (pos2 != docstring::npos) 
+                       trans.erase(pos1, pos2 - pos1 + 2);
+       }
+}
+
+}
+
 
 #ifdef ENABLE_NLS
 
-#ifdef HAVE_LOCALE_H
-#  include <locale.h>
-#endif
+#  ifdef HAVE_LOCALE_H
+#    include <locale.h>
+#  endif
 
 #  if HAVE_GETTEXT
 #    include <libintl.h>      // use the header already in the system *EK*
@@ -40,11 +67,6 @@ boost::regex const reg("^([^\\[]*)\\[\\[[^\\]]*\\]\\]$");
 #    include "../intl/libintl.h"
 #  endif
 
-using std::endl;
-using std::make_pair;
-using std::map;
-using std::string;
-
 namespace lyx {
 
 using support::package;
@@ -59,8 +81,8 @@ Messages::Messages(string const & l)
        // strip off any encoding suffix, i.e., assume 8-bit po files
        string::size_type i = lang_.find(".");
        lang_ = lang_.substr(0, i);
-       LYXERR(Debug::DEBUG) << BOOST_CURRENT_FUNCTION
-               << ": language(" << lang_ << ")" << endl;
+       LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
+               << ": language(" << lang_ << ")");
 }
 
 
@@ -71,19 +93,16 @@ void Messages::init()
        char const * c = bindtextdomain(PACKAGE, locale_dir.c_str());
        int e = errno;
        if (e) {
-               LYXERR(Debug::DEBUG)
-                       << BOOST_CURRENT_FUNCTION << '\n'
+               LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION << '\n'
                        << "Error code: " << errno << '\n'
                        << "Directory : " << package().locale_dir().absFilename() << '\n'
-                       << "Rtn value : " << c << endl;
+                       << "Rtn value : " << c);
        }
 
        if (!bind_textdomain_codeset(PACKAGE, ucs4_codeset)) {
-               LYXERR(Debug::DEBUG)
-                       << BOOST_CURRENT_FUNCTION << '\n'
+               LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION << '\n'
                        << "Error code: " << errno << '\n'
-                       << "Codeset   : " << ucs4_codeset << '\n'
-                       << endl;
+                       << "Codeset   : " << ucs4_codeset << '\n');
        }
 
        textdomain(PACKAGE);
@@ -120,35 +139,23 @@ docstring const Messages::get(string const & m) const
 #endif
        }
 
-       char const * tmp = m.c_str();
-       char const * msg = gettext(tmp);
-       docstring translated;
-       if (!msg || msg == tmp) {
-               if (!msg)
-                       lyxerr << "Undefined result from gettext" << endl;
-               //else
-               //      lyxerr << "Same as entered returned" << endl;
-               // Some english words have different translations,
-               // depending on context. In these cases the original
-               // string is augmented by context information (e.g.
-               // "To:[[as in 'From page x to page y']]" and
-               // "To:[[as in 'From format x to format y']]".
-               // This means that we need to filter out everything
-               // in double square brackets at the end of the
-               // string, otherwise the user sees bogus messages.
-               // If we are unable to honour the request we just
-               // return what we got in.
-               boost::smatch sub;
-               if (regex_match(m, sub, reg))
-                       translated = from_ascii(sub.str(1));
-               else
-                       translated = from_ascii(tmp);
+       char const * m_c = m.c_str();
+       char const * trans_c = gettext(m_c);
+       docstring trans;
+       if (!trans_c)
+               lyxerr << "Undefined result from gettext" << endl;
+       else if (trans_c == m_c) {
+               LYXERR(Debug::DEBUG, "Same as entered returned");
+               trans = from_ascii(m);
        } else {
-               LYXERR(Debug::DEBUG) << "We got a translation" << endl;
+               LYXERR(Debug::DEBUG, "We got a translation");
                // m is actually not a char const * but ucs4 data
-               translated = reinterpret_cast<char_type const *>(msg);
+               trans = reinterpret_cast<char_type const *>(trans_c);
        }
 
+       cleanTranslation(trans);
+
+       // Reset environment variables as they were.
        if (!lang_.empty()) {
                // Reset everything as it was.
                setEnv("LANGUAGE", oldLANGUAGE);
@@ -159,7 +166,7 @@ docstring const Messages::get(string const & m) const
        }
 
        std::pair<TranslationCache::iterator, bool> result =
-               cache_.insert(std::make_pair(m, translated));
+               cache_.insert(std::make_pair(m, trans));
 
        BOOST_ASSERT(result.second);
 
@@ -171,11 +178,6 @@ docstring const Messages::get(string const & m) const
 #else // ENABLE_NLS
 // This is the dummy variant.
 
-using std::endl;
-using std::make_pair;
-using std::map;
-using std::string;
-
 namespace lyx {
 
 Messages::Messages(string const & l) {}
@@ -187,12 +189,9 @@ void Messages::init()
 
 docstring const Messages::get(string const & m) const
 {
-       // See comment above
-       boost::smatch sub;
-       if (regex_match(m, sub, reg))
-               return from_ascii(sub.str(1));
-       else
-               return from_ascii(m);
+       docstring trans = from_ascii(m);
+       cleanTranslation(trans);
+       return trans;
 }
 
 } // namespace lyx