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

[locale] Be more chatty when loading locales

Browse Source
This commit is contained in:
Adriaan de Groot 2022-06-19 14:17:12 +02:00
parent ed5149c17f
commit b8b7b10bfd
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@
static QStringList static QStringList
loadLocales( const QString& localeGenPath ) loadLocales( const QString& localeGenPath )
{ {
Logger::Once o;
QStringList localeGenLines; QStringList localeGenLines;
// Some distros come with a meaningfully commented and easy to parse locale.gen, // Some distros come with a meaningfully commented and easy to parse locale.gen,
@ -52,6 +53,7 @@ loadLocales( const QString& localeGenPath )
if ( supported.exists() && supported.open( QIODevice::ReadOnly | QIODevice::Text ) ) if ( supported.exists() && supported.open( QIODevice::ReadOnly | QIODevice::Text ) )
{ {
cDebug() << o << "Loading locales from" << supported.fileName();
ba = supported.readAll(); ba = supported.readAll();
supported.close(); supported.close();
@ -66,6 +68,7 @@ loadLocales( const QString& localeGenPath )
QFile localeGen( localeGenPath ); QFile localeGen( localeGenPath );
if ( localeGen.open( QIODevice::ReadOnly | QIODevice::Text ) ) if ( localeGen.open( QIODevice::ReadOnly | QIODevice::Text ) )
{ {
cDebug() << o << "Loading locales from" << localeGenPath;
ba = localeGen.readAll(); ba = localeGen.readAll();
localeGen.close(); localeGen.close();
} }
@ -115,6 +118,10 @@ loadLocales( const QString& localeGenPath )
<< "* a complete pre-compiled locale-gen database which allows complete locale -a output."; << "* a complete pre-compiled locale-gen database which allows complete locale -a output.";
return localeGenLines; // something went wrong and there's nothing we can do about it. return localeGenLines; // something went wrong and there's nothing we can do about it.
} }
else
{
cDebug() << o << "Read" << localeGenLines.length() << "lines";
}
// Assuming we have a list of supported locales, we usually only want UTF-8 ones // Assuming we have a list of supported locales, we usually only want UTF-8 ones
// because it's not 1995. // because it's not 1995.
@ -134,6 +141,7 @@ loadLocales( const QString& localeGenPath )
s = s.simplified(); s = s.simplified();
}; };
std::for_each( localeGenLines.begin(), localeGenLines.end(), unredundant ); std::for_each( localeGenLines.begin(), localeGenLines.end(), unredundant );
cDebug() << o << "After filtering" << localeGenLines.length() << "lines";
return localeGenLines; return localeGenLines;
} }