napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'calamares' of https://github.com/calamares/calamares into development

Browse Source
This commit is contained in:
Philip Müller 2021-04-13 22:19:34 +02:00
commit 9c30ebfed2
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -36,7 +36,8 @@ This release contains contributions from (alphabetically by first name):
This is **another** hotfix release for issues around autologin .. This is **another** hotfix release for issues around autologin ..
autoLogin, really, since the whole problem is that internal capitalization autoLogin, really, since the whole problem is that internal capitalization
changed. (Reported by pcrepix, #1668) changed. An unrelated bug in writing /etc/default/keyboard was
also fixed. (Reported by pcrepix, #1668)
# 3.2.39.1 (2021-03-30) # # 3.2.39.1 (2021-03-30) #

2
lang/python/de/LC_MESSAGES/python.po
View File

@ -5,7 +5,7 @@
# #
# Translators: # Translators:
# Adriaan de Groot <groot@kde.org>, 2020 # Adriaan de Groot <groot@kde.org>, 2020
# Christian Spaan, 2020 # Gustav Gyges, 2020
# Andreas Eitel <github-aneitel@online.de>, 2020 # Andreas Eitel <github-aneitel@online.de>, 2020
# #
#, fuzzy #, fuzzy

14
src/modules/locale/Config.cpp
View File

@ -259,8 +259,7 @@ Config::setCurrentLocation( const CalamaresUtils::Locale::TimeZoneData* location
auto newLocale = automaticLocaleConfiguration(); auto newLocale = automaticLocaleConfiguration();
if ( !m_selectedLocaleConfiguration.explicit_lang ) if ( !m_selectedLocaleConfiguration.explicit_lang )
{ {
m_selectedLocaleConfiguration.setLanguage( newLocale.language() ); setLanguage( newLocale.language() );
emit currentLanguageStatusChanged( currentLanguageStatus() );
} }
if ( !m_selectedLocaleConfiguration.explicit_lc ) if ( !m_selectedLocaleConfiguration.explicit_lc )
{ {
@ -302,11 +301,20 @@ Config::localeConfiguration() const
void void
Config::setLanguageExplicitly( const QString& language ) Config::setLanguageExplicitly( const QString& language )
{ {
m_selectedLocaleConfiguration.setLanguage( language );
m_selectedLocaleConfiguration.explicit_lang = true; m_selectedLocaleConfiguration.explicit_lang = true;
setLanguage( language );
}
void
Config::setLanguage( const QString& language )
{
if ( language != m_selectedLocaleConfiguration.language() )
{
m_selectedLocaleConfiguration.setLanguage( language );
emit currentLanguageStatusChanged( currentLanguageStatus() ); emit currentLanguageStatusChanged( currentLanguageStatus() );
emit currentLanguageCodeChanged( currentLanguageCode() ); emit currentLanguageCodeChanged( currentLanguageCode() );
}
} }
void void

2
src/modules/locale/Config.h
View File

@ -95,6 +95,8 @@ private:
} }
public Q_SLOTS: public Q_SLOTS:
/// Set the language, but do not mark it as user-choice
void setLanguage( const QString& language );
/// Set a language by user-choice, overriding future location changes /// Set a language by user-choice, overriding future location changes
void setLanguageExplicitly( const QString& language ); void setLanguageExplicitly( const QString& language );
/// Set LC (formats) by user-choice, overriding future location changes /// Set LC (formats) by user-choice, overriding future location changes