From 07c802c9766f95aeb4c00760ae8e13aa9bf77ed4 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Wed, 1 Jul 2020 22:53:54 +0300 Subject: [PATCH] Update strings used for ephemeral messages - For chat menu item, use already translated auto-delete string. - For experimental setting, use untranslatable hard-coded string. - Introduce a new translatable string for ephemeral dialog title --- res/menu/conversation.xml | 2 +- res/values/strings.xml | 2 +- res/xml/preferences_advanced.xml | 2 +- src/org/thoughtcrime/securesms/EphemeralMessagesDialog.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/menu/conversation.xml b/res/menu/conversation.xml index 5320e8407..38d34cd6d 100644 --- a/res/menu/conversation.xml +++ b/res/menu/conversation.xml @@ -40,7 +40,7 @@ app:showAsAction="ifRoom" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 96180cd1e..591b6bb68 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -476,7 +476,7 @@ Reliable background connection Requires a permanent notification - Self-destructing messages + Delete read messages diff --git a/res/xml/preferences_advanced.xml b/res/xml/preferences_advanced.xml index 4dcf5ae78..9d42d4abc 100644 --- a/res/xml/preferences_advanced.xml +++ b/res/xml/preferences_advanced.xml @@ -59,7 +59,7 @@ + android:title="Chat auto-delete setting"/> diff --git a/src/org/thoughtcrime/securesms/EphemeralMessagesDialog.java b/src/org/thoughtcrime/securesms/EphemeralMessagesDialog.java index cc2015597..d6e79d104 100644 --- a/src/org/thoughtcrime/securesms/EphemeralMessagesDialog.java +++ b/src/org/thoughtcrime/securesms/EphemeralMessagesDialog.java @@ -18,7 +18,7 @@ public class EphemeralMessagesDialog { final int[] selectedChoice = new int[]{preselected}; AlertDialog.Builder builder = new AlertDialog.Builder(context) - .setTitle(R.string.pref_ephemeral_messages) + .setTitle(R.string.ephemeral_dialog_title) .setNegativeButton(R.string.cancel, null) .setPositiveButton(R.string.ok, (dialog, which) -> { final long burnAfter;