Skip to content

Removed formatting characters from upload_problem strings(#2134) #2135

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 1 commit into from
Dec 17, 2018
Merged

Removed formatting characters from upload_problem strings(#2134) #2135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 5 deletions app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,22 +236,22 @@ public static String getErrorMessageForResult(Context context, @Result int resul
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();
Expand Down
10 changes: 5 additions & 5 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 @@ -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>
Expand Down