mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixes #3494 (#3519)

Browse source 
* 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>
This commit is contained in:
hudlerr 2020-03-25 13:38:12 +00:00 • committed by GitHub
parent 7ed911808d
commit 350e95b56a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -339,10 +339,12 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
public void showDuplicatePicturePopup() { public void showDuplicatePicturePopup() {
String uploadTitleFormat = getString(R.string.upload_title_duplicate); String uploadTitleFormat = getString(R.string.upload_title_duplicate);
DialogUtil.showAlertDialog(getActivity(), DialogUtil.showAlertDialog(getActivity(),
getString(R.string.warning), getString(R.string.duplicate_image_found),
String.format(Locale.getDefault(), String.format(Locale.getDefault(),
uploadTitleFormat, uploadTitleFormat,
uploadItem.getFileName()), uploadItem.getFileName()),
getString(R.string.upload),
getString(R.string.cancel),
() -> { () -> {
uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP); uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
onNextButtonClicked(); onNextButtonClicked();
@ -355,8 +357,10 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
String errorMessageForResult = getErrorMessageForResult(getContext(), errorCode); String errorMessageForResult = getErrorMessageForResult(getContext(), errorCode);
if (!StringUtils.isBlank(errorMessageForResult)) { if (!StringUtils.isBlank(errorMessageForResult)) {
DialogUtil.showAlertDialog(getActivity(), DialogUtil.showAlertDialog(getActivity(),
getString(R.string.warning), getString(R.string.upload_problem_image),
errorMessageForResult, errorMessageForResult,
getString(R.string.upload),
getString(R.string.cancel),
() -> { () -> {
uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP); uploadItem.setImageQuality(ImageUtils.IMAGE_KEEP);
onNextButtonClicked(); onNextButtonClicked();

3
app/src/main/res/values/strings.xml
View file

@ -171,7 +171,9 @@
<string name="title_activity_nearby">Nearby Places</string> <string name="title_activity_nearby">Nearby Places</string>
<string name="no_nearby">No nearby places found</string> <string name="no_nearby">No nearby places found</string>
<string name="warning">Warning</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_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="yes">Yes</string>
<string name="no">No</string> <string name="no">No</string>
<string name="media_detail_title">Title</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_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_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_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> <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>