From 38e1a9f5cd2cb0c9f587768a814116e05e36643d Mon Sep 17 00:00:00 2001 From: Dazzar56 Date: Mon, 23 Dec 2024 01:35:15 +0300 Subject: [PATCH] check was way too high :) needed be below ConfigOptLoad() --- far2l/src/main.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/far2l/src/main.cpp b/far2l/src/main.cpp index f17345145..2c4ff2acc 100644 --- a/far2l/src/main.cpp +++ b/far2l/src/main.cpp @@ -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(); @@ -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.");