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>
commons-app · Mar 25, 2020 · 350e95b · 350e95b
1 parent 7ed9118
commit 350e95b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 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
@@ -339,10 +339,12 @@ public void showMessage(String message, int colorResourceId) {
     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 void showBadImagePopup(Integer errorCode) {
         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
@@ -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>