X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fintl.C;h=ff1162d2a0f0a338b586486ab53b45114b80b752;hb=2734cc154853c61a7ea54bfeea3adc908f68bdc5;hp=1efd0d60e7b34541b05fa48594fe1e9d34341fdf;hpb=cf4293824f406c03e940bed6bf7274b57629a857;p=lyx.git

diff --git a/src/intl.C b/src/intl.C
index 1efd0d60e7..ff1162d2a0 100644
--- a/src/intl.C
+++ b/src/intl.C
@@ -18,6 +18,9 @@
 #include "lyxrc.h"
 
 
+namespace lyx {
+
+
 using std::endl;
 
 
@@ -77,6 +80,12 @@ void Intl::initKeyMapper(bool on)
 {
 	lyxerr[Debug::INIT] << "Initializing key mappings..." << endl;
 
+	if (trans.setPrimary(prim_lang) == -1)
+		prim_lang.erase();
+	if (trans.setSecondary(sec_lang) == -1)
+		sec_lang.erase();
+	trans.setCharset(lyxrc.font_norm);
+
 	if (prim_lang.empty() && sec_lang.empty())
 		keymapon = false;
 	else
@@ -86,8 +95,7 @@ void Intl::initKeyMapper(bool on)
 
 	if (keymapon)
 		keyMapPrim();
-
-	trans.setPrimary(prim_lang);
-	trans.setSecondary(sec_lang);
-	trans.setCharset(lyxrc.font_norm);
 }
+
+
+} // namespace lyx