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

Fix #2134: Remove formatting characters from upload_problem strings (#2135)

Browse source
This commit is contained in:
sp2710 2018-12-17 06:10:24 +05:30 • committed by Adam Jones
parent e09ce41df3
commit 102b2d7e56
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.java
View file

@ -236,22 +236,22 @@ public class ImageUtils {
errorMessage.append(context.getResources().getString(R.string.upload_problem_exist));
if ((IMAGE_DARK & result) != 0 ) { // We are checking image dark bit to see if that bit is set or not
errorMessage.append(context.getResources().getString(R.string.upload_problem_image_dark));
errorMessage.append("\n - ").append(context.getResources().getString(R.string.upload_problem_image_dark));
}
if ((IMAGE_BLURRY & result) != 0 ) {
errorMessage.append(context.getResources().getString(R.string.upload_image_problem_blurry));
errorMessage.append("\n - ").append(context.getResources().getString(R.string.upload_image_problem_blurry));
}
if ((IMAGE_DUPLICATE & result) != 0 ) {
errorMessage.append(context.getResources().getString(R.string.upload_problem_image_duplicate));
errorMessage.append("\n - ").append(context.getResources().getString(R.string.upload_problem_image_duplicate));
}
if ((IMAGE_GEOLOCATION_DIFFERENT & result) != 0 ) {
errorMessage.append(context.getResources().getString(R.string.upload_problem_different_geolocation));
errorMessage.append("\n - ").append(context.getResources().getString(R.string.upload_problem_different_geolocation));
}
errorMessage.append(context.getResources().getString(R.string.upload_problem_do_you_continue));
errorMessage.append("\n\n").append(context.getResources().getString(R.string.upload_problem_do_you_continue));
}
return errorMessage.toString();

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

@ -237,11 +237,11 @@
<string name="upload_image_blurry">This picture is blurry, are you sure you want to upload it? Wikimedia Commons is only for pictures with encyclopedic value.</string>
<string name="upload_problem_exist">Potential problems with this image:</string>
<string name="upload_problem_image_dark">\n - Image is too dark.</string>
<string name="upload_problem_image_blurry">\n - Image is blurry.</string>
<string name="upload_problem_image_duplicate">\n - Image is already on Commons.</string>
<string name="upload_problem_different_geolocation">\n - This picture was taken at a different location.</string>
<string name="upload_problem_do_you_continue">\n\nDo you still want to upload this picture?</string>
<string name="upload_problem_image_dark">Image is too dark.</string>
<string name="upload_problem_image_blurry">Image is blurry.</string>
<string name="upload_problem_image_duplicate">Image is already on Commons.</string>
<string name="upload_problem_different_geolocation">This picture was taken at a different location.</string>
<string name="upload_problem_do_you_continue">Do you still want to upload this picture?</string>
<string name="give_permission">Give permission</string>
<string name="use_external_storage">Use external storage</string>