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

SL-19951 EmojiPicker - preserve original character case for German categories

master
Alexander Gavriliuk 2023-09-08 12:19:21 +02:00
parent c30208d598
commit 29a3295c82
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/llui/llemojidictionary.cpp
View File

@ -204,8 +204,7 @@ void LLEmojiDictionary::loadTranslations()
{
const LLSD& sd = *it;
const std::string& name = sd["Name"].asStringRef();
std::string category = sd["Category"].asString();
LLStringUtil::toLower(category);
const std::string& category = sd["Category"].asStringRef();
if (!name.empty() && !category.empty())
{
mTranslations[name] = category;
@ -373,22 +372,17 @@ llwchar LLEmojiDictionary::loadIcon(const LLSD& sd)
return (1 == icon.size()) ? icon[0] : L'\0';
}
static inline std::list<std::string> loadStrings(const LLSD& sd, const std::string key)
{
auto toLower = [](std::string& str) { LLStringUtil::toLower(str); };
return llsd_array_to_list<std::string>(sd[key], toLower);
}
std::list<std::string> LLEmojiDictionary::loadCategories(const LLSD& sd)
{
static const std::string categoriesKey("Categories");
return loadStrings(sd, categoriesKey);
static const std::string key("Categories");
return llsd_array_to_list<std::string>(sd[key]);
}
std::list<std::string> LLEmojiDictionary::loadShortCodes(const LLSD& sd)
{
static const std::string shortCodesKey("ShortCodes");
return loadStrings(sd, shortCodesKey);
static const std::string key("ShortCodes");
auto toLower = [](std::string& str) { LLStringUtil::toLower(str); };
return llsd_array_to_list<std::string>(sd[key], toLower);
}
void LLEmojiDictionary::translateCategories(std::list<std::string>& categories)

2
indra/newview/llfloateremojipicker.cpp
View File

@ -461,7 +461,7 @@ void LLFloaterEmojiPicker::fillEmojis(bool fromResize)
bool showDivider = true;
bool mixedFolder = maxRows;
LLEmojiGridRow* row = nullptr;
if (!mixedFolder)
if (!mixedFolder && !isupper(category.front()))
{
LLStringUtil::capitalize(category);
}