correct format for unsigned long argument, remoteCloseLink is oneway void

[lyx.git] / src / support / gettext.cpp

diff --git a/src/support/gettext.cpp b/src/support/gettext.cpp
index 9cd1a3ffbd7795e01275d4bc13bcbe842b91d2ac..cb21d573f4db39ea76103e617bc4cb3586df4b2d 100644 (file)
--- a/src/support/gettext.cpp
+++ b/src/support/gettext.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  *
  * Full author contact details are available in file CREDITS.
@@ -15,6 +15,7 @@
 
 #include "support/lstrings.h"
 #include "support/Messages.h"
+#include "support/Package.h"
 
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
@@ -45,7 +46,7 @@ void locale_init()
 
 docstring const translateIfPossible(docstring const & name)
 {
-       if (support::isAscii(name))
+       if (support::isAscii(name) && !name.empty())
                // Probably from a standard configuration file, try to
                // translate
                return _(to_ascii(name));
@@ -57,4 +58,18 @@ docstring const translateIfPossible(docstring const & name)
 }
 
 
+docstring const translateIfPossible(docstring const & name, std::string const & language)
+{
+       if (support::isAscii(name) && !name.empty())
+               // Probably from a standard configuration file, try to
+               // translate
+               return getMessages(language).get(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