Fix algorithm for finding localized files

Now we search in priority with the GUI language, and then the
language(s) specified in the LANGUAGES environment variable.
Preoviously, the GUI language would only be considered when
LANGUAGES was not set (which was a bug).

Take this opportunity to remove old compatibility code from 2007.

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index 028eedf91aef95b6ccc56534dd173d911274660e..7a2739bda1cc60bce104c908674452274aa3e346 100644 (file)
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -356,25 +356,20 @@ FileName const libFileSearch(string const & dir, string const & name,
 FileName const i18nLibFileSearch(string const & dir, string const & name,
                  string const & ext)
 {
-       /* The highest priority value is the `LANGUAGE' environment
-          variable. But we don't use the value if the currently
-          selected locale is the C locale. This is a GNU extension.
-
-          Otherwise, w use a trick to guess what support/gettext.has done:
-          each po file is able to tell us its name. (JMarc)
-       */
-
+       // if the LANGUAGE variable is set, use it as a fallback for searching for files.
        string lang = getGuiMessages().language();
        string const language = getEnv("LANGUAGE");
-       if (!lang.empty() && !language.empty())
-               lang = language;
+       if (!language.empty())
+               lang += ":" + language;
 
-       string l;
-       lang = split(lang, l, ':');
-       while (!l.empty()) {
+       for (auto const & l : getVectorFromString(lang, ":")) {
                FileName tmp;
                // First try with the full name
-               tmp = libFileSearch(addPath(dir, l), name, ext);
+               // `en' files are not in a subdirectory
+               if (l == "en")
+                       tmp = libFileSearch(dir, name, ext);
+               else
+                       tmp = libFileSearch(addPath(dir, l), name, ext);
                if (!tmp.empty())
                        return tmp;
 
@@ -385,18 +380,6 @@ FileName const i18nLibFileSearch(string const & dir, string const & name,
                        if (!tmp.empty())
                                return tmp;
                }
-
-#if 1
-               // For compatibility, to be removed later (JMarc)
-               tmp = libFileSearch(dir, token(l, '_', 0) + '_' + name,
-                                   ext);
-               if (!tmp.empty()) {
-                       lyxerr << "i18nLibFileSearch: File `" << tmp
-                              << "' has been found by the old method" <<endl;
-                       return tmp;
-               }
-#endif
-               lang = split(lang, l, ':');
        }
 
        return libFileSearch(dir, name, ext);