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

SL-19951 Organize emoji categories in groups (fix for German)

master
Alexander Gavriliuk 2023-09-08 01:02:06 +02:00
parent d8cc5688ef
commit c30208d598
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/llemojidictionary.cpp
View File

@ -204,7 +204,8 @@ void LLEmojiDictionary::loadTranslations()
{
const LLSD& sd = *it;
const std::string& name = sd["Name"].asStringRef();
const std::string& category = sd["Category"].asStringRef();
std::string category = sd["Category"].asString();
LLStringUtil::toLower(category);
if (!name.empty() && !category.empty())
{
mTranslations[name] = category;

6
indra/newview/llfloateremojipicker.cpp
View File

@ -534,10 +534,9 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
for (const LLEmojiGroup& group : groups)
{
// List all categories in group
for (std::string category : group.Categories)
for (const std::string& category : group.Categories)
{
// List all emojis in category
LLStringUtil::toLower(category);
const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(category);
if (item != category2Descr.end())
{
@ -549,10 +548,9 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
else
{
// List all categories in the selected group
for (std::string category : groups[sSelectedGroupIndex].Categories)
for (const std::string& category : groups[sSelectedGroupIndex].Categories)
{
// List all emojis in category
LLStringUtil::toLower(category);
const LLEmojiDictionary::cat2descrs_map_t::const_iterator& item = category2Descr.find(category);
if (item != category2Descr.end())
{