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

[partition] Be explicit about user-visible FS names, ReplaceWidget

Browse Source
This commit is contained in:
Adriaan de Groot 2020-02-13 11:49:20 +01:00
parent 05dfc24af6
commit 472ec32617
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/partition/gui/ReplaceWidget.cpp
View File

@ -22,6 +22,7 @@
#include "ui_ReplaceWidget.h"
#include "core/DeviceModel.h"
#include "core/KPMHelpers.h"
#include "core/PartitionCoreModule.h"
#include "core/PartitionActions.h"
#include "core/PartitionInfo.h"
@ -192,8 +193,8 @@ ReplaceWidget::onPartitionSelected()
return;
}
QString prettyName = tr( "Data partition (%1)" )
.arg( partition->fileSystem().name() );
QString fsNameForUser = KPMHelpers::userVisibleFS( partition->fileSystem() );
QString prettyName = tr( "Data partition (%1)" ).arg( fsNameForUser );
for ( const QString& line : osproberLines )
{
QStringList lineColumns = line.split( ':' );
@ -210,13 +211,13 @@ ReplaceWidget::onPartitionSelected()
if ( osName.isEmpty() )
{
prettyName = tr( "Unknown system partition (%1)" )
.arg( partition->fileSystem().name() );
.arg( fsNameForUser );
}
else
{
prettyName = tr ( "%1 system partition (%2)" )
.arg( osName.replace( 0, 1, osName.at( 0 ).toUpper() ) )
.arg( partition->fileSystem().name() );
.arg( fsNameForUser );
}
break;
}