Skip to content

Commit 9a8caa3

Browse files
PavelAplevichPavelAplevich
committed
Correction DeleteHelper and string.xml
1 parent 5895cc8 commit 9a8caa3

File tree

2 files changed

+36
-37
lines changed

2 files changed

+36
-37
lines changed

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

+21-20
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public DeleteHelper(MediaWikiApi mwApi,
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)
6363
+ " " + media.getDisplayTitle() + " " + context.getString(R.string.delete_helper_make_deletion_toast_2));
64-
return Single.fromCallable(() -> delete(context, media, reason))
64+
return Single.fromCallable(() -> delete(media, reason))
6565
.flatMap(result -> Single.fromCallable(() ->
6666
showDeletionNotification(context, media, result)));
6767
}
@@ -72,7 +72,7 @@ public Single<Boolean> makeDeletion(Context context, Media media, String reason)
7272
* @param reason
7373
* @return
7474
*/
75-
private boolean delete(Context context, Media media, String reason) {
75+
private boolean delete(Media media, String reason) {
7676
String editToken;
7777
String authCookie;
7878
String summary = "Nominating " + media.getFilename() + " for deletion.";
@@ -92,7 +92,7 @@ private boolean delete(Context context, Media media, String reason) {
9292
reason +
9393
" ~~~~";
9494

95-
String logPageString = "\n" + "{{Commons:Deletion requests" + media.getFilename() +
95+
String logPageString = "\n{{Commons:Deletion requests" + media.getFilename() +
9696
"}}\n";
9797
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd", Locale.getDefault());
9898
String date = sdf.format(calendar.getTime());
@@ -124,15 +124,16 @@ private boolean delete(Context context, Media media, String reason) {
124124

125125
private boolean showDeletionNotification(Context context, Media media, boolean result) {
126126
String message;
127-
String title = context.getString(R.string.delete_helper_show_deletion_notification_title);
127+
String title = context.getString(R.string.delete_helper_show_deletion_title);
128128

129129
if (result) {
130-
title += context.getString(R.string.delete_helper_show_deletion_notification_title_if);
131-
message = context.getString(R.string.delete_helper_show_deletion_notification_message_if_1)+ " "
132-
+ media.getDisplayTitle() + context.getString(R.string.delete_helper_show_deletion_notification_message_if_2);
130+
title += ": " + context.getString(R.string.delete_helper_show_deletion_title_if);
131+
message = context.getString(R.string.delete_helper_show_deletion_message_if_1)+ " "
132+
+ media.getDisplayTitle() + ": "
133+
+ context.getString(R.string.delete_helper_show_deletion_message_if_2) + ".";
133134
} else {
134-
title += context.getString(R.string.delete_helper_show_deletion_notification_title_else);
135-
message = context.getString(R.string.delete_helper_show_deletion_notification_message_else);
135+
title += ": " + context.getString(R.string.delete_helper_show_deletion_title_else);
136+
message = context.getString(R.string.delete_helper_show_deletion_message_else) + ".";
136137
}
137138

138139
String urlForDelete = BuildConfig.COMMONS_URL + "/wiki/Commons:Deletion_requests/" + media.getFilename();
@@ -164,15 +165,15 @@ public void askReasonAndExecute(Media media,
164165

165166

166167
if (problem == ReviewController.DeleteReason.SPAM) {
167-
reasonList[0] = context.getString(R.string.delete_helper_ask_reason_and_execute_reason_spam_selfie);
168-
reasonList[1] = context.getString(R.string.delete_helper_ask_reason_and_execute_reason_spam_blurry);
169-
reasonList[2] = context.getString(R.string.delete_helper_ask_reason_and_execute_reason_spam_nonsense);
170-
reasonList[3] = context.getString(R.string.delete_helper_ask_reason_and_execute_reason_spam_other);
168+
reasonList[0] = context.getString(R.string.delete_helper_ask_spam_selfie);
169+
reasonList[1] = context.getString(R.string.delete_helper_ask_spam_blurry);
170+
reasonList[2] = context.getString(R.string.delete_helper_ask_spam_nonsense);
171+
reasonList[3] = context.getString(R.string.delete_helper_ask_spam_other);
171172
} else if (problem == ReviewController.DeleteReason.COPYRIGHT_VIOLATION) {
172-
reasonList[0] = context.getString(R.string.delete_helper_ask_reason_and_execute_reason_copyright_press_photo);
173-
reasonList[1] = context.getString(R.string.delete_helper_ask_reason_and_execute_reason_copyright_internet_photo);
174-
reasonList[2] = context.getString(R.string.delete_helper_ask_reason_and_execute_reason_copyright_logo);
175-
reasonList[3] = context.getString(R.string.delete_helper_ask_reason_and_execute_reason_copyright_other);
173+
reasonList[0] = context.getString(R.string.delete_helper_ask_reason_copyright_press_photo);
174+
reasonList[1] = context.getString(R.string.delete_helper_ask_reason_copyright_internet_photo);
175+
reasonList[2] = context.getString(R.string.delete_helper_ask_reason_copyright_logo);
176+
reasonList[3] = context.getString(R.string.delete_helper_ask_reason_copyright_other);
176177
}
177178

178179
alert.setMultiChoiceItems(reasonList, checkedItems, (dialogInterface, position, isChecked) -> {
@@ -183,9 +184,9 @@ public void askReasonAndExecute(Media media,
183184
}
184185
});
185186

186-
alert.setPositiveButton(context.getString(R.string.delete_helper_ask_reason_and_execute_alert_set_positive_button), (dialogInterface, i) -> {
187+
alert.setPositiveButton(context.getString(R.string.ok), (dialogInterface, i) -> {
187188

188-
String reason = context.getString(R.string.delete_helper_ask_reason_and_execute_alert_set_positive_button_reason) + " ";
189+
String reason = context.getString(R.string.delete_helper_ask_alert_set_positive_button_reason) + " ";
189190
for (int j = 0; j < mUserReason.size(); j++) {
190191
reason = reason + reasonList[mUserReason.get(j)];
191192
if (j != mUserReason.size() - 1) {
@@ -205,7 +206,7 @@ public void askReasonAndExecute(Media media,
205206
});
206207

207208
});
208-
alert.setNegativeButton(context.getString(R.string.delete_helper_ask_reason_and_execute_alert_set_negative_button), (dialog, which) -> reviewCallback.onFailure());
209+
alert.setNegativeButton(context.getString(R.string.cancel), (dialog, which) -> reviewCallback.onFailure());
209210
AlertDialog d = alert.create();
210211
d.show();
211212
}

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

+15-17
Original file line numberDiff line numberDiff line change
@@ -564,21 +564,19 @@ Upload your first media by tapping on the add button.</string>
564564
<string name="delete_helper_make_deletion_toast_2">for deletion </string>
565565
<string name="delete_helper_delete_summary_1">Nominating</string>
566566
<string name="delete_helper_delete_summary_2">for deletion.</string>
567-
<string name="delete_helper_show_deletion_notification_title">Nominating for Deletion</string>
568-
<string name="delete_helper_show_deletion_notification_title_if">: Success</string>
569-
<string name="delete_helper_show_deletion_notification_message_if_1">Successfully nominated</string>
570-
<string name="delete_helper_show_deletion_notification_message_if_2">: deletion.</string>
571-
<string name="delete_helper_show_deletion_notification_title_else">: Failed</string>
572-
<string name="delete_helper_show_deletion_notification_message_else">Could not request deletion.</string>
573-
<string name="delete_helper_ask_reason_and_execute_reason_spam_selfie">A selfie</string>
574-
<string name="delete_helper_ask_reason_and_execute_reason_spam_blurry">Blurry</string>
575-
<string name="delete_helper_ask_reason_and_execute_reason_spam_nonsense">Nonsense</string>
576-
<string name="delete_helper_ask_reason_and_execute_reason_spam_other">Other</string>
577-
<string name="delete_helper_ask_reason_and_execute_reason_copyright_press_photo">Press photo</string>
578-
<string name="delete_helper_ask_reason_and_execute_reason_copyright_internet_photo">Random photo from internet</string>
579-
<string name="delete_helper_ask_reason_and_execute_reason_copyright_logo">Logo</string>
580-
<string name="delete_helper_ask_reason_and_execute_reason_copyright_other">Other</string>
581-
<string name="delete_helper_ask_reason_and_execute_alert_set_positive_button">Ok</string>
582-
<string name="delete_helper_ask_reason_and_execute_alert_set_positive_button_reason">Because it is</string>
583-
<string name="delete_helper_ask_reason_and_execute_alert_set_negative_button">Cancel</string>
567+
<string name="delete_helper_show_deletion_title">Nominating for Deletion</string>
568+
<string name="delete_helper_show_deletion_title_if">Success</string>
569+
<string name="delete_helper_show_deletion_message_if_1">Successfully nominated</string>
570+
<string name="delete_helper_show_deletion_message_if_2">deletion</string>
571+
<string name="delete_helper_show_deletion_title_else">Failed</string>
572+
<string name="delete_helper_show_deletion_message_else">Could not request deletion</string>
573+
<string name="delete_helper_ask_spam_selfie">A selfie</string>
574+
<string name="delete_helper_ask_spam_blurry">Blurry</string>
575+
<string name="delete_helper_ask_spam_nonsense">Nonsense</string>
576+
<string name="delete_helper_ask_spam_other">Other</string>
577+
<string name="delete_helper_ask_reason_copyright_press_photo">Press photo</string>
578+
<string name="delete_helper_ask_reason_copyright_internet_photo">Random photo from internet</string>
579+
<string name="delete_helper_ask_reason_copyright_logo">Logo</string>
580+
<string name="delete_helper_ask_reason_copyright_other">Other</string>
581+
<string name="delete_helper_ask_alert_set_positive_button_reason">Because it is</string>
584582
</resources>

0 commit comments

Comments
 (0)