mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-05 12:15:36 +00:00
Merge branch 'reload_l10n' into 'master'
Console command `reloadlua` also reloads l10n used by Lua scripts See merge request OpenMW/openmw!1984
This commit is contained in:
commit
ee89eccb06
2 changed files with 2 additions and 0 deletions
|
@ -503,6 +503,7 @@ namespace MWLua
|
||||||
MWBase::Environment::get().getWindowManager()->setConsoleMode("");
|
MWBase::Environment::get().getWindowManager()->setConsoleMode("");
|
||||||
mUiResourceManager.clear();
|
mUiResourceManager.clear();
|
||||||
mLua.dropScriptCache();
|
mLua.dropScriptCache();
|
||||||
|
mL10n.clear();
|
||||||
initConfiguration();
|
initConfiguration();
|
||||||
|
|
||||||
{ // Reload global scripts
|
{ // Reload global scripts
|
||||||
|
|
|
@ -13,6 +13,7 @@ namespace LuaUtil
|
||||||
public:
|
public:
|
||||||
L10nManager(const VFS::Manager* vfs, LuaState* lua) : mVFS(vfs), mLua(lua) {}
|
L10nManager(const VFS::Manager* vfs, LuaState* lua) : mVFS(vfs), mLua(lua) {}
|
||||||
void init();
|
void init();
|
||||||
|
void clear() { mContexts.clear(); }
|
||||||
|
|
||||||
void setPreferredLocales(const std::vector<std::string>& locales);
|
void setPreferredLocales(const std::vector<std::string>& locales);
|
||||||
const std::vector<icu::Locale>& getPreferredLocales() const { return mPreferredLocales; }
|
const std::vector<icu::Locale>& getPreferredLocales() const { return mPreferredLocales; }
|
||||||
|
|
Loading…
Reference in a new issue