diff --git a/res/values/strings.xml b/res/values/strings.xml index ac51ee5e59..87d8235aa5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -131,8 +131,14 @@ Message details Transport: %1$s\nSent/Received: %2$s Sender: %1$s\nTransport: %2$s\nSent: %3$s\nReceived: %4$s - Confirm message delete - Are you sure that you want to permanently delete all selected messages? + + Delete selected message? + Delete selected messages? + + + This will permanently delete the selected message. + This will permanently delete all %1$d selected messages. + Save to storage? Saving this media to storage will allow any other apps on your phone to access it.\n\nContinue? Error while saving attachment to storage! @@ -151,8 +157,14 @@ Search... - Delete threads? - Are you sure you wish to delete ALL selected conversation threads? + + Delete selected conversation? + Delete selected conversations? + + + This will permanently delete the selected conversation. + This will permanently delete all %1$d selected conversations. + Deleting Deleting selected threads... diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java index 81fb1c8062..72ebccbf62 100644 --- a/src/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationFragment.java @@ -236,11 +236,17 @@ public class ConversationFragment extends Fragment } private void handleDeleteMessages(final Set messageRecords) { + int messagesCount = messageRecords.size(); AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity()); - builder.setTitle(R.string.ConversationFragment_confirm_message_delete); builder.setIconAttribute(R.attr.dialog_alert_icon); + builder.setTitle(getContext().getResources().getQuantityString( + R.plurals.ConversationFragment_delete_selected_messages, + messagesCount, messagesCount)); + builder.setMessage(getContext().getResources().getQuantityString( + R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, + messagesCount, messagesCount)); builder.setCancelable(true); - builder.setMessage(R.string.ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages); + builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index 646d616464..c603ad2226 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -171,10 +171,15 @@ public class ConversationListFragment extends Fragment } private void handleDeleteAllSelected() { + int conversationsCount = getListAdapter().getBatchSelections().size(); AlertDialogWrapper.Builder alert = new AlertDialogWrapper.Builder(getActivity()); alert.setIconAttribute(R.attr.dialog_alert_icon); - alert.setTitle(R.string.ConversationListFragment_delete_threads_question); - alert.setMessage(R.string.ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads); + alert.setTitle(getContext().getResources().getQuantityString( + R.plurals.ConversationListFragment_delete_selected_conversations, + conversationsCount, conversationsCount)); + alert.setMessage(getContext().getResources().getQuantityString( + R.plurals.ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations, + conversationsCount, conversationsCount)); alert.setCancelable(true); alert.setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() {