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

Improve user-visible strings in SetPartFlagsJob.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-10-28 09:23:33 +02:00
parent 74ea0fe49a
commit fbe72b3663
1 changed files with 63 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/modules/partition/jobs/SetPartitionFlagsJob.cpp
View File

@ -44,7 +44,15 @@ SetPartFlagsJob::SetPartFlagsJob( Device* device,
QString QString
SetPartFlagsJob::prettyName() const SetPartFlagsJob::prettyName() const
{ {
return tr( "Set flags on partition %1." ).arg( partition()->partitionPath() ); if ( !partition()->partitionPath().isEmpty() )
return tr( "Set flags on partition %1." ).arg( partition()->partitionPath() );
if ( !partition()->fileSystem().name().isEmpty() )
return tr( "Set flags on %1MB %2 partition." )
.arg( partition()->capacity() /1024 /1024)
.arg( partition()->fileSystem().name() );
return tr( "Set flags on new partition." );
} }
@ -53,13 +61,34 @@ SetPartFlagsJob::prettyDescription() const
{ {
QStringList flagsList = PartitionTable::flagNames( m_flags ); QStringList flagsList = PartitionTable::flagNames( m_flags );
if ( flagsList.count() == 0 ) if ( flagsList.count() == 0 )
return tr( "Clear flags on partition <strong>%1</strong>." ) {
.arg( partition()->partitionPath() ); if ( !partition()->partitionPath().isEmpty() )
return tr( "Clear flags on partition <strong>%1</strong>." )
.arg( partition()->partitionPath() );
return tr( "Flag partition <strong>%1</strong> as " if ( !partition()->fileSystem().name().isEmpty() )
"<strong>%2</strong>." ) return tr( "Clear flags on %1MB <strong>%2</strong> partition." )
.arg( partition()->partitionPath() ) .arg( partition()->capacity() /1024 /1024)
.arg( flagsList.join( ", " ) ); .arg( partition()->fileSystem().name() );
return tr( "Clear flags on new partition." );
}
if ( !partition()->partitionPath().isEmpty() )
return tr( "Flag partition <strong>%1</strong> as "
"<strong>%2</strong>." )
.arg( partition()->partitionPath() )
.arg( flagsList.join( ", " ) );
if ( !partition()->fileSystem().name().isEmpty() )
return tr( "Flag %1MB <strong>%2</strong> partition as "
"<strong>%3</strong>." )
.arg( partition()->capacity() /1024 /1024)
.arg( partition()->fileSystem().name() )
.arg( flagsList.join( ", " ) );
return tr( "Flag new partition as <strong>%1</strong>." )
.arg( flagsList.join( ", " ) );
} }
@ -68,13 +97,34 @@ SetPartFlagsJob::prettyStatusMessage() const
{ {
QStringList flagsList = PartitionTable::flagNames( m_flags ); QStringList flagsList = PartitionTable::flagNames( m_flags );
if ( flagsList.count() == 0 ) if ( flagsList.count() == 0 )
return tr( "Clearing flags on partition <strong>%1</strong>." ) {
.arg( partition()->partitionPath() ); if ( !partition()->partitionPath().isEmpty() )
return tr( "Clearing flags on partition <strong>%1</strong>." )
.arg( partition()->partitionPath() );
return tr( "Setting flags <strong>%2</strong> on partition " if ( !partition()->fileSystem().name().isEmpty() )
"<strong>%1</strong>." ) return tr( "Clearing flags on %1MB <strong>%2</strong> partition." )
.arg( partition()->partitionPath() ) .arg( partition()->capacity() /1024 /1024)
.arg( flagsList.join( ", " ) ); .arg( partition()->fileSystem().name() );
return tr( "Clearing flags on new partition." );
}
if ( !partition()->partitionPath().isEmpty() )
return tr( "Setting flags <strong>%2</strong> on partition "
"<strong>%1</strong>." )
.arg( partition()->partitionPath() )
.arg( flagsList.join( ", " ) );
if ( !partition()->fileSystem().name().isEmpty() )
return tr( "Setting flags <strong>%3</strong> on "
"%1MB <strong>%2</strong> partition." )
.arg( partition()->capacity() /1024 /1024)
.arg( partition()->fileSystem().name() )
.arg( flagsList.join( ", " ) );
return tr( "Setting flags <strong>%1</strong> on new partition." )
.arg( flagsList.join( ", " ) );
} }