From 1cc7c6b4cff1489c29b82dc9f0f6fe6a7948ade1 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sat, 23 Mar 2019 08:37:57 -0400 Subject: [PATCH] Translation Request: Make marketplace received translatable --- indra/newview/llviewermessage.cpp | 11 +++++++++++ indra/newview/skins/default/xui/en-us/strings.xml | 3 +++ 2 files changed, 14 insertions(+) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 68fe354d7..36406cdbc 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2241,6 +2241,7 @@ void autoresponder_finish(bool show_autoresponded, const LLUUID& session_id, con } } +#include const std::string NOT_ONLINE_MSG("User not online - message will be stored and delivered later."); const std::string NOT_ONLINE_INVENTORY("User not online - inventory has been saved."); void translate_if_needed(std::string& message) @@ -2253,6 +2254,16 @@ void translate_if_needed(std::string& message) { message = LLTrans::getString("not_online_inventory"); } + else if (boost::algorithm::ends_with(message, "Received Items folder.")) + { + boost::smatch match; + const boost::regex gift_exp("^You've received a gift! (.*) has given you \\\"(.*)\\\", and says \\\"(.*)\\\"\\. You can find your gift in your Received Items folder\\.$"); + bool gift = boost::regex_match(message, match, gift_exp); + if (gift || boost::regex_match(message, match, boost::regex("^Your purchase of (.*) has been delivered to your Received Items folder\\.$"))) + message = LLTrans::getString(gift ? "ReceivedGift" : "ReceivedPurchase", + gift ? LLSD().with("USER", match[1].str()).with("PRODUCT", match[2].str()).with("MESSAGE", match[3].str()) + : LLSD().with("PRODUCT", match[1].str())); + } } void process_improved_im(LLMessageSystem *msg, void **user_data) diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml index 634d5c761..a49437dcb 100644 --- a/indra/newview/skins/default/xui/en-us/strings.xml +++ b/indra/newview/skins/default/xui/en-us/strings.xml @@ -4237,6 +4237,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. User not online - message will be stored and delivered later. User not online - inventory has been saved. + You've received a gift! [USER] has given you "[PRODUCT]", and says "[MESSAGE]". You can find your gift in your Received Items folder. + Your purchase of [PRODUCT] has been delivered to your Received Items folder. +