mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-23 13:35:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1495 from nextcloud/feature/noid/unify-clear-history-strings

Browse source 
Unify strings for clearing chat over all platforms
This commit is contained in:
Andy Scherzinger 2021-07-22 13:03:04 +02:00 committed by GitHub
commit 78b6da6205
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
View file

@ -504,7 +504,7 @@ class ConversationInfoController(args: Bundle) :
.setPositiveButtonColor(context!!.resources.getColor(R.color.nc_darkRed)) .setPositiveButtonColor(context!!.resources.getColor(R.color.nc_darkRed))
.setTitle(R.string.nc_clear_history) .setTitle(R.string.nc_clear_history)
.setMessage(R.string.nc_clear_history_warning) .setMessage(R.string.nc_clear_history_warning)
.setPositiveButton(R.string.nc_delete) { clearHistory() } .setPositiveButton(R.string.nc_delete_all) { clearHistory() }
.setNegativeButton(R.string.nc_cancel, null) .setNegativeButton(R.string.nc_cancel, null)
.setInstanceStateHandler(ID_CLEAR_CHAT_DIALOG, saveStateHandler!!) .setInstanceStateHandler(ID_CLEAR_CHAT_DIALOG, saveStateHandler!!)
.setSavedInstanceState(savedInstanceState) .setSavedInstanceState(savedInstanceState)

7
app/src/main/res/values/strings.xml
View file

@ -167,9 +167,9 @@
<string name="nc_start_conversation">Start a conversation</string> <string name="nc_start_conversation">Start a conversation</string>
<string name="nc_configure_room">Configure conversation</string> <string name="nc_configure_room">Configure conversation</string>
<string name="nc_leave">Leave conversation</string> <string name="nc_leave">Leave conversation</string>
<string name="nc_clear_history">Clear history</string> <string name="nc_clear_history">Delete all messages</string>
<string name="nc_clear_history_warning">The chat history will be deleted.</string> <string name="nc_clear_history_warning">Do you really want to delete all messages in this conversation?</string>
<string name="nc_clear_history_success">Chat history was cleared</string> <string name="nc_clear_history_success">All messages were deleted</string>
<string name="nc_rename">Rename conversation</string> <string name="nc_rename">Rename conversation</string>
<string name="nc_set_password">Set a password</string> <string name="nc_set_password">Set a password</string>
<string name="nc_change_password">Change password</string> <string name="nc_change_password">Change password</string>
@ -180,6 +180,7 @@
<string name="nc_make_call_private">Make conversation private</string> <string name="nc_make_call_private">Make conversation private</string>
<string name="nc_delete_call">Delete conversation</string> <string name="nc_delete_call">Delete conversation</string>
<string name="nc_delete">Delete</string> <string name="nc_delete">Delete</string>
<string name="nc_delete_all">Delete all</string>
<string name="nc_delete_conversation_more">If you delete the conversation, it will also be deleted for all other participants.</string> <string name="nc_delete_conversation_more">If you delete the conversation, it will also be deleted for all other participants.</string>
<string name="nc_new_conversation">New conversation</string> <string name="nc_new_conversation">New conversation</string>