Skip to content
This repository was archived by the owner on Oct 4, 2022. It is now read-only.

Localization init fix to take CVar into account #450

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Localization init fix to take CVar into account #450

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
80366fd
Bugfix: Peer can not activate netsynced entities after disconnecting …
CDufour909 Nov 7, 2018
890fb85
Update dev/Code/CryEngine/CryPhysics/utils.cpp
CDufour909 Nov 11, 2018
4bffe45
Revert "Bugfix: Peer can not activate netsynced entities after discon…
CDufour909 Nov 11, 2018
ebbd0e8
Merge branch 'master' of https://github.com/CDufour909/lumberyard
CDufour909 Sep 9, 2019
0253141
Merge pull request #1 from aws/master
CDufour909 Oct 1, 2019
cb9fd08
Merge pull request #2 from aws/master
CDufour909 Oct 25, 2019
948b9a4
Merge pull request #3 from aws/master
CDufour909 Nov 12, 2019
615a27f
Added CVar Check in InitLocalization
CDufour909 Dec 11, 2019
8810a01
Update utils.cpp
CDufour909 Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions dev/Code/CryEngine/CrySystem/SystemInit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3258,6 +3258,22 @@ void CSystem::InitLocalization()
}

string language = m_pLocalizationManager->LangNameFromPILID(languageID);

//Check if language was set in settings or user.cfg
pCVar = m_env.pConsole != 0 ? m_env.pConsole->GetCVar("g_language") : 0;
if (pCVar)
{
string languageInCvar = pCVar->GetString();
if (m_pLocalizationManager->PILIDFromLangName(languageInCvar.c_str()) != ILocalizationManager::EPlatformIndependentLanguageID::ePILID_MAX_OR_INVALID)
{
language = languageInCvar; //Language was set and valid so we use that one
}
else
{
pCVar->Set(language); //Language is invalid, set default in CVar
}
}

m_pLocalizationManager->SetLanguage(language.c_str());
if (m_pLocalizationManager->GetLocalizationFormat() == 1)
{
Expand Down