From 350e95b56af73bfc702a2cf750744829c09283a5 Mon Sep 17 00:00:00 2001
From: hudlerr <ha241@student.le.ac.uk>
Date: Wed, 25 Mar 2020 13:38:12 +0000
Subject: [PATCH] Fixes #3494 (#3519)

* better names for the upload warning dialog buttons #3494

* Dialog button pt2

* dialog buttons pt3

* round 4..

Co-authored-by: Hdot <a.hudaa@hotmail.com>
---
 .../upload/mediaDetails/UploadMediaDetailFragment.java | 10 +++++++---
 app/src/main/res/values/strings.xml                    |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
index 8b5da7fe0..a595f5c75 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
@@ -339,10 +339,12 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
     public void showDuplicatePicturePopup() {
         String uploadTitleFormat = getString(R.string.upload_title_duplicate);
         DialogUtil.showAlertDialog(getActivity(),
-                getString(R.string.warning),
+                getString(R.string.duplicate_image_found),
                 String.format(Locale.getDefault(),
                         uploadTitleFormat,
                         uploadItem.getFileName()),
+                getString(R.string.upload),
+                getString(R.string.cancel),
                 () -> {
                     uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
                     onNextButtonClicked();
@@ -355,9 +357,11 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
         String errorMessageForResult = getErrorMessageForResult(getContext(), errorCode);
         if (!StringUtils.isBlank(errorMessageForResult)) {
             DialogUtil.showAlertDialog(getActivity(),
-                    getString(R.string.warning),
+                    getString(R.string.upload_problem_image),
                     errorMessageForResult,
-                    () -> {
+                    getString(R.string.upload),
+                    getString(R.string.cancel),
+                () -> {
                         uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
                         onNextButtonClicked();
                     },
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46eee77d5..99a6806d9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -171,7 +171,9 @@
   <string name="title_activity_nearby">Nearby Places</string>
   <string name="no_nearby">No nearby places found</string>
   <string name="warning">Warning</string>
+  <string name="duplicate_image_found">Duplicate Image Found</string>
   <string name="upload_image_duplicate">This file already destroyed on Commons. Are you sure you want to proceed?</string>
+  <string name="upload">Upload</string>
   <string name="yes">Yes</string>
   <string name="no">No</string>
   <string name="media_detail_title">Title</string>
@@ -250,6 +252,7 @@
   <string name="upload_problem_different_geolocation">This picture was taken at a different location.</string>
   <string name="upload_problem_fbmd">Please only upload pictures that you have taken by yourself. Don\'t upload pictures that you have found on other people\'s Facebook accounts.</string>
   <string name="upload_problem_do_you_continue">Do you still want to upload this picture?</string>
+  <string name="upload_problem_image">Problems found in image</string>
   <string name="internet_downloaded">Please only upload pictures that you have taken by yourself. Don\'t upload pictures that you have downloaded from the Internet.</string>