Removed hardcoded strings in DeleteHelper

VitalyVPinchuk · Jul 1, 2019 · 4bc55fc · 4bc55fc
1 parent cc92773
commit 4bc55fc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java b/app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java
@@ -17,6 +17,7 @@
 
 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 void askReasonAndExecute(Media media,
 
 
         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) -> {

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -547,4 +547,12 @@
   <string name="dialog_box_text_nomination">Почему %1$s должно быть удалено?</string>
   <string name="review_is_uploaded_by">%1$s загружено с помощью: %2$s</string>
   <string name="default_description_language">Язык описаний по умолчанию</string>
+  <string name="delete_reason_spam_selfie">Селфи</string>
+  <string name="delete_reason_spam_blurry">Размыто</string>
+  <string name="delete_reason_spam_nonsense">Ерунда</string>
+  <string name="delete_reason_spam_other">Другое</string>
+  <string name="delete_reason_copyright_pressphoto">Фото из прессы</string>
+  <string name="delete_reason_copyright_internetphoto">Случайное фото из интернета</string>
+  <string name="delete_reason_copyright_logo">Логотип</string>
+  <string name="delete_reason_copyright_other">Другое</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -560,4 +560,12 @@ Upload your first media by tapping on the add button.</string>
   <string name="dialog_box_text_nomination">Why should %1$s be deleted?</string>
   <string name="review_is_uploaded_by">%1$s is uploaded by: %2$s</string>
   <string name="default_description_language">Default description language</string>
+  <string name="delete_reason_spam_selfie">A selfie</string>
+  <string name="delete_reason_spam_blurry">Blurry</string>
+  <string name="delete_reason_spam_nonsense">Nonsense</string>
+  <string name="delete_reason_spam_other">Other</string>
+  <string name="delete_reason_copyright_pressphoto">Press photo</string>
+  <string name="delete_reason_copyright_internetphoto">Random photo from internet</string>
+  <string name="delete_reason_copyright_logo">Logo</string>
+  <string name="delete_reason_copyright_other">Other</string>
 </resources>