From 22050467f5ec42b30e98d7bd59dd0ca617b259e4 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Tue, 30 Jan 2018 17:45:04 +0200 Subject: MAINT-8180 Add the way to get default string despite of current localiztion --- indra/llui/lltrans.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'indra/llui/lltrans.h') diff --git a/indra/llui/lltrans.h b/indra/llui/lltrans.h index a47ce94f08..bdffc75f4f 100644 --- a/indra/llui/lltrans.h +++ b/indra/llui/lltrans.h @@ -76,8 +76,10 @@ public: * @param args A list of substrings to replace in the string * @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 std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args, bool def_string = false); + static std::string getDefString(const std::string &xml_desc, const LLStringUtil::format_map_t& args); + static std::string getString(const std::string &xml_desc, const LLSD& args, bool def_string = false); + static std::string getDefString(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); @@ -92,7 +94,7 @@ public: * @param xml_desc String's description * @returns Translated string */ - static std::string getString(const std::string &xml_desc) + static std::string getString(const std::string &xml_desc, bool def_string = false) { LLStringUtil::format_map_t empty; return getString(xml_desc, empty); @@ -128,6 +130,7 @@ public: private: typedef std::map template_map_t; static template_map_t sStringTemplates; + static template_map_t LLTrans::sDefaultStringTemplates; static LLStringUtil::format_map_t sDefaultArgs; }; -- cgit v1.2.3 From 25e19c0e6f1d6dfc21f3c1695e0d6bfcec6a8ee9 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 31 Jan 2018 12:13:07 +0200 Subject: build fix --- indra/llui/lltrans.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llui/lltrans.h') diff --git a/indra/llui/lltrans.h b/indra/llui/lltrans.h index bdffc75f4f..9bd751fc78 100644 --- a/indra/llui/lltrans.h +++ b/indra/llui/lltrans.h @@ -130,7 +130,7 @@ public: private: typedef std::map template_map_t; static template_map_t sStringTemplates; - static template_map_t LLTrans::sDefaultStringTemplates; + static template_map_t sDefaultStringTemplates; static LLStringUtil::format_map_t sDefaultArgs; }; -- cgit v1.2.3