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 @@ + android:title="@string/sk_settings_auto_reveal_nobody" /> + android:title="@string/sk_settings_auto_reveal_author" /> + android:title="@string/sk_settings_auto_reveal_anyone" /> \ 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 @@ Failed loading the profile via %s Load info from remote instances Try fetching more accurate listings for followers, likes and boosts by loading the information from the instance of origin. - Reveal equal CWs in threads - Never - Same author - Discussions - Always + Reveal equal CWs in replies from + nobody + author + anyone \ No newline at end of file