From e54e9b4eed615f98f1e1fd167178b6d75c3fda43 Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Wed, 11 May 2011 17:36:11 -0700 Subject: WIP: viewer side of ER-864: Include message ids and args in login.cgi responses * Look for message_id and message_args in XMLRPC response, look up localized string in strings.xml * Support sub-maps in XMLRPC response conversion to LLSD * Explicitly request extended error info during login (since including sub-maps breaks older viewers) * Support LLSD-based substitutions in LLTrans::getString/findString --- indra/llxuixml/lltrans.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/llxuixml/lltrans.h') diff --git a/indra/llxuixml/lltrans.h b/indra/llxuixml/lltrans.h index 5b127b53cf..63f7d431d3 100644 --- a/indra/llxuixml/lltrans.h +++ b/indra/llxuixml/lltrans.h @@ -32,6 +32,8 @@ #include "llstring.h" #include "llxmlnode.h" +class LLSD; + /** * @brief String template loaded from strings.xml */ @@ -72,7 +74,9 @@ public: * @returns Translated string */ static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args); + static std::string getString(const std::string &xml_desc, const LLSD& args); static bool findString(std::string &result, const std::string &xml_desc, const LLStringUtil::format_map_t& args); + static bool findString(std::string &result, const std::string &xml_desc, const LLSD& args); // Returns translated string with [COUNT] replaced with a number, following // special per-language logic for plural nouns. For example, some languages -- cgit v1.2.3