From cb5825a521b2be9c078c9eb3544b925126d573db Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 19 Apr 2019 13:52:19 +0200 Subject: [PATCH] [libcalamares] English label with country --- src/libcalamares/utils/LocaleLabel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcalamares/utils/LocaleLabel.cpp b/src/libcalamares/utils/LocaleLabel.cpp index 275ece622..26480ef14 100644 --- a/src/libcalamares/utils/LocaleLabel.cpp +++ b/src/libcalamares/utils/LocaleLabel.cpp @@ -26,7 +26,7 @@ LocaleLabel::LocaleLabel() : m_locale( QLocale() ) { m_localeId = m_locale.name(); - + setLabels( QString(), LabelFormat::IfNeededWithCountry ); } @@ -55,8 +55,8 @@ LocaleLabel::setLabels( const QString& locale, LabelFormat format ) if ( needsCountryName ) countryName = m_locale.nativeCountryName(); - m_label = needsCountryName ? longFormat.arg( languageName ).arg( countryName ) : languageName; - m_englishLabel = englishName; + m_label = needsCountryName ? longFormat.arg( languageName, countryName ) : languageName; + m_englishLabel = needsCountryName ? longFormat.arg( englishName, QLocale::countryToString( m_locale.country() ) ) : englishName; } QLocale LocaleLabel::getLocale( const QString& localeName )