X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgettext.C;h=7bc80b4f7b0fa31c566fb54860617567e6f694f9;hb=2e57f2ff0ae7cd4a6efbf634ffe6d2f4379d9cfc;hp=d9f86c238fd6de2d19eca3c427f37e79766a541e;hpb=bdcc9b9a8fdd8d1e68714fe76cc02e8618bf704d;p=lyx.git

diff --git a/src/gettext.C b/src/gettext.C
index d9f86c238f..7bc80b4f7b 100644
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,12 +1,13 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file gettext.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
 #include <config.h>
 
@@ -22,38 +23,19 @@
 
 namespace {
 
-boost::scoped_ptr<Messages> lyx_messages;
-
-} // anon namespace
-
-
-char const * _(char const * str)
+Messages & getLyXMessages()
 {
-	// This breaks pretty much immediately
-	// lyx::Assert(str && str[0]);
-
-	if (!lyx_messages.get())
-		return str;
+	static Messages lyx_messages;
 
-	return lyx_messages->get(str).c_str();
+	return lyx_messages;
 }
 
-
-string const _(string const & str)
-{
-	// This breaks pretty much immediately
-	// lyx::Assert(!str.empty());
-
-	if (!lyx_messages.get())
-		return str;
-
-	return lyx_messages->get(str);
-}
+} // anon namespace
 
 
-void gettext_init(string const & localedir)
+string const _(string const & str)
 {
-	lyx_messages.reset(new Messages("", localedir));
+	return getLyXMessages().get(str);
 }