From 8547ce05ed58ef152f52d72673ffa87bdfb7b00c Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Sat, 10 Jun 2023 18:52:01 +0200
Subject: [PATCH] change auto-reveal cw wording

closes sk22#562
---
 .../joinmastodon/android/fragments/SettingsFragment.java | 8 ++++----
 .../src/main/res/menu/settings_auto_reveal_spoiler.xml   | 6 +++---
 mastodon/src/main/res/values/strings_sk.xml              | 9 ++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
index 1fbe3c427..07940bafa 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -557,12 +557,12 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
 
 	private void onAutoRevealSpoilerChanged(Button b) {
 		if (GlobalUserPreferences.alwaysExpandContentWarnings) {
-			b.setText(R.string.sk_settings_auto_reveal_always);
+			b.setText(R.string.sk_settings_auto_reveal_anyone);
 		} else {
 			b.setText(switch(GlobalUserPreferences.autoRevealEqualSpoilers){
-				case THREADS -> R.string.sk_settings_auto_reveal_threads;
-				case DISCUSSIONS -> R.string.sk_settings_auto_reveal_discussions;
-				default -> R.string.sk_settings_auto_reveal_never;
+				case THREADS -> R.string.sk_settings_auto_reveal_author;
+				case DISCUSSIONS -> R.string.sk_settings_auto_reveal_anyone;
+				default -> R.string.sk_settings_auto_reveal_nobody;
 			});
 			if (alwaysRevealSpoilersItem.checked != GlobalUserPreferences.alwaysExpandContentWarnings) {
 				alwaysRevealSpoilersItem.checked = GlobalUserPreferences.alwaysExpandContentWarnings;
diff --git a/mastodon/src/main/res/menu/settings_auto_reveal_spoiler.xml b/mastodon/src/main/res/menu/settings_auto_reveal_spoiler.xml
index f6a5e31ed..e6c99f90e 100644
--- a/mastodon/src/main/res/menu/settings_auto_reveal_spoiler.xml
+++ b/mastodon/src/main/res/menu/settings_auto_reveal_spoiler.xml
@@ -2,11 +2,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/auto_reveal_never"
-        android:title="@string/sk_settings_auto_reveal_never" />
+        android:title="@string/sk_settings_auto_reveal_nobody" />
     <item
         android:id="@+id/auto_reveal_threads"
-        android:title="@string/sk_settings_auto_reveal_threads" />
+        android:title="@string/sk_settings_auto_reveal_author" />
     <item
         android:id="@+id/auto_reveal_discussions"
-        android:title="@string/sk_settings_auto_reveal_discussions" />
+        android:title="@string/sk_settings_auto_reveal_anyone" />
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 05d79c5d2..3aaacdb09 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -297,9 +297,8 @@
     <string name="sk_error_loading_profile">Failed loading the profile via %s</string>
     <string name="sk_settings_allow_remote_loading">Load info from remote instances</string>
     <string name="sk_settings_allow_remote_loading_explanation">Try fetching more accurate listings for followers, likes and boosts by loading the information from the instance of origin.</string>
-    <string name="sk_settings_auto_reveal_equal_spoilers">Reveal equal CWs in threads</string>
-    <string name="sk_settings_auto_reveal_never">Never</string>
-    <string name="sk_settings_auto_reveal_threads">Same author</string>
-    <string name="sk_settings_auto_reveal_discussions">Discussions</string>
-    <string name="sk_settings_auto_reveal_always">Always</string>
+    <string name="sk_settings_auto_reveal_equal_spoilers">Reveal equal CWs in replies from</string>
+    <string name="sk_settings_auto_reveal_nobody">nobody</string>
+    <string name="sk_settings_auto_reveal_author">author</string>
+    <string name="sk_settings_auto_reveal_anyone">anyone</string>
 </resources>
\ No newline at end of file