From c8f8c69ddeea6684ca6c83461654077acb8dd69f Mon Sep 17 00:00:00 2001 From: Nippy Date: Thu, 4 Jun 2026 20:16:01 +0200 Subject: calamares: theme v26, module v4 - UI fixes and language propagation fix - stylesheet: disabled button dark grey, about button deep green, button alignment fix - branding: icon changed to raveos-icon2.png - ravewelcome: fix language selection propagating to installed system locale (localeConf.LANG) --- raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'raveos-calamares-module/welcome') diff --git a/raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp b/raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp index 28d3895..617c8c9 100644 --- a/raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp +++ b/raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp @@ -140,12 +140,20 @@ void RaveWelcomeViewStep::onLanguageChanged(int index) Calamares::Locale::Translation::Id tid { localeId }; Calamares::installTranslator(tid, brandingTranslationsPrefix()); - // Store locale in GlobalStorage for the installed system + // Store locale in GlobalStorage for the installed system. + // The locale module reads gs["localeConf"]["LANG"] via Calamares::Locale::readGS. if (Calamares::JobQueue::instance()) { Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); if (gs) - gs->insert("localeLanguage", localeId); + { + QString fullLocale = QLocale(localeId).name(); // e.g. "hu" -> "hu_HU" + if (!fullLocale.contains('.')) + fullLocale += ".UTF-8"; + QVariantMap localeConf = gs->value("localeConf").toMap(); + localeConf.insert("LANG", fullLocale); + gs->insert("localeConf", localeConf); + } } } -- cgit v1.3