From ea24ff67b3e5cc5b54878a8befbf48e7f18806d9 Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Tue, 3 Sep 2024 10:49:49 +1000
Subject: [PATCH] Strings fixes

---
 .../securesms/conversation/v2/messages/ControlMessageView.kt  | 4 +---
 .../securesms/conversation/v2/messages/QuoteView.kt           | 2 +-
 .../main/java/org/thoughtcrime/securesms/home/PathActivity.kt | 2 +-
 .../securesms/recoverypassword/RecoveryPasswordActivity.kt    | 2 +-
 content-descriptions/src/main/res/values/strings.xml          | 1 +
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
index ab8498acf4..8e3e841809 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
@@ -78,9 +78,7 @@ class ControlMessageView : LinearLayout {
             }
             message.isMessageRequestResponse -> {
                 binding.textView.text =  context.getString(R.string.messageRequestsAccepted)
-                binding.root.contentDescription = Phrase.from(context, R.string.messageRequestYouHaveAccepted)
-                    .put(NAME_KEY, message.individualRecipient.name)
-                    .format()
+                binding.root.contentDescription = context.getString(R.string.AccessibilityId_message_request_config_message)
             }
             message.isCallLog -> {
                 val drawable = when {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
index 6a5f852409..db6962151c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt
@@ -106,7 +106,7 @@ class QuoteView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
                 attachments.audioSlide != null -> {
                     binding.quoteViewAttachmentPreviewImageView.setImageResource(R.drawable.ic_microphone)
                     binding.quoteViewAttachmentPreviewImageView.isVisible = true
-                    binding.quoteViewBodyTextView.text = resources.getString(R.string.audio)
+                    binding.quoteViewBodyTextView.text = resources.getString(R.string.messageVoice)
                 }
                 attachments.documentSlide != null -> {
                     binding.quoteViewAttachmentPreviewImageView.setImageResource(R.drawable.ic_document_large_light)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt
index 1530845300..7c115736ab 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt
@@ -114,7 +114,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
                 val isGuardSnode = (OnionRequestAPI.guardSnodes.contains(snode))
                 getPathRow(snode, LineView.Location.Middle, index.toLong() * 1000 + 2000, dotAnimationRepeatInterval, isGuardSnode)
             }
-            val youRow = getPathRow(resources.getString(R.string.onionRoutingPath), null, LineView.Location.Top, 1000, dotAnimationRepeatInterval)
+            val youRow = getPathRow(resources.getString(R.string.you), null, LineView.Location.Top, 1000, dotAnimationRepeatInterval)
             val destinationRow = getPathRow(resources.getString(R.string.onionRoutingPathDestination), null, LineView.Location.Bottom, path.count().toLong() * 1000 + 2000, dotAnimationRepeatInterval)
             val rows = listOf( youRow ) + pathRows + listOf( destinationRow )
             for (row in rows) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt
index 62b602f6f3..543938757c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt
@@ -33,7 +33,7 @@ class RecoveryPasswordActivity : BaseActionBarActivity() {
     private fun onHide() {
         showSessionDialog {
             title(R.string.recoveryPasswordHidePermanently)
-            htmlText(R.string.recoveryPasswordHidePermanentlyDescription1)
+            text(R.string.recoveryPasswordHidePermanentlyDescription1)
             dangerButton(R.string.theContinue, R.string.AccessibilityId_theContinue) { onHideConfirm() }
             cancelButton()
         }
diff --git a/content-descriptions/src/main/res/values/strings.xml b/content-descriptions/src/main/res/values/strings.xml
index 25237a222c..2b636e557c 100644
--- a/content-descriptions/src/main/res/values/strings.xml
+++ b/content-descriptions/src/main/res/values/strings.xml
@@ -124,6 +124,7 @@
     <string name="AccessibilityId_select">Select</string>
     <string name="AccessibilityId_messageVoice">Voice message</string>
     <string name="AccessibilityId_deliveryIndicator">Delivered</string>
+    <string name="AccessibilityId_message_request_config_message">Message request has been accepted</string>
     <!-- Delete message modal-->
     <string name="AccessibilityId_deleteMessageCancel">Cancel deletion</string>
     <string name="AccessibilityId_deleteMessageEveryone">Delete for everyone</string>   <!-- ACL: Perhaps should be "AccessibilityId_clearMessagesForEveryone"? -->