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

Logging: format the multi-line warning about no-supported-languages

Browse Source
This commit is contained in:
Adriaan de Groot 2017-06-04 17:47:19 -04:00 committed by Philip
parent 7195054bfd
commit 06739955bb
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/locale/LocalePage.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014-2016, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2016, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, Adriaan de Groot <groot@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -348,14 +349,16 @@ LocalePage::init( const QString& initialRegion,
if ( m_localeGenLines.isEmpty() ) if ( m_localeGenLines.isEmpty() )
{ {
cDebug() << "WARNING: cannot acquire a list of available locales." cDebug() << "WARNING: cannot acquire a list of available locales."
<< "The locale and localecfg modules will be broken as long as this " << "The locale and localecfg modules will be broken as long as this "
"system does not provide" "system does not provide"
<< " * a /usr/share/i18n/SUPPORTED file" << "\n\t "
<< "\tOR" << "* a well-formed"
<< " * a well-formed /etc/locale.gen" << supported.fileName()
<< "\tOR" << "\n\tOR"
<< " * a complete pre-compiled locale-gen database which allows complete locale -a output."; << "* a well-formed"
<< (localeGenPath.isEmpty() ? QLatin1Literal("/etc/locale.gen") : localeGenPath)
<< "\n\tOR"
<< "* a complete pre-compiled locale-gen database which allows complete locale -a output.";
return; // something went wrong and there's nothing we can do about it. return; // something went wrong and there's nothing we can do about it.
} }
@ -437,14 +440,7 @@ LocalePage::guessLocaleConfiguration()
// If we cannot say anything about available locales // If we cannot say anything about available locales
if ( m_localeGenLines.isEmpty() ) if ( m_localeGenLines.isEmpty() )
{ {
cDebug() << "WARNING: cannot acquire a list of available locales." cDebug() << "WARNING: guessLocaleConfiguration can't guess from an empty list.";
<< "The locale and localecfg modules will be broken as long as this "
"system does not provide"
<< " * a /usr/share/i18n/SUPPORTED file"
<< "\tOR"
<< " * a well-formed /etc/locale.gen"
<< "\tOR"
<< " * a complete pre-compiled locale-gen database which allows complete locale -a output.";
return LocaleConfiguration::createDefault(); return LocaleConfiguration::createDefault();
} }