Languages::readLayoutTranslations() clarify and un-indent loop.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39298 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Language.cpp b/src/Language.cpp
index 85fb383993addf03dbe6bb5301b62f032ca10820..a7845f51d32a4f42f4242bf370d11be546cad839 100644 (file)
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -325,22 +325,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 +349,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,