X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flanguage.C;h=e056463e93ca9fb528edef31c26ccc0f6de271c3;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=34e08854199483f00fa1aa0e91c99b50a7f7eb12;hpb=7e08de938a1323a2cd1809b1389b72f1fad35b7d;p=lyx.git

diff --git a/src/language.C b/src/language.C
index 34e0885419..e056463e93 100644
--- a/src/language.C
+++ b/src/language.C
@@ -19,6 +19,9 @@
 #include "lyxlex.h"
 #include "lyxrc.h"
 
+
+namespace lyx {
+
 using std::endl;
 using std::string;
 
@@ -36,7 +39,7 @@ void Languages::read(string const & filename)
 {
 	// We need to set the encoding of latex_lang
 	latex_lang = Language("latex", "latex", "Latex", false, "iso8859-1",
-			      encodings.getEncoding("iso8859-1"),
+			      encodings.getFromLyXName("iso8859-1"),
 			      "latex", "");
 
 	LyXLex lex(0, 0);
@@ -54,7 +57,7 @@ void Languages::read(string const & filename)
 			lang = lex.getString();
 		else
 			break;
-		lyxerr[Debug::INIT] << "Reading language " << lang << endl;
+		lyxerr[Debug::INFO] << "Reading language " << lang << endl;
 
 		if (lex.next())
 			babel = lex.getString();
@@ -69,9 +72,9 @@ void Languages::read(string const & filename)
 		if (lex.next())
 			latex_options = lex.getString();
 
-		Encoding const * encoding = encodings.getEncoding(encoding_str);
+		Encoding const * encoding = encodings.getFromLyXName(encoding_str);
 		if (!encoding) {
-			encoding = encodings.getEncoding("iso8859-1");
+			encoding = encodings.getFromLyXName("iso8859-1");
 			lyxerr << "Unknown encoding " << encoding_str << endl;
 		}
 
@@ -100,3 +103,6 @@ Language const * Languages::getLanguage(string const & language) const
 	const_iterator it = languagelist.find(language);
 	return it == languagelist.end() ? 0 : &it->second;
 }
+
+
+} // namespace lyx