Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 19:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[General]Default to English when a resource is not found (#31614)

Browse Source
This commit is contained in:
Jaime Bernardo
2024-02-28 14:32:42 +00:00
committed by GitHub
parent e5795efb4f
commit eeedbc7982
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actions/spell-check/expect.txt vendored
View File

@@ -839,6 +839,7 @@ lwin
LZero LZero
majortype majortype
makecab makecab
MAKELANGID
MAKEINTRESOURCE MAKEINTRESOURCE
MAKEINTRESOURCEA MAKEINTRESOURCEA
MAKEINTRESOURCEW MAKEINTRESOURCEW

16
src/common/utils/resources.h
View File

@@ -2,6 +2,7 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#include <string> #include <string>
#include <atlstr.h>
// Get a string from the resource file // Get a string from the resource file
inline std::wstring get_resource_string(UINT resource_id, HINSTANCE instance, const wchar_t* fallback) inline std::wstring get_resource_string(UINT resource_id, HINSTANCE instance, const wchar_t* fallback)
@@ -9,9 +10,24 @@ inline std::wstring get_resource_string(UINT resource_id, HINSTANCE instance, co
wchar_t* text_ptr; wchar_t* text_ptr;
auto length = LoadStringW(instance, resource_id, reinterpret_cast<wchar_t*>(&text_ptr), 0); auto length = LoadStringW(instance, resource_id, reinterpret_cast<wchar_t*>(&text_ptr), 0);
if (length == 0) if (length == 0)
{
// Try to load en-us string as the first fallback.
WORD english_language = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US);
ATL::CStringW english_string;
try
{
if (!english_string.LoadStringW(instance, resource_id, english_language))
{ {
return fallback; return fallback;
} }
}
catch (...)
{
return fallback;
}
return std::wstring(english_string);
}
else else
{ {
return { text_ptr, static_cast<std::size_t>(length) }; return { text_ptr, static_cast<std::size_t>(length) };