X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=e6f7f9ed6a940a261b6a604b9c54b210936527d7;hb=cde541d785aaac9d45d636a7f9071353dd932eb6;hp=9f8c57e6f4e659d656cf29220cb5d0bb20320616;hpb=ed1515ef69d0381e9b0657cf1966f9d86e0cb25f;p=lyx.git

diff --git a/src/Language.cpp b/src/Language.cpp
index 9f8c57e6f4..e6f7f9ed6a 100644
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -38,6 +38,12 @@ Language const * latex_language = 0;
 Language const * reset_language = 0;
 
 
+bool Language::isPolyglossiaExclusive() const
+{
+	return babel().empty() && !polyglossia().empty() && requires().empty();
+}
+
+
 docstring const Language::translateLayout(string const & m) const
 {
 	if (m.empty())
@@ -247,23 +253,16 @@ void Languages::read(FileName const & filename)
 			languagelist[l.lang()] = l;
 	}
 
-	default_language = getLanguage(lyxrc.default_language);
+	default_language = getLanguage("english");
 	if (!default_language) {
-		LYXERR0("Default language \"" << lyxrc.default_language
-		       << "\" not found!");
-		default_language = getLanguage("english");
-		if (!default_language)
-			default_language = &(*languagelist.begin()).second;
+		LYXERR0("Default language \"english\" not found!");
+		default_language = &(*languagelist.begin()).second;
 		LYXERR0("Using \"" << default_language->lang() << "\" instead!");
 	}
 
 	// Read layout translations
-	FileName path = libFileSearch(string(), "layouttranslations");
+	FileName const path = libFileSearch(string(), "layouttranslations");
 	readLayoutTranslations(path);
-
-	// Read installed translations
-	path = libFileSearch(string(), "installed_translations");
-	readInstalledTranslations(path);
 }
 
 
@@ -372,32 +371,6 @@ void Languages::readLayoutTranslations(support::FileName const & filename)
 }
 
 
-void Languages::readInstalledTranslations(support::FileName const & filename)
-{
-	Lexer lex;
-	lex.setFile(filename);
-	lex.setContext("Languages::read");
-
-	// 1) read all installed gmo files names
-	set<string> installed_translations;
-	string lang_code;
-	while (lex.isOK()) {
-		lex >> lang_code;
-		installed_translations.insert(lang_code);
-	}
-
-	// 2) mark all corresponding languages as translated.
-	LanguageList::iterator lit = languagelist.begin();
-	LanguageList::iterator const lend = languagelist.end();
-	for ( ; lit != lend ; ++lit) {
-		if (installed_translations.count(lit->second.code())
-		    || installed_translations.count(token(lit->second.code(), '_', 0)))
-			lit->second.translated(true);
-	}
-
-}
-
-
 Language const * Languages::getLanguage(string const & language) const
 {
 	if (language == "reset")