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

[partition] Simplify variables for error messages

Browse Source
This commit is contained in:
Adriaan de Groot 2023-11-09 21:57:55 +01:00
parent c506808d72
commit b72508546c
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/partition/PartitionViewStep.cpp
View File

@ -552,20 +552,16 @@ PartitionViewStep::onLeave()
const QString wrongFlagMessage = tr( "The filesystem must have flag <strong>%1</strong> set." ) const QString wrongFlagMessage = tr( "The filesystem must have flag <strong>%1</strong> set." )
.arg( PartitionTable::flagName( PartitionTable::Flag::Boot ) ); .arg( PartitionTable::flagName( PartitionTable::Flag::Boot ) );
const auto recommendedMiB = Calamares::BytesToMiB( PartUtils::efiFilesystemRecommendedSize() );
const auto minimumMiB = Calamares::BytesToMiB( PartUtils::efiFilesystemMinimumSize() );
// Three flavors of size-is-wrong // Three flavors of size-is-wrong
using Calamares::Units::operator""_MiB;
const qint64 atLeastBytes = static_cast< qint64 >( PartUtils::efiFilesystemRecommendedSize() );
const auto atLeastMiB = Calamares::BytesToMiB( atLeastBytes );
const QString requireConfiguredSize const QString requireConfiguredSize
= tr( "The filesystem must be at least %1 MiB in size." ).arg( atLeastMiB ); = tr( "The filesystem must be at least %1 MiB in size." ).arg( recommendedMiB );
const QString requiredMinimumSize const QString requiredMinimumSize
= tr( "The filesystem must be at least %1 MiB in size." ) = tr( "The filesystem must be at least %1 MiB in size." ).arg( minimumMiB );
.arg( Calamares::BytesToMiB( PartUtils::efiFilesystemMinimumSize() ) );
const QString suggestConfiguredSize const QString suggestConfiguredSize
= tr( "The minimum recommended size for the filesystem is %1 MiB." ).arg( atLeastMiB ); = tr( "The minimum recommended size for the filesystem is %1 MiB." ).arg( recommendedMiB );
const QString mayFail = tr( "You can continue without setting up an EFI system " const QString mayFail = tr( "You can continue without setting up an EFI system "
"partition but your system may fail to start." ); "partition but your system may fail to start." );