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

[partition] Tidy up strings in flag job messages

Browse Source 
- the prettyName() function returns names, labels. Use @title context.
- the prettyDescription() is for the summary page. Use @info context.
- the prettyStatus() is for status during installation. Use @status context.

While here, tighten up the wording some.
This commit is contained in:
Adriaan de Groot 2023-12-30 17:42:16 +01:00
parent a48a16646b
commit ee09fd6613
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,17 +41,17 @@ SetPartFlagsJob::prettyName() const
{
if ( !partition()->partitionPath().isEmpty() )
{
return tr( "Setting flags on partition %1…", "@status" ).arg( partition()->partitionPath() );
return tr( "Set flags on partition %1", "@title" ).arg( partition()->partitionPath() );
}
QString fsNameForUser = userVisibleFS( partition()->fileSystem() );
if ( !fsNameForUser.isEmpty() )
{
return tr( "Setting flags on %1MiB %2 partition…", "@status" )
return tr( "Set flags on %1MiB %2 partition", "@title" )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( fsNameForUser );
}
return tr( "Setting flags on new partition…", "@status" );
return tr( "Set flags on new partition", "@title" );
}
QString
@ -62,23 +62,22 @@ SetPartFlagsJob::prettyDescription() const
{
if ( !partition()->partitionPath().isEmpty() )
{
return tr( "Clearing flags on partition <strong>%1</strong>…", "@status" ).arg( partition()->partitionPath() );
return tr( "Clear flags on partition <strong>%1</strong>", "@info" ).arg( partition()->partitionPath() );
}
QString fsNameForUser = userVisibleFS( partition()->fileSystem() );
if ( !fsNameForUser.isEmpty() )
{
return tr( "Clearing flags on %1MiB <strong>%2</strong> partition…", "@status" )
return tr( "Clear flags on %1MiB <strong>%2</strong> partition", "@info" )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( fsNameForUser );
}
return tr( "Clearing flags on new partition…", "@status" );
return tr( "Clear flags on new partition", "@info" );
}
if ( !partition()->partitionPath().isEmpty() )
{
return tr( "Flagging partition <strong>%1</strong> as "
"<strong>%2</strong>…", "@status" )
return tr( "Set flags on partition <strong>%1</strong> to <strong>%2</strong>", "@info" )
.arg( partition()->partitionPath() )
.arg( flagsList.join( ", " ) );
}
@ -86,14 +85,13 @@ SetPartFlagsJob::prettyDescription() const
QString fsNameForUser = userVisibleFS( partition()->fileSystem() );
if ( !fsNameForUser.isEmpty() )
{
return tr( "Flagging %1MiB <strong>%2</strong> partition as "
"<strong>%3</strong>…", "@status" )
return tr( "Set flags on %1MiB <strong>%2</strong> partition to <strong>%3</strong>", "@info" )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( fsNameForUser )
.arg( flagsList.join( ", " ) );
}
return tr( "Flagging new partition as <strong>%1</strong>…", "@status" ).arg( flagsList.join( ", " ) );
return tr( "Set flags on new partition to <strong>%1</strong>", "@info" ).arg( flagsList.join( ", " ) );
}
QString
@ -104,7 +102,8 @@ SetPartFlagsJob::prettyStatusMessage() const
{
if ( !partition()->partitionPath().isEmpty() )
{
return tr( "Clearing flags on partition <strong>%1</strong>…", "@status" ).arg( partition()->partitionPath() );
return tr( "Clearing flags on partition <strong>%1</strong>…", "@status" )
.arg( partition()->partitionPath() );
}
QString fsNameForUser = userVisibleFS( partition()->fileSystem() );
@ -120,8 +119,7 @@ SetPartFlagsJob::prettyStatusMessage() const
if ( !partition()->partitionPath().isEmpty() )
{
return tr( "Setting flags <strong>%2</strong> on partition "
"<strong>%1</strong>…", "@status" )
return tr( "Setting flags <strong>%2</strong> on partition <strong>%1</strong>…", "@status" )
.arg( partition()->partitionPath() )
.arg( flagsList.join( ", " ) );
}
@ -129,8 +127,7 @@ SetPartFlagsJob::prettyStatusMessage() const
QString fsNameForUser = userVisibleFS( partition()->fileSystem() );
if ( !fsNameForUser.isEmpty() )
{
return tr( "Setting flags <strong>%3</strong> on "
"%1MiB <strong>%2</strong> partition…", "@status" )
return tr( "Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition…", "@status" )
.arg( BytesToMiB( partition()->capacity() ) )
.arg( fsNameForUser )
.arg( flagsList.join( ", " ) );