Skip to content

Commit 4bc55fc

Browse files
committed
Removed hardcoded strings in DeleteHelper
1 parent cc92773 commit 4bc55fc

File tree

3 files changed

+25
-8
lines changed

3 files changed

+25
-8
lines changed

app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import fr.free.nrw.commons.BuildConfig;
1919
import fr.free.nrw.commons.Media;
20+
import fr.free.nrw.commons.R;
2021
import fr.free.nrw.commons.auth.SessionManager;
2122
import fr.free.nrw.commons.mwapi.MediaWikiApi;
2223
import fr.free.nrw.commons.notification.NotificationHelper;
@@ -161,15 +162,15 @@ public void askReasonAndExecute(Media media,
161162

162163

163164
if (problem == ReviewController.DeleteReason.SPAM) {
164-
reasonList[0] = "A selfie";
165-
reasonList[1] = "Blurry";
166-
reasonList[2] = "Nonsense";
167-
reasonList[3] = "Other";
165+
reasonList[0] = context.getResources().getString(R.string.delete_reason_spam_selfie);
166+
reasonList[1] = context.getResources().getString(R.string.delete_reason_spam_blurry);
167+
reasonList[2] = context.getResources().getString(R.string.delete_reason_spam_nonsense);
168+
reasonList[3] = context.getResources().getString(R.string.delete_reason_spam_other);
168169
} else if (problem == ReviewController.DeleteReason.COPYRIGHT_VIOLATION) {
169-
reasonList[0] = "Press photo";
170-
reasonList[1] = "Random photo from internet";
171-
reasonList[2] = "Logo";
172-
reasonList[3] = "Other";
170+
reasonList[0] = context.getResources().getString(R.string.delete_reason_copyright_pressphoto);
171+
reasonList[1] = context.getResources().getString(R.string.delete_reason_copyright_internetphoto);
172+
reasonList[2] = context.getResources().getString(R.string.delete_reason_copyright_logo);
173+
reasonList[3] = context.getResources().getString(R.string.delete_reason_copyright_other);
173174
}
174175

175176
alert.setMultiChoiceItems(reasonList, checkedItems, (dialogInterface, position, isChecked) -> {

app/src/main/res/values-ru/strings.xml

+8
Original file line numberDiff line numberDiff line change
@@ -547,4 +547,12 @@
547547
<string name="dialog_box_text_nomination">Почему %1$s должно быть удалено?</string>
548548
<string name="review_is_uploaded_by">%1$s загружено с помощью: %2$s</string>
549549
<string name="default_description_language">Язык описаний по умолчанию</string>
550+
<string name="delete_reason_spam_selfie">Селфи</string>
551+
<string name="delete_reason_spam_blurry">Размыто</string>
552+
<string name="delete_reason_spam_nonsense">Ерунда</string>
553+
<string name="delete_reason_spam_other">Другое</string>
554+
<string name="delete_reason_copyright_pressphoto">Фото из прессы</string>
555+
<string name="delete_reason_copyright_internetphoto">Случайное фото из интернета</string>
556+
<string name="delete_reason_copyright_logo">Логотип</string>
557+
<string name="delete_reason_copyright_other">Другое</string>
550558
</resources>

app/src/main/res/values/strings.xml

+8
Original file line numberDiff line numberDiff line change
@@ -560,4 +560,12 @@ Upload your first media by tapping on the add button.</string>
560560
<string name="dialog_box_text_nomination">Why should %1$s be deleted?</string>
561561
<string name="review_is_uploaded_by">%1$s is uploaded by: %2$s</string>
562562
<string name="default_description_language">Default description language</string>
563+
<string name="delete_reason_spam_selfie">A selfie</string>
564+
<string name="delete_reason_spam_blurry">Blurry</string>
565+
<string name="delete_reason_spam_nonsense">Nonsense</string>
566+
<string name="delete_reason_spam_other">Other</string>
567+
<string name="delete_reason_copyright_pressphoto">Press photo</string>
568+
<string name="delete_reason_copyright_internetphoto">Random photo from internet</string>
569+
<string name="delete_reason_copyright_logo">Logo</string>
570+
<string name="delete_reason_copyright_other">Other</string>
563571
</resources>

0 commit comments

Comments
 (0)