Skip to content

Commit 5b67f87

Browse files
PavelAplevichPavelAplevich
committed
Correction strings in DeleteHelper
1 parent f2ca935 commit 5b67f87

File tree

2 files changed

+21
-32
lines changed

2 files changed

+21
-32
lines changed

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

+15-16
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public DeleteHelper(MediaWikiApi mwApi,
6060
*/
6161
public Single<Boolean> makeDeletion(Context context, Media media, String reason) {
6262
viewUtil.showShortToast(context, context.getString(R.string.delete_helper_make_deletion_toast_1)
63-
+ media.getDisplayTitle() + context.getString(R.string.delete_helper_make_deletion_toast_2));
63+
+ " " + media.getDisplayTitle() + " " + context.getString(R.string.delete_helper_make_deletion_toast_2));
6464
return Single.fromCallable(() -> delete(context, media, reason))
6565
.flatMap(result -> Single.fromCallable(() ->
6666
showDeletionNotification(context, media, result)));
@@ -75,30 +75,29 @@ public Single<Boolean> makeDeletion(Context context, Media media, String reason)
7575
private boolean delete(Context context, Media media, String reason) {
7676
String editToken;
7777
String authCookie;
78-
String summary = context.getString(R.string.delete_helper_delete_summary_1)
79-
+ media.getFilename() + context.getString(R.string.delete_helper_delete_summary_2);
78+
String summary = "Nominating " + media.getFilename() + " for deletion.";
8079

8180
authCookie = sessionManager.getAuthCookie();
8281
mwApi.setAuthCookie(authCookie);
8382

8483
Calendar calendar = Calendar.getInstance();
85-
String fileDeleteString = context.getString(R.string.delete_helper_delete_file_delete_string_1) + reason +
86-
context.getString(R.string.delete_helper_delete_file_delete_string_2) + media.getFilename() +
87-
context.getString(R.string.delete_helper_delete_file_delete_string_3) + calendar.get(Calendar.DAY_OF_MONTH) +
88-
context.getString(R.string.delete_helper_delete_file_delete_string_4) + calendar.getDisplayName(Calendar.MONTH, Calendar.LONG, Locale.getDefault()) +
89-
context.getString(R.string.delete_helper_delete_file_delete_string_5) + calendar.get(Calendar.YEAR) +
84+
String fileDeleteString = "{{delete|reason=" + reason +
85+
"|subpage=" + media.getFilename() +
86+
"|day=" + calendar.get(Calendar.DAY_OF_MONTH) +
87+
"|month=" + calendar.getDisplayName(Calendar.MONTH, Calendar.LONG, Locale.getDefault()) +
88+
"|year=" + calendar.get(Calendar.YEAR) +
9089
"}}";
9190

9291
String subpageString = "=== [[:" + media.getFilename() + "]] ===\n" +
9392
reason +
9493
" ~~~~";
9594

96-
String logPageString = "\n" + context.getString(R.string.delete_helper_delete_log_page_string) + media.getFilename() +
95+
String logPageString = "\n" + "{{Commons:Deletion requests" + media.getFilename() +
9796
"}}\n";
9897
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd", Locale.getDefault());
9998
String date = sdf.format(calendar.getTime());
10099

101-
String userPageString = "\n" + context.getString(R.string.delete_helper_delete_user_page_string) + media.getFilename() +
100+
String userPageString = "\n" + "{{subst:idw|" + media.getFilename() +
102101
"}} ~~~~";
103102

104103
try {
@@ -111,11 +110,11 @@ private boolean delete(Context context, Media media, String reason) {
111110
mwApi.prependEdit(editToken, fileDeleteString + "\n",
112111
media.getFilename(), summary);
113112
mwApi.edit(editToken, subpageString + "\n",
114-
context.getString(R.string.delete_helper_delete_try_commons) + media.getFilename(), summary);
113+
"Commons:Deletion_requests/" + media.getFilename(), summary);
115114
mwApi.appendEdit(editToken, logPageString + "\n",
116-
context.getString(R.string.delete_helper_delete_try_commons) + date, summary);
115+
"Commons:Deletion_requests/" + date, summary);
117116
mwApi.appendEdit(editToken, userPageString + "\n",
118-
context.getString(R.string.delete_helper_delete_try_talk) + media.getCreator(), summary);
117+
"User_Talk:" + media.getCreator(), summary);
119118
} catch (Exception e) {
120119
Timber.e(e);
121120
return false;
@@ -129,14 +128,14 @@ private boolean showDeletionNotification(Context context, Media media, boolean r
129128

130129
if (result) {
131130
title += context.getString(R.string.delete_helper_show_deletion_notification_title_if);
132-
message = context.getString(R.string.delete_helper_show_deletion_notification_message_if_1)
131+
message = context.getString(R.string.delete_helper_show_deletion_notification_message_if_1)+ " "
133132
+ media.getDisplayTitle() + context.getString(R.string.delete_helper_show_deletion_notification_message_if_2);
134133
} else {
135134
title += context.getString(R.string.delete_helper_show_deletion_notification_title_else);
136135
message = context.getString(R.string.delete_helper_show_deletion_notification_message_else);
137136
}
138137

139-
String urlForDelete = BuildConfig.COMMONS_URL + context.getString(R.string.delete_helper_show_deletion_notification_url_for_delete) + media.getFilename();
138+
String urlForDelete = BuildConfig.COMMONS_URL + "/wiki/Commons:Deletion_requests/" + media.getFilename();
140139
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(urlForDelete));
141140
notificationHelper.showNotification(context, title, message, NOTIFICATION_DELETE, browserIntent);
142141
return result;
@@ -186,7 +185,7 @@ public void askReasonAndExecute(Media media,
186185

187186
alert.setPositiveButton(context.getString(R.string.delete_helper_ask_reason_and_execute_alert_set_positive_button), (dialogInterface, i) -> {
188187

189-
String reason = context.getString(R.string.delete_helper_ask_reason_and_execute_alert_set_positive_button_reason);
188+
String reason = context.getString(R.string.delete_helper_ask_reason_and_execute_alert_set_positive_button_reason) + " ";
190189
for (int j = 0; j < mUserReason.size(); j++) {
191190
reason = reason + reasonList[mUserReason.get(j)];
192191
if (j != mUserReason.size() - 1) {

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

+6-16
Original file line numberDiff line numberDiff line change
@@ -560,26 +560,16 @@ 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_helper_make_deletion_toast_1">Trying to nominate\u0020</string>
564-
<string name="delete_helper_make_deletion_toast_2">\u0020for deletion </string>
565-
<string name="delete_helper_delete_summary_1">Nominating\u0020</string>
566-
<string name="delete_helper_delete_summary_2">\u0020for deletion.</string>
567-
<string name="delete_helper_delete_file_delete_string_1">{{delete|reason=</string>
568-
<string name="delete_helper_delete_file_delete_string_2">|subpage=</string>
569-
<string name="delete_helper_delete_file_delete_string_3">|day=</string>
570-
<string name="delete_helper_delete_file_delete_string_4">|month=</string>
571-
<string name="delete_helper_delete_file_delete_string_5">|year=</string>
572-
<string name="delete_helper_delete_log_page_string">{{Commons:Deletion requests/</string>
573-
<string name="delete_helper_delete_user_page_string">{{subst:idw|</string>
574-
<string name="delete_helper_delete_try_commons">Commons:Deletion_requests/</string>
575-
<string name="delete_helper_delete_try_talk">User_Talk:</string>
563+
<string name="delete_helper_make_deletion_toast_1">Trying to nominate</string>
564+
<string name="delete_helper_make_deletion_toast_2">for deletion </string>
565+
<string name="delete_helper_delete_summary_1">Nominating</string>
566+
<string name="delete_helper_delete_summary_2">for deletion.</string>
576567
<string name="delete_helper_show_deletion_notification_title">Nominating for Deletion</string>
577568
<string name="delete_helper_show_deletion_notification_title_if">: Success</string>
578-
<string name="delete_helper_show_deletion_notification_message_if_1">Successfully nominated\u0020</string>
569+
<string name="delete_helper_show_deletion_notification_message_if_1">Successfully nominated</string>
579570
<string name="delete_helper_show_deletion_notification_message_if_2">: deletion.</string>
580571
<string name="delete_helper_show_deletion_notification_title_else">: Failed</string>
581572
<string name="delete_helper_show_deletion_notification_message_else">Could not request deletion.</string>
582-
<string name="delete_helper_show_deletion_notification_url_for_delete">/wiki/Commons:Deletion_requests/</string>
583573
<string name="delete_helper_ask_reason_and_execute_reason_spam_selfie">A selfie</string>
584574
<string name="delete_helper_ask_reason_and_execute_reason_spam_blurry">Blurry</string>
585575
<string name="delete_helper_ask_reason_and_execute_reason_spam_nonsense">Nonsense</string>
@@ -589,6 +579,6 @@ Upload your first media by tapping on the add button.</string>
589579
<string name="delete_helper_ask_reason_and_execute_reason_copyright_logo">Logo</string>
590580
<string name="delete_helper_ask_reason_and_execute_reason_copyright_other">Other</string>
591581
<string name="delete_helper_ask_reason_and_execute_alert_set_positive_button">Ok</string>
592-
<string name="delete_helper_ask_reason_and_execute_alert_set_positive_button_reason">Because it is\u0020</string>
582+
<string name="delete_helper_ask_reason_and_execute_alert_set_positive_button_reason">Because it is</string>
593583
<string name="delete_helper_ask_reason_and_execute_alert_set_negative_button">Cancel</string>
594584
</resources>

0 commit comments

Comments
 (0)