Merge branch 'translation-settings-improvements' into yubo

code/ryzom/client/src/interface_v3/chat_text_manager.cpp

@@ -424,30 +424,33 @@ CViewBase *CChatTextManager::createMsgTextComplex(const ucstring &msg, NLMISC::C
 
 	ucstring::size_type pos = 0;
 
-	// Manage Translations
-	CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TRANSLATION_ONLY_AS_TOOLTIP_CB", false);
-	bool originalFirst = node->getValueBool();
-
 	string::size_type startTr = msg.find(ucstring("{:"));
 	string::size_type endOfOriginal = msg.find(ucstring("}@{"));
 
 	// Original/Translated case, example: {:enHello the world!}@{ Bonjour le monde !
 	if (startTr != string::npos && endOfOriginal != string::npos)
 	{
+		string lang = toUpper(msg.substr(startTr+2, 2)).toString();
+		
+		CCDBNodeLeaf *nodeInverse = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:TRANSLATION:" + lang + ":INVERSE_DISPLAY", false);
+		bool inverse = nodeInverse->getValueBool();
+		CCDBNodeLeaf *nodeHideFlag = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:TRANSLATION:" + lang + ":HIDE_FLAG", false);
+		bool hideFlag = nodeHideFlag->getValueBool();
+		
 		CViewBase *vt = createMsgTextSimple(msg.substr(0, startTr), col, justified, NULL);
 		para->addChild(vt);
 
 		string texture = "flag-"+toLower(msg.substr(startTr+2, 2)).toString()+".tga";
 		ucstring original = msg.substr(startTr+5, endOfOriginal-startTr-5);
-		ucstring translation = msg.substr(endOfOriginal+3);
+		ucstring translation = msg.substr(endOfOriginal+4);
 		CCtrlButton *ctrlButton = new CCtrlButton(CViewBase::TCtorParam());
 		ctrlButton->setTexture(texture);
 		ctrlButton->setTextureOver(texture);
 		ctrlButton->setTexturePushed(texture);
-		if (!originalFirst)
+		if (!inverse)
 		{
 		  ctrlButton->setDefaultContextHelp(original);
-		  pos = endOfOriginal+3;
+		  pos = endOfOriginal+4;
 		}
 		else
 		{
@@ -456,8 +459,12 @@ CViewBase *CChatTextManager::createMsgTextComplex(const ucstring &msg, NLMISC::C
 		  textSize = endOfOriginal;
 		}
 		ctrlButton->setId("tr");
+		if (hideFlag) {
+		  delete ctrlButton;
+		} else {
 		  para->addChild(ctrlButton);
 		}
+	}
 
 	// quickly check if text has links or not
 	bool hasUrl;

code/ryzom/client/src/interface_v3/chat_window.cpp

@@ -216,7 +216,23 @@ void CChatWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGr
 
 	gl = dynamic_cast<CGroupList *>(_Chat->getGroup("cb:text_list"));
 
-	CViewBase *child = ctm.createMsgText(msg, col);
+	
+
+	CCDBNodeLeaf *nodeNoTranslation = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:TRANSLATION:" + toUpper(CChatGroup::groupTypeToString(gt)) + ":DISABLE", false);
+	bool noTranslation = nodeNoTranslation->getValueBool();
+
+	ucstring msgNoTranslate = msg;
+
+	if (noTranslation) {
+		string::size_type startTr = msg.find(ucstring("{:"));
+		string::size_type endOfOriginal = msg.find(ucstring("}@{"));
+
+		if (startTr != string::npos && endOfOriginal != string::npos) {
+			msgNoTranslate = msg.substr(0, startTr) + msg.substr(startTr+5, endOfOriginal-startTr-5);
+		}
+	}
+	
+	CViewBase *child = ctm.createMsgText(msgNoTranslate, col);
 	if (child)
 	{
 		if (gl)	gl->addChild(child);
@@ -568,6 +584,18 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 	ucstring newmsg = msg;
 	ucstring prefix;
 
+	CCDBNodeLeaf *nodeNoTranslation = NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:TRANSLATION:" + toUpper(CChatGroup::groupTypeToString(gt)) + ":DISABLE", false);
+	bool noTranslation = nodeNoTranslation->getValueBool();
+
+	if (noTranslation) {
+		string::size_type startTr = msg.find(ucstring("{:"));
+		string::size_type endOfOriginal = msg.find(ucstring("}@{"));
+
+		if (startTr != string::npos && endOfOriginal != string::npos) {
+			newmsg = newmsg.substr(0, startTr) + newmsg.substr(startTr+5, endOfOriginal-startTr-5);
+		}
+	}
+
 	CViewBase *child = NULL;
 	if (gl != NULL)
 	{

code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp

@@ -875,16 +875,19 @@ void CGroupInSceneBubbleManager::chatOpen (uint32 nUID, const ucstring &ucsText,
 
 
 	// Clean bubble from translation system
-	CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TRANSLATION_ONLY_AS_TOOLTIP_CB", false);
-	bool originalFirst = node->getValueBool();
 
 	ucstring::size_type pos = 0;
 	ucstring::size_type textSize = ucsText.size();
 	string::size_type startTr = ucsText.find(ucstring("{:"));
 	string::size_type endOfOriginal = ucsText.find(ucstring("}@{"));
+
+	string lang = toUpper(ucsText.substr(startTr+2, 2)).toString();
+	CCDBNodeLeaf	*node= NLGUI::CDBManager::getInstance()->getDbProp("UI:SAVE:TRANSLATION:" + lang + ":INVERSE_DISPLAY", false);
+	bool inverse = node->getValueBool();
+
 	if (endOfOriginal != string::npos)
 	{
-		if (!originalFirst)
+		if (!inverse)
 		{
 			pos = endOfOriginal+4;
 		}