Update recycle bin related strings
This commit is contained in:
parent
3f06b521bf
commit
565f991932
56 changed files with 341 additions and 11 deletions
|
|
@ -90,7 +90,7 @@ class RecycleBinConversationsActivity : SimpleActivity() {
|
|||
}
|
||||
|
||||
private fun removeAll() {
|
||||
ConfirmationDialog(this, "", R.string.empty_recycle_bin_confirmation, R.string.yes, R.string.no) {
|
||||
ConfirmationDialog(this, "", R.string.empty_recycle_bin_messages_confirmation, R.string.yes, R.string.no) {
|
||||
ensureBackgroundThread {
|
||||
emptyMessagesRecycleBin()
|
||||
loadRecycleBinConversations()
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ class SettingsActivity : SimpleActivity() {
|
|||
if (recycleBinMessages == 0) {
|
||||
toast(R.string.recycle_bin_empty)
|
||||
} else {
|
||||
ConfirmationDialog(this, "", R.string.empty_recycle_bin_confirmation, R.string.yes, R.string.no) {
|
||||
ConfirmationDialog(this, "", R.string.empty_recycle_bin_messages_confirmation, R.string.yes, R.string.no) {
|
||||
ensureBackgroundThread {
|
||||
emptyMessagesRecycleBin()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -952,7 +952,7 @@ class ThreadActivity : SimpleActivity() {
|
|||
}
|
||||
|
||||
private fun askConfirmRestoreAll() {
|
||||
ConfirmationDialog(this, "Restore all messages from this conversation?") {
|
||||
ConfirmationDialog(this, getString(R.string.restore_confirmation)) {
|
||||
ensureBackgroundThread {
|
||||
restoreAllMessagesFromRecycleBinForConversation(threadId)
|
||||
runOnUiThread {
|
||||
|
|
|
|||
|
|
@ -63,7 +63,8 @@ class RecycleBinConversationsAdapter(
|
|||
val itemsCnt = selectedKeys.size
|
||||
val items = resources.getQuantityString(R.plurals.delete_conversations, itemsCnt, itemsCnt)
|
||||
|
||||
val question = String.format("Are you sure you want to restore %s?", items)
|
||||
val baseString = R.string.restore_confirmation
|
||||
val question = String.format(resources.getString(baseString), items)
|
||||
|
||||
ConfirmationDialog(activity, question) {
|
||||
ensureBackgroundThread {
|
||||
|
|
|
|||
|
|
@ -232,8 +232,8 @@ class ThreadAdapter(
|
|||
return
|
||||
}
|
||||
|
||||
val baseString = R.string.deletion_confirmation
|
||||
val question = String.format("Are you sure you want to restore %s?", items)
|
||||
val baseString = R.string.restore_confirmation
|
||||
val question = String.format(resources.getString(baseString), items)
|
||||
|
||||
ConfirmationDialog(activity, question) {
|
||||
ensureBackgroundThread {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue