X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=09fcfd5398e42ba1c6f9d0cc9f3de52dc27a4182;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=55fb0711ad71f4ae4517edc6405dba86f3f24c51;hpb=d42c5fcd233a17c1693fd4de3702fc2ad998592d;p=lyx.git diff --git a/src/LyX.cpp b/src/LyX.cpp index 55fb0711ad..09fcfd5398 100644 --- a/src/LyX.cpp +++ b/src/LyX.cpp @@ -33,7 +33,6 @@ #include "FuncStatus.h" #include "HunspellChecker.h" #include "KeyMap.h" -#include "Language.h" #include "LaTeXFonts.h" #include "LayoutFile.h" #include "Lexer.h" @@ -188,7 +187,7 @@ struct LyX::Impl { bool first_start; /// the parsed command line batch command if any vector batch_commands; - + /// LaTeXFonts * latexfonts_; @@ -261,7 +260,7 @@ Messages & LyX::messages(string const & language) pair::iterator, bool> result = pimpl_->messages_.insert(make_pair(language, Messages(language))); - LASSERT(result.second, /**/); + LATTEST(result.second); return result.first->second; } @@ -272,7 +271,7 @@ int LyX::exec(int & argc, char * argv[]) try { init_package(os::utf8_argv(0), string(), string()); // we do not get to this point when init_package throws an exception - locale_init(); + setLocale(); } catch (ExceptionMessage const & message) { LYXERR(Debug::LOCALE, message.title_ + ", " + message.details_); } @@ -294,7 +293,7 @@ int LyX::exec(int & argc, char * argv[]) // Reinit the messages machinery in case package() knows // something interesting about the locale directory. - Messages::init(); + setLocale(); if (!use_gui) { // FIXME: create a ConsoleApplication @@ -337,7 +336,7 @@ int LyX::exec(int & argc, char * argv[]) // Reestablish our defaults, as Qt overwrites them // after createApplication() - locale_init(); + setLocale();//??? // Parse and remove all known arguments in the LyX singleton // Give an error for all remaining ones. @@ -436,7 +435,7 @@ void LyX::prepareExit() void LyX::earlyExit(int status) { - LASSERT(pimpl_->application_.get(), /**/); + LATTEST(pimpl_->application_.get()); // LyX::pimpl_::application_ is not initialised at this // point so it's safe to just exit after some cleanup. prepareExit(); @@ -484,7 +483,7 @@ int LyX::init(int & argc, char * argv[]) bool LyX::loadFiles() { - LASSERT(!use_gui, /**/); + LATTEST(!use_gui); bool success = true; vector::const_iterator it = pimpl_->files_to_load_.begin(); vector::const_iterator end = pimpl_->files_to_load_.end(); @@ -520,7 +519,7 @@ bool LyX::loadFiles() void execBatchCommands() { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); singleton_->execCommands(); } @@ -794,6 +793,9 @@ bool LyX::init() if (!readRcFile("preferences", true)) return false; + // The language may have been set to someting useful through prefs + setLocale(); + if (!readEncodingsFile("encodings", "unicodesymbols")) return false; if (!readLanguagesFile("languages")) @@ -1066,7 +1068,8 @@ int parse_version(string const &, string const &, string &) { cout << "LyX " << lyx_version << " (" << lyx_release_date << ")" << endl; - cout << "Built on " << __DATE__ << ", " << __TIME__ << endl; + cout << to_utf8(bformat(_("Built on %1$s[[date]], %2$s[[time]]"), + from_ascii(__DATE__), from_ascii(__TIME__))) << endl; cout << lyx_version_info << endl; exit(0); @@ -1268,35 +1271,35 @@ void LyX::easyParse(int & argc, char * argv[]) FuncStatus getStatus(FuncRequest const & action) { - LASSERT(theApp(), /**/); + LAPPERR(theApp()); return theApp()->getStatus(action); } void dispatch(FuncRequest const & action) { - LASSERT(theApp(), /**/); + LAPPERR(theApp()); return theApp()->dispatch(action); } void dispatch(FuncRequest const & action, DispatchResult & dr) { - LASSERT(theApp(), /**/); + LAPPERR(theApp()); return theApp()->dispatch(action, dr); } vector & theFilesToLoad() { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); return singleton_->pimpl_->files_to_load_; } BufferList & theBufferList() { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); return singleton_->pimpl_->buffer_list_; } @@ -1304,8 +1307,8 @@ BufferList & theBufferList() Server & theServer() { // FIXME: this should not be use_gui dependent - LASSERT(use_gui, /**/); - LASSERT(singleton_, /**/); + LWARNIF(use_gui); + LAPPERR(singleton_); return *singleton_->pimpl_->lyx_server_.get(); } @@ -1313,97 +1316,85 @@ Server & theServer() ServerSocket & theServerSocket() { // FIXME: this should not be use_gui dependent - LASSERT(use_gui, /**/); - LASSERT(singleton_, /**/); + LWARNIF(use_gui); + LAPPERR(singleton_); return *singleton_->pimpl_->lyx_socket_.get(); } KeyMap & theTopLevelKeymap() { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); return singleton_->pimpl_->toplevel_keymap_; } Converters & theConverters() { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); return singleton_->pimpl_->converters_; } Converters & theSystemConverters() { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); return singleton_->pimpl_->system_converters_; } Movers & theMovers() { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); return singleton_->pimpl_->movers_; } Mover const & getMover(string const & fmt) { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); return singleton_->pimpl_->movers_(fmt); } void setMover(string const & fmt, string const & command) { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); singleton_->pimpl_->movers_.set(fmt, command); } Movers & theSystemMovers() { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); return singleton_->pimpl_->system_movers_; } Messages const & getMessages(string const & language) { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); return singleton_->messages(language); } Messages const & getGuiMessages() { - LASSERT(singleton_, /**/); - // A cache to translate full language name to language code - static string last_language = "auto"; - static string code; - if (lyxrc.gui_language != last_language) { - if (lyxrc.gui_language == "auto") - code.clear(); - else { - Language const * l = languages.getLanguage(lyxrc.gui_language); - code = l ? l->code() : string(); - } - last_language = lyxrc.gui_language; - } - return singleton_->messages(code); + LAPPERR(singleton_); + return singleton_->messages(Messages::guiLanguage()); } Session & theSession() { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); return *singleton_->pimpl_->session_.get(); } LaTeXFonts & theLaTeXFonts() { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); if (!singleton_->pimpl_->latexfonts_) singleton_->pimpl_->latexfonts_ = new LaTeXFonts; return *singleton_->pimpl_->latexfonts_; @@ -1412,7 +1403,7 @@ LaTeXFonts & theLaTeXFonts() CmdDef & theTopLevelCmdDef() { - LASSERT(singleton_, /**/); + LAPPERR(singleton_); return singleton_->pimpl_->toplevel_cmddef_; }