livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-1889: require all fields when importing spelling dictionary

master
Oz Linden 2012-06-20 21:52:42 -04:00
parent 8ef14ffb29
commit 5dceb6b06c
2 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
indra/newview/llfloaterspellchecksettings.cpp
View File

@ -294,47 +294,53 @@ void LLFloaterSpellCheckerImport::onBtnOK()
const std::string dict_aff = mDictionaryDir + gDirUtilp->getDirDelimiter() + mDictionaryBasename + ".aff";
std::string dict_language = getChild<LLUICtrl>("dictionary_language")->getValue().asString();
LLStringUtil::trim(dict_language);
if ( (dict_language.empty()) || (!gDirUtilp->fileExists(dict_dic)) ||
(mDictionaryDir.empty()) || (mDictionaryBasename.empty()) )
{
return;
}
bool imported = false;
std::string settings_dic = LLSpellChecker::getDictionaryUserPath() + mDictionaryBasename + ".dic";
if ( copyFile( dict_dic, settings_dic ) )
if ( dict_language.empty()
|| mDictionaryDir.empty()
|| mDictionaryBasename.empty()
|| ! gDirUtilp->fileExists(dict_dic)
)
{
if (gDirUtilp->fileExists(dict_aff))
LLNotificationsUtil::add("SpellingDictImportRequired");
}
else
{
std::string settings_dic = LLSpellChecker::getDictionaryUserPath() + mDictionaryBasename + ".dic";
if ( copyFile( dict_dic, settings_dic ) )
{
std::string settings_aff = LLSpellChecker::getDictionaryUserPath() + mDictionaryBasename + ".aff";
if (copyFile( dict_aff, settings_aff ))
if (gDirUtilp->fileExists(dict_aff))
{
imported = true;
std::string settings_aff = LLSpellChecker::getDictionaryUserPath() + mDictionaryBasename + ".aff";
if (copyFile( dict_aff, settings_aff ))
{
imported = true;
}
else
{
LLSD args = LLSD::emptyMap();
args["FROM_NAME"] = dict_aff;
args["TO_NAME"] = settings_aff;
LLNotificationsUtil::add("SpellingDictImportFailed", args);
}
}
else
{
LLSD args = LLSD::emptyMap();
args["FROM_NAME"] = dict_aff;
args["TO_NAME"] = settings_aff;
LLNotificationsUtil::add("SpellingDictImportFailed", args);
args["DIC_NAME"] = dict_dic;
LLNotificationsUtil::add("SpellingDictIsSecondary", args);
imported = true;
}
}
else
{
LLSD args = LLSD::emptyMap();
args["DIC_NAME"] = dict_dic;
LLNotificationsUtil::add("SpellingDictIsSecondary", args);
imported = true;
args["FROM_NAME"] = dict_dic;
args["TO_NAME"] = settings_dic;
LLNotificationsUtil::add("SpellingDictImportFailed", args);
}
}
else
{
LLSD args = LLSD::emptyMap();
args["FROM_NAME"] = dict_dic;
args["TO_NAME"] = settings_dic;
LLNotificationsUtil::add("SpellingDictImportFailed", args);
}
if ( imported )
{

8
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -2396,6 +2396,14 @@ Would you be my friend?
<tag>fail</tag>
</notification>
<notification
icon="alertmodal.tga"
name="SpellingDictImportRequired"
type="alertmodal">
You must specify a file, a name, and a language.
<tag>fail</tag>
</notification>
<notification
icon="alertmodal.tga"
name="SpellingDictIsSecondary"