From 2db7d5cc23658b59e307d825ca031639f0bb76cc Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 21 Mar 2020 23:01:49 +0100 Subject: Revert "core: use set_lang_locale to modify prefs.locale.lang_locale" This reverts commit 573a4a5e2da9531fbaa9e82da57131edc691a851. The commit broke setting the language in the desktop preferences: Instead of setting the locale in the prefs struct, the locale is set via qPrefLanguage. However, that saves the default language (extracted from the system) to disk. Now when the language is read from the preferences, we get that default value. Signed-off-by: Berthold Stoeger --- core/qthelper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core') diff --git a/core/qthelper.cpp b/core/qthelper.cpp index 05612a4ce..564d4394f 100644 --- a/core/qthelper.cpp +++ b/core/qthelper.cpp @@ -471,7 +471,7 @@ QString uiLanguage(QLocale *callerLoc) else uiLang = languages[0]; - qPrefLanguage::set_lang_locale(uiLang); + prefs.locale.lang_locale = copy_qstring(uiLang); // there's a stupid Qt bug on MacOS where uiLanguages doesn't give us the country info if (!uiLang.contains('-') && uiLang != loc.bcp47Name()) { -- cgit v1.2.3-70-g09d2