diff options
| author | Joshua Bell <josh@lindenlab.com> | 2011-05-11 17:36:11 -0700 |
|---|---|---|
| committer | Joshua Bell <josh@lindenlab.com> | 2011-05-11 17:36:11 -0700 |
| commit | e54e9b4eed615f98f1e1fd167178b6d75c3fda43 (patch) | |
| tree | 8b5fae60b5d1cb9123fd86ad99cb9184545cfc13 /indra/llxuixml/lltrans.h | |
| parent | a5118ccd6721afdf4f8c71cba6007eb7be4d7c19 (diff) | |
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
Diffstat (limited to 'indra/llxuixml/lltrans.h')
| -rw-r--r-- | indra/llxuixml/lltrans.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 |