From 3f529e674f6b9afe1fdeec0a106b23f20827ad4c Mon Sep 17 00:00:00 2001
From: paco-arana <118578052+paco-arana@users.noreply.github.com>
Date: Thu, 20 Jul 2023 07:14:21 -0700
Subject: [PATCH] Removed comma separator (#5261)

* Removed comma separator from file descriptions

* Removed a redundant line that deleted the last comma of the descriptions

* Added a line to formatDescriptions that replaces every instance of "}}, " with "}}" to remove the comma between descriptions.

* Specified separator as an empty string instead of default value ", " for .joinToString method. Deleted previous fix using .replace method.

* Restored buffer.replace() in updateDescription
---
 .../main/java/fr/free/nrw/commons/contributions/Contribution.kt | 2 +-
 .../fr/free/nrw/commons/description/DescriptionEditActivity.kt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt
index 400bddfba..c3d084f0a 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt
@@ -111,6 +111,6 @@ data class Contribution constructor(
          */
         fun formatDescriptions(descriptions: List<UploadMediaDetail>) =
             descriptions.filter { it.descriptionText.isNotEmpty() }
-                .joinToString { "{{${it.languageCode}|1=${it.descriptionText}}}" }
+                .joinToString(separator = "") { "{{${it.languageCode}|1=${it.descriptionText}}}" }
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
index 8d7795f5e..c7750457e 100644
--- a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
@@ -151,7 +151,7 @@ class DescriptionEditActivity : BaseActivity(), UploadMediaDetailAdapter.EventLi
                     buffer.append(uploadDetails.languageCode)
                     buffer.append("|1=")
                     buffer.append(uploadDetails.descriptionText)
-                    buffer.append("}}, ")
+                    buffer.append("}}")
                 }
             }
             buffer.replace(", $".toRegex(), "")