Skip to content

Commit 350e95b

Browse files
hudlerrhudlerrr
andauthored
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>
1 parent 7ed9118 commit 350e95b

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,12 @@ public void showMessage(String message, int colorResourceId) {
339339
public void showDuplicatePicturePopup() {
340340
String uploadTitleFormat = getString(R.string.upload_title_duplicate);
341341
DialogUtil.showAlertDialog(getActivity(),
342-
getString(R.string.warning),
342+
getString(R.string.duplicate_image_found),
343343
String.format(Locale.getDefault(),
344344
uploadTitleFormat,
345345
uploadItem.getFileName()),
346+
getString(R.string.upload),
347+
getString(R.string.cancel),
346348
() -> {
347349
uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
348350
onNextButtonClicked();
@@ -355,9 +357,11 @@ public void showBadImagePopup(Integer errorCode) {
355357
String errorMessageForResult = getErrorMessageForResult(getContext(), errorCode);
356358
if (!StringUtils.isBlank(errorMessageForResult)) {
357359
DialogUtil.showAlertDialog(getActivity(),
358-
getString(R.string.warning),
360+
getString(R.string.upload_problem_image),
359361
errorMessageForResult,
360-
() -> {
362+
getString(R.string.upload),
363+
getString(R.string.cancel),
364+
() -> {
361365
uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
362366
onNextButtonClicked();
363367
},

app/src/main/res/values/strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,9 @@
171171
<string name="title_activity_nearby">Nearby Places</string>
172172
<string name="no_nearby">No nearby places found</string>
173173
<string name="warning">Warning</string>
174+
<string name="duplicate_image_found">Duplicate Image Found</string>
174175
<string name="upload_image_duplicate">This file already destroyed on Commons. Are you sure you want to proceed?</string>
176+
<string name="upload">Upload</string>
175177
<string name="yes">Yes</string>
176178
<string name="no">No</string>
177179
<string name="media_detail_title">Title</string>
@@ -250,6 +252,7 @@
250252
<string name="upload_problem_different_geolocation">This picture was taken at a different location.</string>
251253
<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>
252254
<string name="upload_problem_do_you_continue">Do you still want to upload this picture?</string>
255+
<string name="upload_problem_image">Problems found in image</string>
253256
<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>
254257

255258

0 commit comments

Comments
 (0)