merge

Author: Maplespe

DWMBlurGlass/winmain.cpp

@@ -40,8 +40,10 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 		return 0;
 #endif
 
+	auto [locale, parentLocale] = MDWMBlurGlass::GetSystemLocaleAndParent();
+
 	if (!MDWMBlurGlass::LoadLanguageFileList() 
-		|| (!MDWMBlurGlass::LoadBaseLanguageString(MDWMBlurGlass::GetSystemLocalName())
+		|| (!MDWMBlurGlass::LoadBaseLanguageString(locale) && !MDWMBlurGlass::LoadBaseLanguageString(parentLocale)
 		&& !MDWMBlurGlass::LoadBaseLanguageString(L"en-US")))
 	{
 		MessageBoxW(nullptr, L"初始化失败: 没有有效的语言文件 (Initialization failed: No valid language file).", L"error", MB_ICONERROR);
@@ -58,7 +60,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 		{
 			MessageBoxW(nullptr,
 				Helper::M_ReplaceString(MDWMBlurGlass::GetBaseLanguageString(L"initfail0"), L"{path}", curpath).c_str(),
-				L"waring", MB_ICONWARNING | MB_TOPMOST);
+				L"Warning", MB_ICONWARNING | MB_TOPMOST);
 			return false;
 		}
 	}
@@ -129,4 +131,4 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	engine.UnInitEngine();
 
 	return 0;
-}
+}