Typo.

[lyx.git] / src / Language.cpp

diff --git a/src/Language.cpp b/src/Language.cpp
index 85fb383993addf03dbe6bb5301b62f032ca10820..cbe425d3b9dcc6a3a092e03a5ef4c74652282c2b 100644 (file)
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -53,7 +53,9 @@ docstring const Language::translateLayout(string const & m) const
        if (it != layoutTranslations_.end())
                return it->second;
 
-       return from_ascii(m);
+       docstring t = from_ascii(m);
+       cleanTranslation(t);
+       return t;
 }
 
 
@@ -325,22 +327,22 @@ void Languages::readLayoutTranslations(support::FileName const & filename)
                if (!lex.next(true))
                        break;
                string const code = lex.getString();
-               bool readit = false;
+               bool found = false;
                for (LanguageList::iterator lit = lbeg; lit != lend; ++lit) {
                        if (match(code, lit->second) != NoMatch) {
-                               if (readTranslations(lex, trans[code]))
-                                       readit = true;
-                               else
-                                       lex.printError("Could not read layout "
-                                                      "translations for language "
-                                                      "`" + code + "'");
+                               found = true;
                                break;
                        }
                }
-               if (!readit) {
+               if (!found) {
                        lex.printError("Unknown language `" + code + "'");
                        break;
                }
+               if (!readTranslations(lex, trans[code])) {
+                       lex.printError("Could not read layout translations for language `"
+                               + code + "'");
+                       break;
+               }
        }
 
        // 2) merge all translations into the languages
@@ -349,7 +351,7 @@ void Languages::readLayoutTranslations(support::FileName const & filename)
        TransMap::const_iterator const tend = trans.end();
        for (TransMap::const_iterator tit = tbeg; tit != tend; ++tit) {
                for (LanguageList::iterator lit = lbeg; lit != lend; ++lit) {
-                       Match m = match(tit->first, lit->second);
+                       Match const m = match(tit->first, lit->second);
                        if (m == NoMatch)
                                continue;
                        lit->second.readLayoutTranslations(tit->second,