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

[libcalamares] Make logging more consistent

Browse Source
This commit is contained in:
Adriaan de Groot 2019-04-15 08:58:21 -04:00
parent 8bb07528e2
commit aaeea16871
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcalamares/PythonJobApi.cpp
View File

@ -285,11 +285,11 @@ gettext_path()
QDir ldir( localedir ); QDir ldir( localedir );
if ( ldir.cd( lang ) ) if ( ldir.cd( lang ) )
{ {
cDebug() << " .. Found" << lang << "in" << ldir.canonicalPath(); cDebug() << Logger::SubEntry << "Found" << lang << "in" << ldir.canonicalPath();
return bp::object( localedir.toStdString() ); return bp::object( localedir.toStdString() );
} }
} }
cDebug() << " .. No translation found for languages" << candidateLanguages; cDebug() << Logger::SubEntry << "No translation found for languages" << candidateLanguages;
return bp::object(); // None return bp::object(); // None
} }

8
src/libcalamares/utils/CalamaresUtils.cpp
View File

@ -228,11 +228,11 @@ installTranslator( const QLocale& locale,
"_", "_",
brandingTranslationsDir.absolutePath() ) ) brandingTranslationsDir.absolutePath() ) )
{ {
cDebug() << " .. Branding using locale:" << localeName; cDebug() << Logger::SubEntry << "Branding using locale:" << localeName;
} }
else else
{ {
cDebug() << " .. Branding using default, system locale not found:" << localeName; cDebug() << Logger::SubEntry << "Branding using default, system locale not found:" << localeName;
translator->load( brandingTranslationsPrefix + "en" ); translator->load( brandingTranslationsPrefix + "en" );
} }
@ -251,11 +251,11 @@ installTranslator( const QLocale& locale,
translator = new QTranslator( parent ); translator = new QTranslator( parent );
if ( translator->load( QString( ":/lang/calamares_" ) + localeName ) ) if ( translator->load( QString( ":/lang/calamares_" ) + localeName ) )
{ {
cDebug() << " .. Calamares using locale:" << localeName; cDebug() << Logger::SubEntry << "Calamares using locale:" << localeName;
} }
else else
{ {
cDebug() << " .. Calamares using default, system locale not found:" << localeName; cDebug() << Logger::SubEntry << "Calamares using default, system locale not found:" << localeName;
translator->load( QString( ":/lang/calamares_en" ) ); translator->load( QString( ":/lang/calamares_en" ) );
} }

2
src/libcalamares/utils/CalamaresUtilsSystem.cpp
View File

@ -65,7 +65,7 @@ System::instance()
if ( !s_instance ) if ( !s_instance )
{ {
cError() << "No Calamares system-object has been created."; cError() << "No Calamares system-object has been created.";
cError() << " .. using a bogus instance instead."; cError() << Logger::SubEntry << "using a bogus instance instead.";
return new System( true, nullptr ); return new System( true, nullptr );
} }
return s_instance; return s_instance;