From 88cff387c307daf88dfb7ba4b090bf0d08c977a2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 13 Feb 2020 11:33:40 +0100
Subject: [PATCH] [partition] Be explicit about user-visible FS names,
 FormatPartitionJob

---
 src/modules/partition/jobs/FormatPartitionJob.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp
index 0d43dfdb3..c877343c3 100644
--- a/src/modules/partition/jobs/FormatPartitionJob.cpp
+++ b/src/modules/partition/jobs/FormatPartitionJob.cpp
@@ -19,6 +19,8 @@
 
 #include "jobs/FormatPartitionJob.h"
 
+#include "core/KPMHelpers.h"
+
 #include "utils/Logger.h"
 
 // KPMcore
@@ -29,6 +31,9 @@
 #include <ops/createfilesystemoperation.h>
 #include <util/report.h>
 
+using KPMHelpers::untranslatedFS;
+using KPMHelpers::userVisibleFS;
+
 FormatPartitionJob::FormatPartitionJob( Device* device, Partition* partition )
     : PartitionJob( partition )
     , m_device( device )
@@ -40,7 +45,7 @@ FormatPartitionJob::prettyName() const
 {
     return tr( "Format partition %1 (file system: %2, size: %3 MiB) on %4." )
            .arg( m_partition->partitionPath() )
-           .arg( m_partition->fileSystem().name() )
+           .arg( userVisibleFS( m_partition->fileSystem() ) )
            .arg( m_partition->capacity() / 1024 / 1024 )
             .arg( m_device->name() );
 }
@@ -52,7 +57,7 @@ FormatPartitionJob::prettyDescription() const
     return tr( "Format <strong>%3MiB</strong> partition <strong>%1</strong> with "
                "file system <strong>%2</strong>." )
            .arg( m_partition->partitionPath() )
-           .arg( m_partition->fileSystem().name() )
+           .arg( userVisibleFS( m_partition->fileSystem() ) )
             .arg( m_partition->capacity() / 1024 / 1024 );
 }
 
@@ -63,7 +68,7 @@ FormatPartitionJob::prettyStatusMessage() const
     return tr( "Formatting partition %1 with "
                "file system %2." )
            .arg( m_partition->partitionPath() )
-           .arg( m_partition->fileSystem().name() );
+           .arg( userVisibleFS( m_partition->fileSystem() ) );
 }