Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

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;
+}

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<std::string, LLTransTemplate > template_map_t;

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<std::string, std::string>& args)
+{
+	return std::string();
+}

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");
 }
 
 //----------------------------------------------------------------------------

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

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-->
 <strings>
 
+	<string name="CURRENCY">L$</string>
 	<string name="hippo_label_free">free</string>
 	<string name="hippo_label_week">week</string>
 	<string name="TeleportOfferMaturity">

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-->
 <strings>
+	<string name="CURRENCY">L$</string>
 	<string name="SECOND_LIFE">
 		Second Life
 	</string>