Skip to content

Commit

Permalink
check was way too high :)
Browse files Browse the repository at this point in the history
needed be below ConfigOptLoad()
  • Loading branch information
Dazzar56 committed Dec 22, 2024
1 parent e45fb4a commit 38e1a9f
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions far2l/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -608,18 +608,6 @@ int FarAppMain(int argc, char **argv)
KbLayoutsTrIn = KeyboardLayouts->GetString(LangCode, "Latin");
KbLayoutsTrOut = KeyboardLayouts->GetString(LangCode, "Local");

bool cfgNeedSave = false;
//нужно проверить локаль до начала отрисовки интерфейса
if (Opt.IsFirstStart)
{
// Only Russian translation can be currently considered complete
if (IsLocaleMatches(locale, "ru_RU")) {
Opt.strLanguage = L"Russian";
Opt.strHelpLanguage = L"Russian";
cfgNeedSave = true;
}
}

// Настройка OEM сортировки. Должна быть после CopyGlobalSettings и перед InitKeysArray!
// LocalUpperInit();
// InitLCIDSort();
Expand All @@ -644,6 +632,18 @@ int FarAppMain(int argc, char **argv)
InitConsole();
WINPORT(SetConsoleCursorBlinkTime)(NULL, Opt.CursorBlinkTime);

bool cfgNeedSave = false;
//нужно проверить локаль до начала отрисовки интерфейса
if (Opt.IsFirstStart)
{
// Only Russian translation can be currently considered complete
if (IsLocaleMatches(locale, "ru_RU")) {
Opt.strLanguage = L"Russian";
Opt.strHelpLanguage = L"Russian";
cfgNeedSave = true;
}
}

static_assert(!IsPtr(Msg::NewFileName._id),
"Too many language messages. Need to refactor code to eliminate use of IsPtr.");

Expand Down

0 comments on commit 38e1a9f

Please sign in to comment.