Merge remote-tracking branch 'upstream/master' into refactorNearbyClassesMVP

This commit is contained in:
neslihanturan 2019-07-03 14:17:26 +03:00
commit e0464fa84d
2 changed files with 17 additions and 8 deletions

View file

@ -17,6 +17,7 @@ import javax.inject.Singleton;
import fr.free.nrw.commons.BuildConfig;
import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.mwapi.MediaWikiApi;
import fr.free.nrw.commons.notification.NotificationHelper;
@ -161,15 +162,15 @@ public class DeleteHelper {
if (problem == ReviewController.DeleteReason.SPAM) {
reasonList[0] = "A selfie";
reasonList[1] = "Blurry";
reasonList[2] = "Nonsense";
reasonList[3] = "Other";
reasonList[0] = context.getResources().getString(R.string.delete_reason_spam_selfie);
reasonList[1] = context.getResources().getString(R.string.delete_reason_spam_blurry);
reasonList[2] = context.getResources().getString(R.string.delete_reason_spam_nonsense);
reasonList[3] = context.getResources().getString(R.string.delete_reason_spam_other);
} else if (problem == ReviewController.DeleteReason.COPYRIGHT_VIOLATION) {
reasonList[0] = "Press photo";
reasonList[1] = "Random photo from internet";
reasonList[2] = "Logo";
reasonList[3] = "Other";
reasonList[0] = context.getResources().getString(R.string.delete_reason_copyright_pressphoto);
reasonList[1] = context.getResources().getString(R.string.delete_reason_copyright_internetphoto);
reasonList[2] = context.getResources().getString(R.string.delete_reason_copyright_logo);
reasonList[3] = context.getResources().getString(R.string.delete_reason_copyright_other);
}
alert.setMultiChoiceItems(reasonList, checkedItems, (dialogInterface, position, isChecked) -> {