Stephan Witt wrote:
> Should I revert the id() part of my last change then?
No. What I mean is: doesn't somethong like the attached, simpler solution work
equally well?
Jürgen
Index: src/HunspellChecker.cpp
===================================================================
--- src/HunspellChecker.cpp (Revision 37725)
+++ src/HunspellChecker.cpp (Arbeitskopie)
@@ -139,19 +139,13 @@
}
LYXERR(Debug::FILES, "check hunspell path: " << hpath << " for language " << lang);
- string h_path = addName(hpath, lang->code() + "-" + lang->variety());
- // first we try lang code+variety
- if (!lang->variety().empty() && haveLanguageFiles(h_path)) {
- hpath = h_path;
- return true;
- }
- // next we try lang code only
- h_path = addName(hpath, lang->code());
+ string h_path = addName(hpath, lang->id());
+ // first we try lang code [+ variety]
if (haveLanguageFiles(h_path)) {
hpath = h_path;
return true;
}
- // last try with '_' replaced by '-'
+ // try with '_' replaced by '-'
h_path = addName(hpath, subst(lang->code(), '_', '-'));
if (!haveLanguageFiles(h_path)) {
return false;
