summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gavriliuk <alexandrgproductengine@lindenlab.com>2024-03-22 20:50:33 +0100
committerGuru <alexandrgproductengine@lindenlab.com>2024-03-25 12:32:29 +0100
commit6e9cccedb504bfa325b0fa30088d69db1ee80dc8 (patch)
tree165924883a99b3a82fea36621b44b3716b819fab
parent007d92b50e51c185d55d6bbff39910056b3e7d18 (diff)
triage#112 'No emoji found for' text is not translated to other languages in the 'Choose Emoji' floater
-rw-r--r--indra/newview/llfloateremojipicker.cpp10
-rw-r--r--indra/newview/skins/default/xui/en/floater_emoji_picker.xml1
2 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index d08c27bcfc..1fc5740532 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -40,6 +40,7 @@
#include "llscrolllistitem.h"
#include "llsdserialize.h"
#include "lltextbox.h"
+#include "lltrans.h"
#include "llviewerchat.h"
namespace {
@@ -388,9 +389,12 @@ void LLFloaterEmojiPicker::initialize()
}
else
{
- const std::string prompt("No emoji found for ");
- std::string title(prompt + '"' + mFilterPattern.substr(1) + '"');
- mPreview->setData(EMPTY_LIST_IMAGE_INDEX, title, prompt.size() + 1, title.size() - 1);
+ std::size_t begin, end;
+ LLStringUtil::format_map_t args;
+ args["[FILTER]"] = mFilterPattern.substr(1);
+ std::string title(getString("text_no_emoji_for_filter", args));
+ LLEmojiDictionary::searchInShortCode(begin, end, title, mFilterPattern);
+ mPreview->setData(EMPTY_LIST_IMAGE_INDEX, title, begin, end);
showPreview(true);
}
return;
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index d21f8c82bc..e4b8f13df7 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -15,6 +15,7 @@
width="304">
<floater.string name="title_for_recently_used" value="Recently used"/>
<floater.string name="title_for_frequently_used" value="Frequently used"/>
+ <floater.string name="text_no_emoji_for_filter" value="No emoji found for '[FILTER]'"/>
<scroll_container
name="EmojiGridContainer"
layout="topleft"