Typo.

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 794df0da687d2eb3788c0aaf99285319f0ef6de2..5ff73f64eaf9a7b92987944b6c9627c3377d7f03 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -343,9 +343,18 @@ Messages & LyX::getGuiMessages()
 }
 
 
-void LyX::setGuiLanguage(string const & language)
+void LyX::setRcGuiLanguage()
 {
-       pimpl_->messages_["GUI"] = Messages(language);
+       if (lyxrc.gui_language == "auto")
+               return;
+       Language const * language = languages.getLanguage(lyxrc.gui_language);
+       LYXERR(Debug::LOCALE, "Setting LANGUAGE to " << language->code());
+       if (!setEnv("LANGUAGE", language->code()))
+               LYXERR(Debug::LOCALE, "\t... failed!");
+       LYXERR(Debug::LOCALE, "Setting LC_ALL to en_US");
+       if (!setEnv("LC_ALL", "en_US"))
+               LYXERR(Debug::LOCALE, "\t... failed!");
+       pimpl_->messages_["GUI"] = Messages();
 }
 
 
@@ -410,6 +419,10 @@ int LyX::exec(int & argc, char * argv[])
        // Let the frontend parse and remove all arguments that it knows
        pimpl_->application_.reset(createApplication(argc, argv));
 
+       // Reestablish our defaults, as Qt overwrites them
+       // after createApplication()
+       locale_init();
+
        // Parse and remove all known arguments in the LyX singleton
        // Give an error for all remaining ones.
        int exit_status = init(argc, argv);
@@ -764,7 +777,7 @@ bool LyX::init()
                return false;
 
        // Set the language defined by the distributor.
-       //setGuiLanguage(lyxrc.gui_language);
+       setRcGuiLanguage();
 
        // Set the PATH correctly.
 #if !defined (USE_POSIX_PACKAGING)
@@ -810,6 +823,9 @@ bool LyX::init()
        if (!readLanguagesFile("languages"))
                return false;
 
+       // Set the language defined by the user.
+       setRcGuiLanguage();
+
        // Load the layouts
        LYXERR(Debug::INIT, "Reading layouts...");
        if (!LyXSetStyle())
@@ -821,9 +837,6 @@ bool LyX::init()
        // because InsetInfo needs to know these to produce
        // the correct output
 
-       // Set the language defined by the user.
-       //setGuiLanguage(lyxrc.gui_language);
-
        // Set up command definitions
        pimpl_->toplevel_cmddef_.read(lyxrc.def_file);