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

[locale] Apply newer clang-formatting

Browse Source
This commit is contained in:
Adriaan de Groot 2024-04-17 10:55:18 +02:00
parent a6cfc79a92
commit 5f293fb40b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/locale/LCLocaleDialog.cpp
View File

@ -29,7 +29,8 @@ LCLocaleDialog::LCLocaleDialog( const QString& guessedLCLocale, const QStringLis
upperText->setWordWrap( true ); upperText->setWordWrap( true );
upperText->setText( tr( "The system locale setting affects the language and character " upperText->setText( tr( "The system locale setting affects the language and character "
"set for some command line user interface elements.<br/>" "set for some command line user interface elements.<br/>"
"The current setting is <strong>%1</strong>.", "@info" ) "The current setting is <strong>%1</strong>.",
"@info" )
.arg( guessedLCLocale ) ); .arg( guessedLCLocale ) );
mainLayout->addWidget( upperText ); mainLayout->addWidget( upperText );
setMinimumWidth( upperText->fontMetrics().height() * 24 ); setMinimumWidth( upperText->fontMetrics().height() * 24 );
@ -85,5 +86,5 @@ QString
LCLocaleDialog::selectedLCLocale() LCLocaleDialog::selectedLCLocale()
{ {
const auto items = m_localesWidget->selectedItems(); const auto items = m_localesWidget->selectedItems();
return items.isEmpty() ? QString{} : items.first()->text(); return items.isEmpty() ? QString {} : items.first()->text();
} }

7
src/modules/locale/SetTimezoneJob.cpp
View File

@ -67,9 +67,10 @@ SetTimezoneJob::exec()
int ec = Calamares::System::instance()->targetEnvCall( { "ln", "-s", zoneinfoPath, localtimeSlink } ); int ec = Calamares::System::instance()->targetEnvCall( { "ln", "-s", zoneinfoPath, localtimeSlink } );
if ( ec ) if ( ec )
{ {
return Calamares::JobResult::error( return Calamares::JobResult::error( tr( "Cannot set timezone.", "@error" ),
tr( "Cannot set timezone.", "@error" ), tr( "Link creation failed, target: %1; link name: %2", "@info" )
tr( "Link creation failed, target: %1; link name: %2", "@info" ).arg( zoneinfoPath ).arg( "/etc/localtime" ) ); .arg( zoneinfoPath )
.arg( "/etc/localtime" ) );
} }
QFile timezoneFile( gs->value( "rootMountPoint" ).toString() + "/etc/timezone" ); QFile timezoneFile( gs->value( "rootMountPoint" ).toString() + "/etc/timezone" );