diff --git a/indra/llui/lltrans.cpp b/indra/llui/lltrans.cpp index b36e185d1..8fb40e5d6 100644 --- a/indra/llui/lltrans.cpp +++ b/indra/llui/lltrans.cpp @@ -113,3 +113,7 @@ std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil:: } } +void LLTrans::setDefaultArg(const std::string& name, const std::string& value) +{ + sDefaultArgs[name] = value; +} diff --git a/indra/llui/lltrans.h b/indra/llui/lltrans.h index bea94d9c8..432a12b1d 100644 --- a/indra/llui/lltrans.h +++ b/indra/llui/lltrans.h @@ -85,6 +85,7 @@ public: return getString(xml_desc, empty); } + static void setDefaultArg(const std::string& name, const std::string& value); private: typedef std::map template_map_t; diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp index 09689d087..c2705bbf7 100644 --- a/indra/llwindow/llwindowcallbacks.cpp +++ b/indra/llwindow/llwindowcallbacks.cpp @@ -187,3 +187,14 @@ void LLWindowCallbacks::handleResumeWatchdog(LLWindow *window) } +std::string LLWindowCallbacks::translateString(const char* tag) +{ + return std::string(); +} + +//virtual +std::string LLWindowCallbacks::translateString(const char* tag, + const std::map& args) +{ + return std::string(); +} diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6d12b371c..cc2eed924 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -377,6 +377,7 @@ void init_default_trans_args() default_trans_args.insert("CAPITALIZED_APP_NAME"); default_trans_args.insert("SECOND_LIFE_GRID"); default_trans_args.insert("SUPPORT_SITE"); + default_trans_args.insert("CURRENCY"); } //---------------------------------------------------------------------------- diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 03b6cfffa..6ef1c9b9c 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -990,7 +990,8 @@ bool idle_startup() } gHippoGridManager->setCurrentGridAsConnected(); - gHippoLimits->setLimits(); + gHippoLimits->setLimits(); + LLTrans::setDefaultArg("CURRENCY",gHippoGridManager->getConnectedGrid()->getCurrencySymbol()); //replace [CURRENCY] with OS$, not L$ for instance. // create necessary directories // *FIX: these mkdir's should error check diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml index c9b7a8d09..1969cd4a5 100644 --- a/indra/newview/skins/default/xui/en-us/strings.xml +++ b/indra/newview/skins/default/xui/en-us/strings.xml @@ -5,6 +5,7 @@ that are returned from one component and may appear in many places--> + L$ free week diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index bdde1edd9..d09341db5 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -4,6 +4,7 @@ For example, the strings used in avatar chat bubbles, and strings that are returned from one component and may appear in many places--> + L$ Second Life