From c12b39fe3a788a28e40b8a33d4e1f91a3959aefc Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 30 Aug 2022 15:39:48 -0300
Subject: [PATCH] Update translation strings for story privacy modes.

---
 .../securesms/contacts/paged/ContactSearchItems.kt        | 4 ++--
 .../settings/custom/PrivateStorySettingsFragment.kt       | 2 +-
 .../stories/settings/my/MyStorySettingsFragment.kt        | 4 ++--
 .../choose_initial_my_story_membership_fragment.xml       | 2 +-
 app/src/main/res/values/strings.xml                       | 8 +++++---
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchItems.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchItems.kt
index 5732bf1df3..622f921666 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchItems.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/paged/ContactSearchItems.kt
@@ -195,8 +195,8 @@ object ContactSearchItems {
 
     private fun presentPrivacyMode(privacyMode: DistributionListPrivacyMode): String {
       return when (privacyMode) {
-        DistributionListPrivacyMode.ONLY_WITH -> context.getString(R.string.ChooseInitialMyStoryMembershipFragment__only_share_with)
-        DistributionListPrivacyMode.ALL_EXCEPT -> context.getString(R.string.ChooseInitialMyStoryMembershipFragment__all_signal_connections_except)
+        DistributionListPrivacyMode.ONLY_WITH -> context.getString(R.string.ContactSearchItems__only_share_with)
+        DistributionListPrivacyMode.ALL_EXCEPT -> context.getString(R.string.ChooseInitialMyStoryMembershipFragment__all_except)
         DistributionListPrivacyMode.ALL -> context.getString(R.string.ChooseInitialMyStoryMembershipFragment__all_signal_connections)
       }
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/custom/PrivateStorySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/custom/PrivateStorySettingsFragment.kt
index c45fc0ebd1..89ae68b789 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/custom/PrivateStorySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/custom/PrivateStorySettingsFragment.kt
@@ -60,7 +60,7 @@ class PrivateStorySettingsFragment : DSLSettingsFragment(
     }
 
     return configure {
-      sectionHeaderPref(R.string.MyStorySettingsFragment__who_can_see_this_story)
+      sectionHeaderPref(R.string.MyStorySettingsFragment__who_can_view_this_story)
       customPref(
         PrivateStoryItem.AddViewerModel(
           onClick = {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/my/MyStorySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/my/MyStorySettingsFragment.kt
index 86aa961276..984b878b4b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/settings/my/MyStorySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/settings/my/MyStorySettingsFragment.kt
@@ -45,7 +45,7 @@ class MyStorySettingsFragment : DSLSettingsFragment(
 
   private fun getConfiguration(state: MyStorySettingsState): DSLConfiguration {
     return configure {
-      sectionHeaderPref(R.string.MyStorySettingsFragment__who_can_see_this_story)
+      sectionHeaderPref(R.string.MyStorySettingsFragment__who_can_view_this_story)
 
       radioPref(
         title = DSLSettingsText.from(R.string.MyStorySettingsFragment__all_signal_connections),
@@ -64,7 +64,7 @@ class MyStorySettingsFragment : DSLSettingsFragment(
       }
 
       radioPref(
-        title = DSLSettingsText.from(R.string.MyStorySettingsFragment__all_signal_connections_except),
+        title = DSLSettingsText.from(R.string.MyStorySettingsFragment__all_except),
         summary = exceptText,
         isChecked = state.myStoryPrivacyState.privacyMode == DistributionListPrivacyMode.ALL_EXCEPT,
         onClick = {
diff --git a/app/src/main/res/layout/choose_initial_my_story_membership_fragment.xml b/app/src/main/res/layout/choose_initial_my_story_membership_fragment.xml
index 9c51c6097f..6885439424 100644
--- a/app/src/main/res/layout/choose_initial_my_story_membership_fragment.xml
+++ b/app/src/main/res/layout/choose_initial_my_story_membership_fragment.xml
@@ -92,7 +92,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="24dp"
-                android:text="@string/ChooseInitialMyStoryMembershipFragment__all_signal_connections_except"
+                android:text="@string/ChooseInitialMyStoryMembershipFragment__all_except"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintBottom_toTopOf="@+id/choose_initial_my_story_all_signal_connnections_except_count"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bcd42c6144..80f04e612c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4765,7 +4765,7 @@
     <!-- Page title for My Story options -->
     <string name="MyStorySettingsFragment__my_story">My Story</string>
     <!-- Section heading for story visibility -->
-    <string name="MyStorySettingsFragment__who_can_see_this_story">Who can see this story</string>
+    <string name="MyStorySettingsFragment__who_can_view_this_story">Who can view this story</string>
     <!-- Clickable option for selecting people to hide your story from -->
     <string name="MyStorySettingsFragment__hide_story_from">Hide story from</string>
     <!-- Privacy setting title for sending stories to all your signal connections -->
@@ -4773,7 +4773,7 @@
     <!-- Privacy setting description for sending stories to all your signal connections -->
     <string name="MyStorySettingsFragment__share_with_all_connections">Share with all connections</string>
     <!-- Privacy setting title for sending stories to all except the specified connections -->
-    <string name="MyStorySettingsFragment__all_signal_connections_except">All Signal connections except…</string>
+    <string name="MyStorySettingsFragment__all_except">All except…</string>
     <!-- Privacy setting description for sending stories to all except the specified connections -->
     <string name="MyStorySettingsFragment__hide_your_story_from_specific_people">Hide your story from specific people</string>
     <!-- Summary of clickable option displaying how many people you have excluded from your story -->
@@ -5006,6 +5006,8 @@
     <string name="ExpiredGiftSheetConfiguration__make_a_monthly_donation">Make a monthly donation</string>
     <!-- Expired gift sheet not now button -->
     <string name="ExpiredGiftSheetConfiguration__not_now">Not now</string>
+    <!-- My Story label designating that we will only share with the selected viewers. -->
+    <string name="ContactSearchItems__only_share_with">Only share with</string>
     <!-- Label under name for private stories -->
     <plurals name="ContactSearchItems__private_story_d_viewers">
         <item quantity="one">Private story · %1$d viewer</item>
@@ -5118,7 +5120,7 @@
     <!-- All connections option for initial My Story settings configuration shown when sending to My Story for the first time -->
     <string name="ChooseInitialMyStoryMembershipFragment__all_signal_connections">All Signal connections</string>
     <!-- All connections except option for initial My Story settings configuration shown when sending to My Story for the first time -->
-    <string name="ChooseInitialMyStoryMembershipFragment__all_signal_connections_except">All Signal connections except…</string>
+    <string name="ChooseInitialMyStoryMembershipFragment__all_except">All except…</string>
     <!-- Only with selected connections option for initial My Story settings configuration shown when sending to My Story for the first time -->
     <string name="ChooseInitialMyStoryMembershipFragment__only_share_with">Only share with…</string>