#4723 Fix emoji warnings and missing emojis
parent
351b7763a8
commit
8976d69dba
|
|
@ -390,14 +390,17 @@ void LLEmojiDictionary::loadEmojis()
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::string category;
|
||||||
std::list<std::string> categories = loadCategories(sd);
|
std::list<std::string> categories = loadCategories(sd);
|
||||||
if (categories.empty())
|
if (categories.empty())
|
||||||
{
|
{
|
||||||
LL_WARNS() << "Skipping invalid emoji descriptor (no categories)" << LL_ENDL;
|
// Should already have a localization for "other symbols"
|
||||||
continue;
|
category = "other symbols";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
category = categories.front();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string category = categories.front();
|
|
||||||
|
|
||||||
if (std::find(mSkipCategories.begin(), mSkipCategories.end(), category) != mSkipCategories.end())
|
if (std::find(mSkipCategories.begin(), mSkipCategories.end(), category) != mSkipCategories.end())
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue