From 102b2d7e568701486884cd6e7fb21620e5703285 Mon Sep 17 00:00:00 2001
From: sp2710 <39745544+sp2710@users.noreply.github.com>
Date: Mon, 17 Dec 2018 06:10:24 +0530
Subject: [PATCH] Fix #2134: Remove formatting characters from upload_problem
 strings (#2135)

---
 .../java/fr/free/nrw/commons/utils/ImageUtils.java     | 10 +++++-----
 app/src/main/res/values/strings.xml                    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.java
index 866673907..9f1e0e6bc 100644
--- a/app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.java
+++ b/app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.java
@@ -236,22 +236,22 @@ public class ImageUtils {
             errorMessage.append(context.getResources().getString(R.string.upload_problem_exist));
 
             if ((IMAGE_DARK & result) != 0 ) { // We are checking image dark bit to see if that bit is set or not
-                errorMessage.append(context.getResources().getString(R.string.upload_problem_image_dark));
+                errorMessage.append("\n - ").append(context.getResources().getString(R.string.upload_problem_image_dark));
             }
 
             if ((IMAGE_BLURRY & result) != 0 ) {
-                errorMessage.append(context.getResources().getString(R.string.upload_image_problem_blurry));
+                errorMessage.append("\n - ").append(context.getResources().getString(R.string.upload_image_problem_blurry));
             }
 
             if ((IMAGE_DUPLICATE & result) != 0 ) {
-                errorMessage.append(context.getResources().getString(R.string.upload_problem_image_duplicate));
+                errorMessage.append("\n - ").append(context.getResources().getString(R.string.upload_problem_image_duplicate));
             }
 
             if ((IMAGE_GEOLOCATION_DIFFERENT & result) != 0 ) {
-                errorMessage.append(context.getResources().getString(R.string.upload_problem_different_geolocation));
+                errorMessage.append("\n - ").append(context.getResources().getString(R.string.upload_problem_different_geolocation));
             }
 
-            errorMessage.append(context.getResources().getString(R.string.upload_problem_do_you_continue));
+            errorMessage.append("\n\n").append(context.getResources().getString(R.string.upload_problem_do_you_continue));
         }
 
         return errorMessage.toString();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c92056157..82b76389d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -237,11 +237,11 @@
   <string name="upload_image_blurry">This picture is blurry, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value.</string>
 
   <string name="upload_problem_exist">Potential problems with this image:</string>
-  <string name="upload_problem_image_dark">\n - Image is too dark.</string>
-  <string name="upload_problem_image_blurry">\n - Image is blurry.</string>
-  <string name="upload_problem_image_duplicate">\n - Image is already on Commons.</string>
-  <string name="upload_problem_different_geolocation">\n - This picture was taken at a different location.</string>
-  <string name="upload_problem_do_you_continue">\n\nDo you still want to upload this picture?</string>
+  <string name="upload_problem_image_dark">Image is too dark.</string>
+  <string name="upload_problem_image_blurry">Image is blurry.</string>
+  <string name="upload_problem_image_duplicate">Image is already on Commons.</string>
+  <string name="upload_problem_different_geolocation">This picture was taken at a different location.</string>
+  <string name="upload_problem_do_you_continue">Do you still want to upload this picture?</string>
 
   <string name="give_permission">Give permission</string>
   <string name="use_external_storage">Use external storage</string>