fixed problems in DeleteHelper.java and strings.xml

Author: Pavel

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

@@ -59,8 +59,7 @@ public DeleteHelper(MediaWikiApi mwApi,
      * @return
      */
     public Single<Boolean> makeDeletion(Context context, Media media, String reason) {
-        viewUtil.showShortToast(context, context.getString(R.string.delete_helper_make_deletion_toast_1)
-                + " " + media.getDisplayTitle() + " " + context.getString(R.string.delete_helper_make_deletion_toast_2));
+        viewUtil.showShortToast(context, context.getString((R.string.delete_helper_make_deletion_toast), media.getDisplayTitle()));
         return Single.fromCallable(() -> delete(media, reason))
                 .flatMap(result -> Single.fromCallable(() ->
                         showDeletionNotification(context, media, result)));
@@ -92,12 +91,12 @@ private boolean delete(Media media, String reason) {
                 reason +
                 " ~~~~";
 
-        String logPageString = "\n{{Commons:Deletion requests" + media.getFilename() +
+        String logPageString = "\n{{Commons:Deletion requests/" + media.getFilename() +
                 "}}\n";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd", Locale.getDefault());
         String date = sdf.format(calendar.getTime());
 
-        String userPageString = "\n" + "{{subst:idw|" + media.getFilename() +
+        String userPageString = "\n{{subst:idw|" + media.getFilename() +
                 "}} ~~~~";
 
         try {
@@ -127,13 +126,11 @@ private boolean showDeletionNotification(Context context, Media media, boolean r
         String title = context.getString(R.string.delete_helper_show_deletion_title);
 
         if (result) {
-            title += ": " + context.getString(R.string.delete_helper_show_deletion_title_if);
-            message = context.getString(R.string.delete_helper_show_deletion_message_if_1)+ " "
-                    + media.getDisplayTitle() + " "
-                    + context.getString(R.string.delete_helper_show_deletion_message_if_2) + ".";
+            title += ": " + context.getString(R.string.delete_helper_show_deletion_title_success);
+            message = context.getString((R.string.delete_helper_show_deletion_message_if),media.getDisplayTitle());
         } else {
-            title += ": " + context.getString(R.string.delete_helper_show_deletion_title_else);
-            message = context.getString(R.string.delete_helper_show_deletion_message_else) + ".";
+            title += ": " + context.getString(R.string.delete_helper_show_deletion_title_failed);
+            message = context.getString(R.string.delete_helper_show_deletion_message_else) ;
         }
 
         String urlForDelete = BuildConfig.COMMONS_URL + "/wiki/Commons:Deletion_requests/" + media.getFilename();

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

@@ -560,16 +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_helper_make_deletion_toast_1">Trying to nominate</string>
-  <string name="delete_helper_make_deletion_toast_2">for deletion </string>
-  <string name="delete_helper_delete_summary_1">Nominating</string>
-  <string name="delete_helper_delete_summary_2">for deletion.</string>
-  <string name="delete_helper_show_deletion_title">Nominating for Deletion</string>
-  <string name="delete_helper_show_deletion_title_if">Success</string>
-  <string name="delete_helper_show_deletion_message_if_1">Successfully nominated</string>
-  <string name="delete_helper_show_deletion_message_if_2">for deletion</string>
-  <string name="delete_helper_show_deletion_title_else">Failed</string>
-  <string name="delete_helper_show_deletion_message_else">Could not request deletion</string>
+  <string name="delete_helper_make_deletion_toast">Trying to nominate %1$s for deletion</string>
+  <string name="delete_helper_show_deletion_title">Nominating for deletion</string>
+  <string name="delete_helper_show_deletion_title_success">Success</string>
+  <string name="delete_helper_show_deletion_message_if">Successfully nominated %1$s for deletion.</string>
+  <string name="delete_helper_show_deletion_title_failed">Failed</string>
+  <string name="delete_helper_show_deletion_message_else">Could not request deletion.</string>
   <string name="delete_helper_ask_spam_selfie">A selfie</string>
   <string name="delete_helper_ask_spam_blurry">Blurry</string>
   <string name="delete_helper_ask_spam_nonsense">Nonsense</string>