OSDN Git Service

OptionsInit.cpp: sf.net Patch #2954 Set default language to System Language ID
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 16 Mar 2019 00:23:03 +0000 (09:23 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sat, 16 Mar 2019 00:23:03 +0000 (09:23 +0900)
Src/OptionsInit.cpp

index c1e45c0..2b8d8ea 100644 (file)
@@ -42,16 +42,7 @@ void Init(COptionsMgr *pOptions)
        static_cast<CRegOptionsMgr *>(pOptions)->SetRegRootKey(_T("Thingamahoochie\\WinMerge\\"));
 
        LANGID LangId = GetUserDefaultLangID();
-       if (PRIMARYLANGID(LangId) == LANG_JAPANESE)
-       {
-               // Default language to Japanese unless installer set it otherwise
-               pOptions->InitOption(OPT_SELECTED_LANGUAGE, 0x411);
-       }
-       else
-       {
-               // Default language to English unless installer set it otherwise
-               pOptions->InitOption(OPT_SELECTED_LANGUAGE, 0x409);
-       }
+       pOptions->InitOption(OPT_SELECTED_LANGUAGE, static_cast<int>(LangId));
 
        // Initialise options (name, default value)
        pOptions->InitOption(OPT_SHOW_UNIQUE_LEFT, true);