X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=884d1a039bb7078ba141013e693a6ba15b65843f;hb=8f43f83ddfbe6adbb04a2ba86e62797c0a313324;hp=03146c358a9abd23dca444ace28a8ee912314c96;hpb=5ac65d1532dd837862d8abcd757e9be5aa1fca0d;p=lyx.git

diff --git a/src/Language.cpp b/src/Language.cpp
index 03146c358a..884d1a039b 100644
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -22,6 +22,7 @@
 #include "LyXRC.h"
 
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lassert.h"
@@ -56,22 +57,22 @@ bool Language::isBabelExclusive() const
 }
 
 
-docstring const Language::translateLayout(string const & m) const
+docstring const Language::translateLayout(string const & msg) const
 {
-	if (m.empty())
+	if (msg.empty())
 		return docstring();
 
-	if (!isAscii(m)) {
-		lyxerr << "Warning: not translating `" << m
+	if (!isAscii(msg)) {
+		lyxerr << "Warning: not translating `" << msg
 		       << "' because it is not pure ASCII.\n";
-		return from_utf8(m);
+		return from_utf8(msg);
 	}
 
-	TranslationMap::const_iterator it = layoutTranslations_.find(m);
+	TranslationMap::const_iterator it = layoutTranslations_.find(msg);
 	if (it != layoutTranslations_.end())
 		return it->second;
 
-	docstring t = from_ascii(m);
+	docstring t = from_ascii(msg);
 	cleanTranslation(t);
 	return t;
 }
@@ -88,7 +89,7 @@ string Language::fontenc(BufferParams const & params) const
 	// We check whether the used rm font supports an encoding our language supports
 	LaTeXFont const & lf =
 		theLaTeXFonts().getLaTeXFont(from_ascii(params.fontsRoman()));
-	vector<string> const lfe = lf.fontencs();
+	vector<string> const & lfe = lf.fontencs();
 	for (auto & fe : fontenc_) {
 		// ASCII means: support all T* encodings plus OT1
 		if (fe == "ASCII") {