mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 16:20:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'l10n_validate' into 'master'

Browse Source 
Validate l10n context name

See merge request OpenMW/openmw!1910
This commit is contained in:
jvoisin 2022-05-23 20:19:55 +00:00
commit 7df5e7f62a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/lua/l10n.cpp
View File

@ -122,6 +122,16 @@ namespace LuaUtil
auto it = mContexts.find(contextName); auto it = mContexts.find(contextName);
if (it != mContexts.end()) if (it != mContexts.end())
return sol::make_object(mLua->sol(), it->second); return sol::make_object(mLua->sol(), it->second);
auto allowedChar = [](char c)
{
return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') ||
(c >= '0' && c <= '9') || c == '_';
};
bool valid = !contextName.empty();
for (char c : contextName)
valid = valid && allowedChar(c);
if (!valid)
throw std::runtime_error(std::string("Invalid l10n context name: ") + contextName);
icu::Locale fallbackLocale(fallbackLocaleName.c_str()); icu::Locale fallbackLocale(fallbackLocaleName.c_str());
Context ctx{contextName, std::make_shared<l10n::MessageBundles>(mPreferredLocales, fallbackLocale)}; Context ctx{contextName, std::make_shared<l10n::MessageBundles>(mPreferredLocales, fallbackLocale)};
{ {