From f5e09cd6768c38577a2b60aa0c9b65a29739b20d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 12 Feb 2024 21:30:52 +0100 Subject: [PATCH] [partition] Write out translation context lupdate isn't smart enough to pick up `context` when it's a variable, and then the whole string is not found for translation. --- src/modules/partition/PartitionViewStep.cpp | 34 ++++++++++++--------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp index 4d93ce060..8b7225da3 100644 --- a/src/modules/partition/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -136,22 +136,24 @@ static QString modeDescription( Config::InstallChoice choice ) { const auto* branding = Calamares::Branding::instance(); - static const char context[] = "PartitionViewStep"; switch ( choice ) { case Config::InstallChoice::Alongside: - return QCoreApplication::translate( context, "Install %1 alongside another operating system", "@label" ) + return QCoreApplication::translate( + "PartitionViewStep", "Install %1 alongside another operating system", "@label" ) .arg( branding->shortVersionedName() ); case Config::InstallChoice::Erase: - return QCoreApplication::translate( context, "Erase disk and install %1", "@label" ) + return QCoreApplication::translate( + "PartitionViewStep", "Erase disk and install %1", "@label" ) .arg( branding->shortVersionedName() ); case Config::InstallChoice::Replace: - return QCoreApplication::translate( context, "Replace a partition with %1", "@label" ) + return QCoreApplication::translate( + "PartitionViewStep", "Replace a partition with %1", "@label" ) .arg( branding->shortVersionedName() ); case Config::InstallChoice::NoChoice: case Config::InstallChoice::Manual: - return QCoreApplication::translate( context, "Manual partitioning", "@label" ); + return QCoreApplication::translate( "PartitionViewStep", "Manual partitioning", "@label" ); } return QString(); } @@ -167,7 +169,6 @@ static QString diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, Config::InstallChoice choice ) { const auto* branding = Calamares::Branding::instance(); - static const char context[] = "PartitionViewStep"; if ( listLength == 1 ) // this is the only disk preview { @@ -175,28 +176,33 @@ diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, C { case Config::Alongside: return QCoreApplication::translate( - context, + "PartitionViewStep", "Install %1 alongside another operating system on disk " - "%2 (%3)", "@info" ) + "%2 (%3)", + "@info" ) .arg( branding->shortVersionedName() ) .arg( info.deviceNode ) .arg( info.deviceName ); case Config::Erase: - return QCoreApplication::translate( context, - "Erase disk %2 (%3) and install %1", "@info" ) + return QCoreApplication::translate( "PartitionViewStep", + "Erase disk %2 (%3) and install %1", + "@info" ) .arg( branding->shortVersionedName() ) .arg( info.deviceNode ) .arg( info.deviceName ); case Config::Replace: return QCoreApplication::translate( - context, "Replace a partition on disk %2 (%3) with %1", "@info" ) + "PartitionViewStep", + "Replace a partition on disk %2 (%3) with %1", + "@info" ) .arg( branding->shortVersionedName() ) .arg( info.deviceNode ) .arg( info.deviceName ); case Config::NoChoice: case Config::Manual: - return QCoreApplication::translate( - context, "Manual partitioning on disk %1 (%2)", "@info" ) + return QCoreApplication::translate( "PartitionViewStep", + "Manual partitioning on disk %1 (%2)", + "@info" ) .arg( info.deviceNode ) .arg( info.deviceName ); } @@ -204,7 +210,7 @@ diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, C } else // multiple disk previews! { - return QCoreApplication::translate( context, "Disk %1 (%2)", "@info" ) + return QCoreApplication::translate( "PartitionViewStep", "Disk %1 (%2)", "@info" ) .arg( info.deviceNode ) .arg( info.deviceName ); }