From e4d2b27138116bb9e0b4abaa12c61a220a142f74 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 21 Jul 2024 22:52:13 +0200
Subject: [PATCH 1/3] Changes: show what this branch will do

While here, adjust the format for changelog entries a little.
Use "given name" instead of "first name", since "first / middle / last"
doesn't make sense in a lot of contexts. Mention issue numbers
and names for individual entries where possible.
---
 CHANGES-3.3 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES-3.3 b/CHANGES-3.3
index 0c682c5bf..d66e89eae 100644
--- a/CHANGES-3.3
+++ b/CHANGES-3.3
@@ -14,13 +14,16 @@ it must be placed before the *fstab* module in settings.conf.  If it comes
 after, then the keyfile will be missing from crypttab and the user will be
 asked for their password multiple times.
 
-This release contains contributions from (alphabetically by first name):
+This release contains contributions from (alphabetically by given name):
+ - Adriaan de Groot
  - Evan James
 
 ## Core ##
 
 ## Modules ##
-  - Placed *luksbootkeyfile* before *fstab* in the example settings.conf
+  - Placed *luksbootkeyfile* before *fstab* in the example `settings.conf` (#2356, Evan)
+  - *partition* module mentions creating a swap file in its summary (#2320, Adriaan)
+
 
 # 3.3.8 (2024-07-02)
 

From 51c39cdbee78582d5229b43afbbaaa74dade552e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 21 Jul 2024 22:58:41 +0200
Subject: [PATCH 2/3] [partition] Improve jobDescriptions()

- make the dox match what the function does
- reduce calls to job->description()
---
 src/modules/partition/PartitionViewStep.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index db087b59d..27020477b 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -110,8 +110,8 @@ PartitionViewStep::prettyName() const
 /** @brief Gather the pretty descriptions of all the partitioning jobs
  *
  * Returns a QStringList of each job's pretty description, including
- * empty strings and duplicates. The list is in-order of how the
- * jobs will be run.
+ * duplicates (but no empty lines). The list is in-order of how the
+ * jobs will be run. If no job has a non-empty description, the list is empty.
  */
 static QStringList
 jobDescriptions( const Calamares::JobList& jobs )
@@ -119,9 +119,10 @@ jobDescriptions( const Calamares::JobList& jobs )
     QStringList jobsLines;
     for ( const Calamares::job_ptr& job : qAsConst( jobs ) )
     {
-        if ( !job->prettyDescription().isEmpty() )
+        const auto description = job->prettyDescription();
+        if ( !description.isEmpty() )
         {
-            jobsLines.append( job->prettyDescription() );
+            jobsLines.append( description );
         }
     }
     return jobsLines;

From 5f9b7890c3d429abad73a3f31e9a49805704d7a9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 22 Jul 2024 22:33:05 +0200
Subject: [PATCH 3/3] [partition] Add a summary message about swapfile

---
 src/modules/partition/PartitionViewStep.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index 27020477b..a5de6d5ea 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -233,8 +233,12 @@ PartitionViewStep::prettyStatus() const
         }
         return s.join( QString() );
     }();
-    const QString jobsLabel = jobDescriptions( jobs() ).join( QStringLiteral( "<br/>" ) );
-    return diskInfoLabel + "<br/>" + jobsLabel;
+    QStringList jobsLabels = jobDescriptions( jobs() );
+    if ( m_config->swapChoice() == Config::SwapChoice::SwapFile )
+    {
+        jobsLabels.append( tr( "Create a swap file." ) );
+    }
+    return diskInfoLabel + "<br/>" + jobsLabels.join( QStringLiteral( "<br/>" ) );
 }
 
 QWidget*