From d24907c785afd3ba0fc14dcad8f2953c1450bd2e Mon Sep 17 00:00:00 2001
From: VaiTon <eyadlorenzo@gmail.com>
Date: Fri, 13 Aug 2021 17:29:24 +0200
Subject: [PATCH] fix: do not concatenate labels without separators

Closes https://github.com/openfoodfacts/openfoodfacts-androidapp/issues/4152
---
 .../view/summary/SummaryProductFragment.kt     |  3 +--
 app/src/main/res/values/strings.xml            | 18 +++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt
index dbfa16345605..b8dd28f3371f 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt
@@ -733,11 +733,10 @@ class SummaryProductFragment : BaseFragment(), ISummaryProductPresenter.View {
 
                     binding.labelsText.text = SpannableStringBuilder()
                         .bold { append(getString(R.string.txtLabels)) }
-                        .append(" ")
                         .apply {
                             state.data.map(::getLabelTag).forEachIndexed { i, el ->
                                 append(el)
-                                if (i == state.data.size) append(", ")
+                                if (i != state.data.size) append(", ")
                             }
                         }
                 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2960412d7d3f..a673405c74a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -224,17 +224,17 @@
     <string name="alert_dialog_warning_title">Warning</string>
     <string name="alert_dialog_warning_msg_user">User/password has changed, please update information</string>
     <string name="toast_retrieving">Loading…</string>
-    <string name="txtBarcode">Barcode :</string>
-    <string name="txtCategories">Categories :</string>
-    <string name="txtLabels">Labels, certifications, awards :</string>
-    <string name="txtEMB">Traceability codes:</string>
-    <string name="txtIngredients">Ingredients list :</string>
+    <string name="txtBarcode">Barcode:</string>
+    <string name="txtCategories">Categories:</string>
+    <string name="txtLabels">Labels, certifications, awards: </string>
+    <string name="txtEMB">Traceability codes: </string>
+    <string name="txtIngredients">Ingredients list: </string>
     <string name="Donate">Donate</string>
     <string name="Donation">Click here to donate to Open Food Facts</string>
-    <string name="txtSubstances">Substances or products causing allergies or intolerances :</string>
-    <string name="txtAdditives">Additives :</string>
-    <string name="txtTraces">Traces :</string>
-    <string name="txtMayBeFromPalmOilProduct">Ingredients that may be from palm oil :</string>
+    <string name="txtSubstances">Substances or products causing allergies or intolerances: </string>
+    <string name="txtAdditives">Additives: </string>
+    <string name="txtTraces">Traces: </string>
+    <string name="txtMayBeFromPalmOilProduct">Ingredients that may be from palm oil: </string>
     <string name="txtPalmOilProduct">Ingredients from palm oil :</string>
     <string name="txtServingSize">Serving size :</string>
     <string name="txtNutrientLevel100g">Nutrient levels for 100g :</string>