Remove lyxrc \default_language which has been dropped from the GUI some time ago

The default language of new documents is set via the template
This commit is contained in:
Juergen Spitzmueller 2012-08-07 08:29:46 +02:00
parent 6d2ed04800
commit 2dd84b3417
4 changed files with 6 additions and 29 deletions

View File

@ -25,10 +25,11 @@ options have been added:
The Advanced Find and Replace feature now supports cancel of a long The Advanced Find and Replace feature now supports cancel of a long
search operation by hitting the ESC key. search operation by hitting the ESC key.
The following pref variables were changed in 2.0: The following pref variables were changed in 2.1:
The following pref variables are obsoleted in 2.0: The following pref variables are obsoleted in 2.1:
- \\default_language
- \\default_papersize - \\default_papersize
The following new LyX functions have been introduced: The following new LyX functions have been introduced:

View File

@ -247,12 +247,9 @@ void Languages::read(FileName const & filename)
languagelist[l.lang()] = l; languagelist[l.lang()] = l;
} }
default_language = getLanguage(lyxrc.default_language);
if (!default_language) {
LYXERR0("Default language \"" << lyxrc.default_language
<< "\" not found!");
default_language = getLanguage("english"); default_language = getLanguage("english");
if (!default_language) if (!default_language) {
LYXERR0("Default language \"english\" not found!");
default_language = &(*languagelist.begin()).second; default_language = &(*languagelist.begin()).second;
LYXERR0("Using \"" << default_language->lang() << "\" instead!"); LYXERR0("Using \"" << default_language->lang() << "\" instead!");
} }

View File

@ -91,7 +91,6 @@ LexerKeyword lyxrcTags[] = {
{ "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT }, { "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT },
{ "\\def_file", LyXRC::RC_DEFFILE }, { "\\def_file", LyXRC::RC_DEFFILE },
{ "\\default_decimal_point", LyXRC::RC_DEFAULT_DECIMAL_POINT }, { "\\default_decimal_point", LyXRC::RC_DEFAULT_DECIMAL_POINT },
{ "\\default_language", LyXRC::RC_DEFAULT_LANGUAGE },
{ "\\default_length_unit", LyXRC::RC_DEFAULT_LENGTH_UNIT }, { "\\default_length_unit", LyXRC::RC_DEFAULT_LENGTH_UNIT },
{ "\\default_view_format", LyXRC::RC_DEFAULT_VIEW_FORMAT }, { "\\default_view_format", LyXRC::RC_DEFAULT_VIEW_FORMAT },
{ "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN }, { "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN },
@ -319,7 +318,6 @@ void LyXRC::setDefaults()
language_command_local = "\\foreignlanguage{$$lang}{"; language_command_local = "\\foreignlanguage{$$lang}{";
sort_layouts = false; sort_layouts = false;
group_layouts = true; group_layouts = true;
default_language = "english";
gui_language = "auto"; gui_language = "auto";
show_banner = true; show_banner = true;
windows_style_tex_paths = false; windows_style_tex_paths = false;
@ -1161,10 +1159,6 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
lexrc >> default_view_format; lexrc >> default_view_format;
break; break;
case RC_DEFAULT_LANGUAGE:
lexrc >> default_language;
break;
case RC_GUI_LANGUAGE: case RC_GUI_LANGUAGE:
lexrc >> gui_language; lexrc >> gui_language;
break; break;
@ -2639,13 +2633,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
} }
if (tag != RC_LAST) if (tag != RC_LAST)
break; break;
case RC_DEFAULT_LANGUAGE:
if (ignore_system_lyxrc ||
default_language != system_lyxrc.default_language) {
os << "\\default_language " << default_language << '\n';
}
if (tag != RC_LAST)
break;
case RC_GUI_LANGUAGE: case RC_GUI_LANGUAGE:
if (ignore_system_lyxrc || if (ignore_system_lyxrc ||
gui_language != system_lyxrc.gui_language) { gui_language != system_lyxrc.gui_language) {
@ -2916,7 +2903,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
case LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR: case LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR:
case LyXRC::RC_SCROLL_BELOW_DOCUMENT: case LyXRC::RC_SCROLL_BELOW_DOCUMENT:
case LyXRC::RC_DATE_INSERT_FORMAT: case LyXRC::RC_DATE_INSERT_FORMAT:
case LyXRC::RC_DEFAULT_LANGUAGE:
case LyXRC::RC_GUI_LANGUAGE: case LyXRC::RC_GUI_LANGUAGE:
case LyXRC::RC_DEFAULT_VIEW_FORMAT: case LyXRC::RC_DEFAULT_VIEW_FORMAT:
case LyXRC::RC_DEFFILE: case LyXRC::RC_DEFFILE:
@ -3153,10 +3139,6 @@ string const LyXRC::getDescription(LyXRCTags tag)
str = _("The default format used with LFUN_BUFFER_[VIEW|UPDATE]."); str = _("The default format used with LFUN_BUFFER_[VIEW|UPDATE].");
break; break;
case RC_DEFAULT_LANGUAGE:
str = _("New documents will be assigned this language.");
break;
case RC_DIALOGS_ICONIFY_WITH_MAIN: case RC_DIALOGS_ICONIFY_WITH_MAIN:
str = _("Iconify the dialogs when the main window is iconified. (Affects only dialogs shown after the change has been made.)"); str = _("Iconify the dialogs when the main window is iconified. (Affects only dialogs shown after the change has been made.)");
break; break;

View File

@ -71,7 +71,6 @@ public:
RC_DATE_INSERT_FORMAT, RC_DATE_INSERT_FORMAT,
RC_DEFAULT_DECIMAL_POINT, RC_DEFAULT_DECIMAL_POINT,
RC_DEFAULT_LENGTH_UNIT, RC_DEFAULT_LENGTH_UNIT,
RC_DEFAULT_LANGUAGE,
RC_DEFAULT_VIEW_FORMAT, RC_DEFAULT_VIEW_FORMAT,
RC_DEFFILE, RC_DEFFILE,
RC_DIALOGS_ICONIFY_WITH_MAIN, RC_DIALOGS_ICONIFY_WITH_MAIN,
@ -419,8 +418,6 @@ public:
/// ///
bool mark_foreign_language; bool mark_foreign_language;
/// ///
std::string default_language;
///
std::string gui_language; std::string gui_language;
/// ///
std::string default_view_format; std::string default_view_format;