X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=95b1a857723c7c8e979af4f2e652596d5f9a3e7e;hb=c727c6db7f2dd7f6a727462f5d11964888d0e76e;hp=c0fbb68ab6c37ef9522d8e17da91edf439cf1b21;hpb=f2c60a584a6c6a257dcf52e5bc416051e0628931;p=lyx.git

diff --git a/src/lyx_main.C b/src/lyx_main.C
index c0fbb68ab6..95b1a85772 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -150,6 +150,10 @@ struct LyX::Singletons
 {
 	Singletons(): iconv(ucs4_codeset, "UTF-8")
 	{
+		// Set the default User Interface language as soon as possible.
+		// The language used will be derived from the environment
+		// variables.
+		messages_["GUI"] = Messages();
 	}
 	/// our function handler
 	LyXFunc lyxfunc_;
@@ -172,8 +176,14 @@ struct LyX::Singletons
 	/// Files to load at start.
 	vector<FileName> files_to_load_;
 
-	///
+	/// The messages translators.
 	map<string, Messages> messages_;
+
+	/// The file converters.
+	Converters converters_;
+
+	// The system converters copy after reading lyxrc.defaults.
+	Converters system_converters_;
 };
 
 ///
@@ -301,6 +311,18 @@ kb_keymap & LyX::topLevelKeymap()
 }
 
 
+Converters & LyX::converters()
+{
+	return pimpl_->converters_;
+}
+
+
+Converters & LyX::systemConverters()
+{
+	return pimpl_->system_converters_;
+}
+
+
 IconvProcessor & LyX::iconvProcessor()
 {
 	return pimpl_->iconv;
@@ -800,8 +822,8 @@ bool LyX::init()
 	if (!readRcFile("lyxrc.dist"))
 		return false;
 
-	// Set the User Interface language.
-	pimpl_->messages_["GUI"] = Messages();
+	// Set the language defined by the distributor.
+	//setGuiLanguage(lyxrc.gui_language);
 
 	// Set the PATH correctly.
 #if !defined (USE_POSIX_PACKAGING)
@@ -834,7 +856,7 @@ bool LyX::init()
 
 	system_lyxrc = lyxrc;
 	system_formats = formats;
-	system_converters = converters;
+	pimpl_->system_converters_ = pimpl_->converters_;
 	system_movers = movers;
 	system_lcolor = lcolor;
 
@@ -853,6 +875,9 @@ bool LyX::init()
 		return false;
 
 	if (use_gui) {
+		// Set the language defined by the user.
+		//setGuiLanguage(lyxrc.gui_language);
+
 		// Set up bindings
 		pimpl_->toplevel_keymap_.reset(new kb_keymap);
 		defaultKeyBindings(pimpl_->toplevel_keymap_.get());
@@ -1435,6 +1460,18 @@ kb_keymap & theTopLevelKeymap()
 }
 
 
+Converters & theConverters()
+{
+	return  LyX::ref().converters();
+}
+
+
+Converters & theSystemConverters()
+{
+	return  LyX::ref().systemConverters();
+}
+
+
 IconvProcessor & utf8ToUcs4()
 {
 	return LyX::ref().iconvProcessor();