games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Move text string to translations.json

Browse Source
This commit is contained in:
nordsoft 2022-09-22 20:06:14 +04:00
parent c2f5628fc5
commit 7de4d94aff
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/CServerHandler.cpp
View File

@ -163,11 +163,12 @@ void CServerHandler::startLocalServerAndConnect()
th->update(); th->update();
auto errorMsg = CGI->generaltexth->localizedTexts["server"]["errors"]["existingProcess"].String();
try try
{ {
CConnection testConnection(settings["server"]["server"].String(), getDefaultPort(), NAME, uuid); CConnection testConnection(settings["server"]["server"].String(), getDefaultPort(), NAME, uuid);
logNetwork->error("Port is busy, kill other vcmiserver processes"); logNetwork->error("Port is busy, check if another instance of vcmiserver is working");
CInfoWindow::showInfoDialog("Port is busy, kill other vcmiserver processes", CInfoWindow::TCompsInfo(), PlayerColor(1)); CInfoWindow::showInfoDialog(errorMsg, {});
return; return;
} }
catch(...) catch(...)

31
config/translate.json
View File

@ -23,6 +23,13 @@
}, },
"playerAttacked" : "Player has been attacked: %s" "playerAttacked" : "Player has been attacked: %s"
}, },
"server" :
{
"errors" :
{
"existingProcess" : "Another vcmiserver process is running, please terminate it first"
}
},
"systemOptions" : "systemOptions" :
{ {
"fullscreenButton" : "fullscreenButton" :
@ -62,18 +69,18 @@
"allOf" : "All of the following:", "allOf" : "All of the following:",
"noneOf" : "None of the following:" "noneOf" : "None of the following:"
}, },
"heroWindow": "heroWindow" :
{ {
"openCommander": "openCommander" :
{ {
"label": "Open commander window", "label" : "Open commander window",
"help": "Displays information about commander of this hero" "help" : "Displays information about commander of this hero"
} }
}, },
"commanderWindow": "commanderWindow":
{ {
"artifactMessage": "Do you want to give this artifact back to hero?" "artifactMessage": "Do you want to give this artifact back to hero?"
}, },
"creatureWindow" : "creatureWindow" :
{ {
"showBonuses" : "showBonuses" :