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

[locale] Remove unused localegen (moved to Config earlier)

Browse Source
This commit is contained in:
Adriaan de Groot 2020-07-20 18:13:33 +02:00
parent f0cac7d669
commit 8c21b59853
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/locale/LocaleViewStep.cpp
View File

@ -201,12 +201,6 @@ LocaleViewStep::setConfigurationMap( const QVariantMap& configurationMap )
= CalamaresUtils::GeoIP::RegionZonePair( QStringLiteral( "America" ), QStringLiteral( "New_York" ) ); = CalamaresUtils::GeoIP::RegionZonePair( QStringLiteral( "America" ), QStringLiteral( "New_York" ) );
} }
m_localeGenPath = CalamaresUtils::getString( configurationMap, "localeGenPath" );
if ( m_localeGenPath.isEmpty() )
{
m_localeGenPath = QStringLiteral( "/etc/locale.gen" );
}
bool ok = false; bool ok = false;
QVariantMap geoip = CalamaresUtils::getSubMap( configurationMap, "geoip", ok ); QVariantMap geoip = CalamaresUtils::getSubMap( configurationMap, "geoip", ok );
if ( ok ) if ( ok )

5
src/modules/locale/LocaleViewStep.h
View File

@ -72,10 +72,9 @@ private:
bool m_nextEnabled; bool m_nextEnabled;
QString m_prettyStatus; QString m_prettyStatus;
CalamaresUtils::GeoIP::RegionZonePair m_startingTimezone;
QString m_localeGenPath;
Calamares::JobList m_jobs; Calamares::JobList m_jobs;
CalamaresUtils::GeoIP::RegionZonePair m_startingTimezone;
std::unique_ptr< CalamaresUtils::GeoIP::Handler > m_geoip; std::unique_ptr< CalamaresUtils::GeoIP::Handler > m_geoip;
std::unique_ptr< Config > m_config; std::unique_ptr< Config > m_config;