Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 22837 → Rev 22838

/trunk/Scribus/scribus/langmgr.cpp
1035,31 → 1035,31
dictList.replaceInStrings(".dic","");
 
//Ensure we have aff+dic file pairs, remove any hyphenation dictionaries from the list
 
foreach(const QString& dictName, dictList)
for (const QString& dictName : qAsConst(dictList))
{
if (!QFile::exists(dictionaryPaths.at(i)+dictName+".aff"))
if (!QFile::exists(dictionaryPaths.at(i) + dictName + ".aff"))
{
dictList.removeAll(dictName);
else
continue;
}
if (dictionaryMap.contains(dictName))
continue;
 
if (dictName.length()<=5)
{
if (!dictionaryMap.contains(dictName))
{
if (dictName.length()<=5)
{
//QString shortAbbrev(LanguageManager::getShortAbbrevFromAbbrev(dictName));
//qDebug()<<"findSpellingDictionarySets"<<dictName<<shortAbbrev;
dictionaryMap.insert(dictName, dictionaryPaths.at(i)+dictName);
//dictionaryMap.insert(shortAbbrev, dictionaryPaths.at(i)+dictName);
}
//qDebug()<<"Spell Finder:"<<dictName<<dictionaryPaths.at(i)+dictName;
if (dictName.length()>5)
{
QString shortAbbrev(LanguageManager::getShortAbbrevFromAbbrev(dictName));
//qDebug()<<shortAbbrev;
dictionaryMap.insert(shortAbbrev, dictionaryPaths.at(i)+dictName);
}
}
//QString shortAbbrev(LanguageManager::getShortAbbrevFromAbbrev(dictName));
//qDebug()<<"findSpellingDictionarySets"<<dictName<<shortAbbrev;
dictionaryMap.insert(dictName, dictionaryPaths.at(i)+dictName);
//dictionaryMap.insert(shortAbbrev, dictionaryPaths.at(i)+dictName);
}
//qDebug()<<"Spell Finder:"<<dictName<<dictionaryPaths.at(i)+dictName;
if (dictName.length()>5)
{
QString shortAbbrev(LanguageManager::getShortAbbrevFromAbbrev(dictName));
//qDebug()<<shortAbbrev;
dictionaryMap.insert(shortAbbrev, dictionaryPaths.at(i)+dictName);
}
}
// qDebug()<<"Number of dictionaries/AFFs found in"<<dictionaryPaths.at(i)<<":"<<dictList.count();
}
1108,29 → 1108,29
QDir dictLocation(dictionaryPaths.at(i));
QStringList dictFilters("hyph*.dic");
if (dictionaryPaths.at(i)==ScPaths::userDictDir(ScPaths::Hyph, false))
dictFilters.append("*.dic");
dictFilters.append("*.dic");
QStringList dictList(dictLocation.entryList(dictFilters, QDir::Files, QDir::Name));
dictList.replaceInStrings(".dic","");
foreach(const QString& dn, dictList)
 
for (const QString& dn : qAsConst(dictList))
{
// qDebug()<<dn;
QString dictName;
if (dn.startsWith("hyph_"))
dictName=dn.section('_',1);
dictName = dn.section('_',1);
else
dictName=dn;
if (!dictionaryMap.contains(dictName))
dictName = dn;
if (dictionaryMap.contains(dictName))
continue;
if (dictName.length()<=2)
{
if (dictName.length()<=2)
{
dictionaryMap.insert(dictName, dictionaryPaths.at(i)+dn+".dic");
}
if (dictName.length()>2)
{
QString shortAbbrev(LanguageManager::getShortAbbrevFromAbbrev(dictName));
dictionaryMap.insert(shortAbbrev, dictionaryPaths.at(i)+dn+".dic");
}
dictionaryMap.insert(dictName, dictionaryPaths.at(i)+dn+".dic");
}
if (dictName.length()>2)
{
QString shortAbbrev(LanguageManager::getShortAbbrevFromAbbrev(dictName));
dictionaryMap.insert(shortAbbrev, dictionaryPaths.at(i)+dn+".dic");
}
}
}
}