Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Cleanup localization behaviour

Browse Source
develop
kaetemi 4 years ago
parent 2a7bf997b9
commit d238d2122b
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

32
ryzom/client/src/connection.cpp
Unescape Escape View File

@ -1021,7 +1021,7 @@ TInterfaceState globalMenu()
// Display the firewall alert string // Display the firewall alert string
CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:outgame:connecting:title")); CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:outgame:connecting:title"));
if (pVT != NULL) if (pVT != NULL)
pVT->setText(CI18N::get("uiFirewallAlert") + "..."); pVT->setTextLocalized("uiFirewallAlert", true);
// The mouse and fullscreen mode should be unlocked for the user to set the firewall permission // The mouse and fullscreen mode should be unlocked for the user to set the firewall permission
nlSleep( 30 ); // 'nice' the client, and prevent to make too many send attempts nlSleep( 30 ); // 'nice' the client, and prevent to make too many send attempts
@ -1237,8 +1237,8 @@ TInterfaceState globalMenu()
if (pVT != NULL) if (pVT != NULL)
{ {
pVT->setMultiLine( true ); pVT->setMultiLine( true );
pVT->setText(CI18N::get("uiFirewallFail")+".\n"+ pVT->setTextLocalized(CI18N::get("uiFirewallFail")+".\n"+
CI18N::get("uiFirewallAlert")+"."); CI18N::get("uiFirewallAlert")+".", false);
} }
} }
} }
@ -1319,16 +1319,16 @@ public:
if (pVT == NULL) return; if (pVT == NULL) return;
if (rCS.Name.empty()) if (rCS.Name.empty())
pVT->setText(CI18N::get("uiEmptySlot")); pVT->setTextLocalized("uiEmptySlot", true);
else else
pVT->setText(rCS.Name.toUtf8()); pVT->setTextLocalized(rCS.Name.toUtf8(), false);
} }
// 5 slots // 5 slots
for (; i < 5; ++i) for (; i < 5; ++i)
{ {
CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(sPath+":text"+NLMISC::toString(i))); CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId(sPath+":text"+NLMISC::toString(i)));
if (pVT == NULL) return; if (pVT == NULL) return;
pVT->setText(CI18N::get("uiEmptySlot")); pVT->setTextLocalized("uiEmptySlot", true);
} }
} }
}; };
@ -2171,7 +2171,7 @@ public:
if (pVT != NULL) if (pVT != NULL)
{ {
std::string str = Mainlands[i].Name.toUtf8() + " " + Mainlands[i].Description.toUtf8(); std::string str = Mainlands[i].Name.toUtf8() + " " + Mainlands[i].Description.toUtf8();
pVT->setText(str); pVT->setTextLocalized(str, false);
} }
// Add to the list // Add to the list
@ -2311,7 +2311,7 @@ public:
CViewText *pVT = dynamic_cast<CViewText*>(pNewLine->getView("name")); CViewText *pVT = dynamic_cast<CViewText*>(pNewLine->getView("name"));
if (pVT != NULL) if (pVT != NULL)
{ {
pVT->setText(name.toUtf8()); pVT->setTextLocalized(name.toUtf8(), false);
} }
CCtrlBase *pBut = pNewLine->getCtrl("but"); CCtrlBase *pBut = pNewLine->getCtrl("but");
@ -2559,7 +2559,7 @@ static void setTextField(CInterfaceGroup* scenarioWnd, const std::string &uiName
{ {
CViewText* viewText = dynamic_cast<CViewText*>(result); CViewText* viewText = dynamic_cast<CViewText*>(result);
if(viewText) if(viewText)
viewText->setText(text.toUtf8()); viewText->setTextLocalized(text.toUtf8(), false);
CGroupEditBox* editBox = dynamic_cast<CGroupEditBox*>(result); CGroupEditBox* editBox = dynamic_cast<CGroupEditBox*>(result);
if(editBox) if(editBox)
editBox->setInputStringAsUtf16(text); editBox->setInputStringAsUtf16(text);
@ -2682,7 +2682,7 @@ class CAHScenarioControl : public IActionHandler
CViewText* viewText = dynamic_cast<CViewText*>(result); CViewText* viewText = dynamic_cast<CViewText*>(result);
if(viewText) if(viewText)
{ {
viewText->setText(R2::getEditor().isInitialized()?CI18N::get("uiR2EDScenarioName"):CI18N::get("uiR2EDScenarioFileName")); viewText->setTextLocalized(R2::getEditor().isInitialized() ? "uiR2EDScenarioName" : "uiR2EDScenarioFileName", true);
} }
} }
@ -2712,7 +2712,7 @@ class CAHScenarioControl : public IActionHandler
CViewText* viewText= dynamic_cast<CViewText*>(result); CViewText* viewText= dynamic_cast<CViewText*>(result);
if(viewText) if(viewText)
viewText->setText(""); viewText->setText(std::string());
} }
} }
setScenarioInformation(scenarioWnd, ""); setScenarioInformation(scenarioWnd, "");
@ -2748,7 +2748,7 @@ class CAHScenarioControl : public IActionHandler
CViewText *shardName = dynamic_cast<CViewText *>(toggleGr->getView("button_text")); CViewText *shardName = dynamic_cast<CViewText *>(toggleGr->getView("button_text"));
if (shardName) if (shardName)
{ {
shardName->setText(Mainlands[i].Name.toUtf8()); shardName->setTextLocalized(Mainlands[i].Name.toUtf8(), false);
} }
} }
} }
@ -2888,7 +2888,7 @@ class CAHScenarioInformation : public IActionHandler
scenarioName = scenarioName.substr(posScenarioName==0?posScenarioName:posScenarioName+1); scenarioName = scenarioName.substr(posScenarioName==0?posScenarioName:posScenarioName+1);
posScenarioName = scenarioName.find('/'); posScenarioName = scenarioName.find('/');
} }
viewText->setText(scenarioName); viewText->setTextLocalized(scenarioName, false);
} }
} }
@ -3250,7 +3250,7 @@ class CAHLoadScenario : public IActionHandler
{ {
CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text")); CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
if (pVT != NULL) if (pVT != NULL)
pVT->setText(CI18N::get("uiRingWarningFreeTrial")); pVT->setTextLocalized("uiRingWarningFreeTrial", true);
CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial"); CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
return; return;
@ -3331,7 +3331,7 @@ class CAHLoadScenario : public IActionHandler
{ {
CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text")); CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
if (pVT != NULL) if (pVT != NULL)
pVT->setText(CI18N::get("uiRingWarningFreeTrial")); pVT->setTextLocalized("uiRingWarningFreeTrial", true);
CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial"); CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
} }
@ -3360,7 +3360,7 @@ class CAHLoadScenario : public IActionHandler
{ {
CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text")); CViewText* pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:interface:warning_free_trial:text"));
if (pVT != NULL) if (pVT != NULL)
pVT->setText(CI18N::get("uiRingWarningInviteFreeTrial")); pVT->setTextLocalized("uiRingWarningInviteFreeTrial", true);
CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial"); CAHManager::getInstance()->runActionHandler("enter_modal", pCaller, "group=ui:interface:warning_free_trial");
} }
} }

Write Preview
Loading…
Cancel
Save