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

KPMCore: use the translation system for filesystem names from KPMCore

Browse Source
This commit is contained in:
Adriaan de Groot 2017-09-30 17:04:35 +02:00
parent 96c3f7def3
commit ff2947060d
1 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/modules/partition/jobs/FillGlobalStorageJob.cpp
View File

@ -77,50 +77,6 @@ getLuksUuid( const QString& path )
return uuid;
}
// TODO: this will be available from KPMCore soon
static const char* filesystem_labels[] = {
"unknown",
"extended",
"ext2",
"ext3",
"ext4",
"linuxswap",
"fat16",
"fat32",
"ntfs",
"reiser",
"reiser4",
"xfs",
"jfs",
"hfs",
"hfsplus",
"ufs",
"unformatted",
"btrfs",
"hpfs",
"luks",
"ocfs2",
"zfs",
"exfat",
"nilfs2",
"lvm2 pv",
"f2fs",
"udf",
"iso9660",
};
Q_STATIC_ASSERT_X((sizeof(filesystem_labels) / sizeof(char *)) >= FileSystem::__lastType, "Mismatch in filesystem labels");
static QString
untranslatedTypeName(FileSystem::Type t)
{
Q_ASSERT( t >= 0 );
Q_ASSERT( t <= FileSystem::__lastType );
return QLatin1String(filesystem_labels[t]);
}
static QVariant
mapForPartition( Partition* partition, const QString& uuid )
@ -129,7 +85,7 @@ mapForPartition( Partition* partition, const QString& uuid )
map[ "device" ] = partition->partitionPath();
map[ "mountPoint" ] = PartitionInfo::mountPoint( partition );
map[ "fsName" ] = partition->fileSystem().name();
map[ "fs" ] = untranslatedTypeName( partition->fileSystem().type() );
map[ "fs" ] = partition->fileSystem().name( QStringLiteral("C") ); // Untranslated
if ( partition->fileSystem().type() == FileSystem::Luks &&
dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() )
map[ "fs" ] = dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS()->name();