mirror of
https://github.com/vcmi/vcmi.git
synced 2025-06-17 00:07:41 +02:00
Removed H3 language detection - should be set by Launcher
This commit is contained in:
@ -164,9 +164,6 @@ void CGeneralTextHandler::detectInstallParameters() const
|
|||||||
for (size_t i = 0; i < deviations.size(); ++i)
|
for (size_t i = 0; i < deviations.size(); ++i)
|
||||||
logGlobal->debug("Comparing to %s: %f", knownFootprints[i].language, deviations[i]);
|
logGlobal->debug("Comparing to %s: %f", knownFootprints[i].language, deviations[i]);
|
||||||
|
|
||||||
Settings language = settings.write["session"]["language"];
|
|
||||||
language->String() = knownFootprints[bestIndex].language;
|
|
||||||
|
|
||||||
Settings encoding = settings.write["session"]["encoding"];
|
Settings encoding = settings.write["session"]["encoding"];
|
||||||
encoding->String() = knownFootprints[bestIndex].encoding;
|
encoding->String() = knownFootprints[bestIndex].encoding;
|
||||||
}
|
}
|
||||||
@ -658,10 +655,7 @@ size_t CGeneralTextHandler::getCampaignLength(size_t campaignID) const
|
|||||||
|
|
||||||
std::string CGeneralTextHandler::getInstalledLanguage()
|
std::string CGeneralTextHandler::getInstalledLanguage()
|
||||||
{
|
{
|
||||||
auto explicitSetting = settings["general"]["language"].String();
|
return settings["general"]["language"].String();
|
||||||
if (explicitSetting != "auto")
|
|
||||||
return explicitSetting;
|
|
||||||
return settings["session"]["language"].String();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string CGeneralTextHandler::getInstalledEncoding()
|
std::string CGeneralTextHandler::getInstalledEncoding()
|
||||||
|
Reference in New Issue
Block a user