diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-03-02 18:54:37 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-03-02 18:54:37 +0200 |
| commit | 27ac50b1a1a7d5ceb2ece1851a9e9eb69f53a3c1 (patch) | |
| tree | e0e0fe162cb2aeb1121c0ffb408bbe04fd88bfc6 /indra/newview | |
| parent | ca37311987f038a153030a45da503d2162a18be6 (diff) | |
Work on normal sub-task EXT-5886 ([HARD CODED] - System message "Teleport completed from" needs translation)
- moved hard coded string into teleport_strings.xml (name="completed_from")
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/teleport_strings.xml | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ae31c9732c..361f4e2326 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3115,8 +3115,12 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) { // Chat the "back" SLURL. (DEV-4907) + LLSD substitution = LLSD().with("[T_SLURL]", gAgent.getTeleportSourceSLURL()); + std::string completed_from = LLAgent::sTeleportProgressMessages["completed_from"]; + LLStringUtil::format(completed_from, substitution); + LLSD args; - args["MESSAGE"] = "Teleport completed from " + gAgent.getTeleportSourceSLURL(); + args["MESSAGE"] = completed_from; LLNotificationsUtil::add("SystemMessageTip", args); // Set the new position diff --git a/indra/newview/skins/default/xui/en/teleport_strings.xml b/indra/newview/skins/default/xui/en/teleport_strings.xml index e8f6b1319a..bae821d3b5 100644 --- a/indra/newview/skins/default/xui/en/teleport_strings.xml +++ b/indra/newview/skins/default/xui/en/teleport_strings.xml @@ -61,6 +61,9 @@ Try again in a moment. <message name="completing"> Completing teleport. </message> + <message name="completed_from"> + Teleport completed from [T_SLURL] + </message> <message name="resolving"> Resolving destination. </message> |