From d96ddbb8a76bfff39d231c17a40de6bf8b42b886 Mon Sep 17 00:00:00 2001 From: philmoz Date: Sun, 4 Jan 2026 09:09:34 +1100 Subject: [PATCH] fix(color): Lua scripts do not see selected language when using ALL_LANGS build (#6937) --- radio/src/lua/api_general.cpp | 8 ++++++++ radio/src/lua/lua_widget_factory.cpp | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp index 66259cb97..ad11251ce 100644 --- a/radio/src/lua/api_general.cpp +++ b/radio/src/lua/api_general.cpp @@ -1758,7 +1758,15 @@ static int luaGetGeneralSettings(lua_State * L) lua_pushtablenumber(L, "battMin", (90+g_eeGeneral.vBatMin) * 0.1f); lua_pushtablenumber(L, "battMax", (120+g_eeGeneral.vBatMax) * 0.1f); lua_pushtableinteger(L, "imperial", g_eeGeneral.imperial); +#if defined(ALL_LANGS) + char l[3]; + l[0] = toupper(g_eeGeneral.ttsLanguage[0]); + l[1] = toupper(g_eeGeneral.ttsLanguage[1]); + l[2] = 0; + lua_pushtablestring(L, "language", l); +#else lua_pushtablestring(L, "language", TRANSLATIONS); +#endif lua_pushtablestring(L, "voice", currentLanguagePack->id); lua_pushtableinteger(L, "gtimer", g_eeGeneral.globalTimer); return 1; diff --git a/radio/src/lua/lua_widget_factory.cpp b/radio/src/lua/lua_widget_factory.cpp index 547bce708..d67929436 100644 --- a/radio/src/lua/lua_widget_factory.cpp +++ b/radio/src/lua/lua_widget_factory.cpp @@ -110,7 +110,14 @@ void LuaWidgetFactory::translateOptions(WidgetOption * options) // No translations provided if (!translateFunction) return; - auto lang = TRANSLATIONS; +#if defined(ALL_LANGS) + char lang[3]; + lang[0] = toupper(g_eeGeneral.ttsLanguage[0]); + lang[1] = toupper(g_eeGeneral.ttsLanguage[1]); + lang[2] = 0; +#else + char* lang = TRANSLATIONS; +#endif auto option = options; while (option && option->name != nullptr) {