more dialog merging

[lyx.git] / src / gettext.C

diff --git a/src/gettext.C b/src/gettext.C
index 6c79a241d184d72990d9e3aba9e76f102a8fc2da..46053cfc59e5407e4e66316470accbf6ed59e26d 100644 (file)
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -13,40 +13,25 @@
 
 #include "gettext.h"
 #include "messages.h"
+
 #include "support/environment.h"
-#include "support/docstring.h"
+#include "support/lstrings.h"
+
+
+namespace lyx {
 
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
 
-using lyx::support::setEnv;
-using lyx::docstring;
+using support::setEnv;
 
 using std::string;
 
 
-namespace {
-
-Messages & getLyXMessages()
-{
-       static Messages lyx_messages;
-
-       return lyx_messages;
-}
-
-} // anon namespace
-
-
 docstring const _(string const & str)
 {
-       return getLyXMessages().get(str);
-}
-
-
-docstring const _(docstring const & str)
-{
-       return getLyXMessages().get(lyx::to_utf8(str));
+       return getGuiMessages().get(str);
 }
 
 
@@ -71,3 +56,20 @@ void locale_init()
 }
 
 #endif
+
+
+docstring const translateIfPossible(docstring const & name)
+{
+       if (support::isAscii(name))
+               // Probably from a standard configuration file, try to
+               // translate
+               return _(to_ascii(name));
+       else
+               // This must be from a user defined configuration file. We
+               // cannot translate this, since gettext accepts only ascii
+               // keys.
+               return name;
+}
+
+
+} // namespace lyx