merge

Author: Maplespe

DWMBlurGlass/Helper/Helper.cpp

@@ -87,14 +87,20 @@ namespace MDWMBlurGlass
 		return str;
 	}
 
-	std::wstring GetSystemLocalName()
+	std::pair<std::wstring, std::wstring> GetSystemLocaleAndParent()
 	{
 		WCHAR langName[LOCALE_NAME_MAX_LENGTH];
-		if (GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SNAME, langName, LOCALE_NAME_MAX_LENGTH)) 
+		if (GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SNAME, langName, LOCALE_NAME_MAX_LENGTH))
 		{
-			return langName;
+			std::wstring locale = langName;
+			auto pos = locale.find(L'-');
+			if (pos != std::wstring::npos)
+			{
+				return { locale, std::wstring(locale.substr(0, pos)) };
+			}
+			return { locale, locale };
 		}
-		return L"en-US";
+		return { L"en-US", L"en" };
 	}
 
 	std::wstring hrToStr(HRESULT hr)

DWMBlurGlass/Helper/Helper.h

@@ -26,7 +26,7 @@ namespace MDWMBlurGlass
 
 	extern std::wstring ReadFileSting(std::wstring_view filePath);
 
-	extern std::wstring GetSystemLocalName();
+	extern std::pair<std::wstring, std::wstring> GetSystemLocaleAndParent();
 
 	extern bool InstallScheduledTasks(std::wstring& errinfo);
 

DWMBlurGlass/MainWindow.cpp

@@ -38,13 +38,19 @@ namespace MDWMBlurGlass
 		if (!LoadDefualtUIStyle(ui))
 			return false;
 
-		if (!LoadLanguageString(ui, GetSystemLocalName(), true))
+		auto [locale, parentLocale] = GetSystemLocaleAndParent();
+		if (!LoadLanguageString(ui, locale, true))
 		{
-			if (!LoadLanguageString(ui, L"en-US", true))
-				return false;
+			if (!LoadLanguageString(ui, parentLocale, true))
+			{
+				if (!LoadLanguageString(ui, L"en-US", true))
+					return false;
+			}
 		}
-		else if(GetSystemLocalName() != L"en-US")
+		else if (locale != L"en-US")
+		{
 			LoadLanguageString(ui, L"en-US", true, false);
+		}
 
 		const HWND hWnd = (HWND)ctx->Base()->GetWindowHandle();
 		//SetWindowLongW(hWnd, GWL_STYLE, GetWindowLongW(hWnd, GWL_STYLE) & ~(WS_MAXIMIZEBOX | WS_SIZEBOX));