Skip to content

Fixes #3494 #3519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 25, 2020
+10 −3
Merged

Fixes #3494 #3519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d24c22
better names for the upload warning dialog buttons #3494
hudlerrr Mar 15, 2020
a0ca8be
Dialog button pt2
hudlerrr Mar 20, 2020
c8ce32d
dialog buttons pt3
hudlerrr Mar 20, 2020
9362c23
resolve conflict
hudlerrr Mar 20, 2020
797cf23
round 4..
hudlerrr Mar 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,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();
Expand All @@ -366,9 +368,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();
},
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>


Expand Down