owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change auto-reveal cw wording

Browse Source 
closes sk22#562
This commit is contained in:
sk
2023-06-10 18:52:01 +02:00
parent 0825faee5c
commit 90e60aef84
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
View File

@@ -557,12 +557,12 @@ public class SettingsFragment extends MastodonToolbarFragment implements Provide
private void onAutoRevealSpoilerChanged(Button b) { private void onAutoRevealSpoilerChanged(Button b) {
if (GlobalUserPreferences.alwaysExpandContentWarnings) { if (GlobalUserPreferences.alwaysExpandContentWarnings) {
b.setText(R.string.sk_settings_auto_reveal_always); b.setText(R.string.sk_settings_auto_reveal_anyone);
} else { } else {
b.setText(switch(GlobalUserPreferences.autoRevealEqualSpoilers){ b.setText(switch(GlobalUserPreferences.autoRevealEqualSpoilers){
case THREADS -> R.string.sk_settings_auto_reveal_threads; case THREADS -> R.string.sk_settings_auto_reveal_author;
case DISCUSSIONS -> R.string.sk_settings_auto_reveal_discussions; case DISCUSSIONS -> R.string.sk_settings_auto_reveal_anyone;
default -> R.string.sk_settings_auto_reveal_never; default -> R.string.sk_settings_auto_reveal_nobody;
}); });
if (alwaysRevealSpoilersItem.checked != GlobalUserPreferences.alwaysExpandContentWarnings) { if (alwaysRevealSpoilersItem.checked != GlobalUserPreferences.alwaysExpandContentWarnings) {
alwaysRevealSpoilersItem.checked = GlobalUserPreferences.alwaysExpandContentWarnings; alwaysRevealSpoilersItem.checked = GlobalUserPreferences.alwaysExpandContentWarnings;

6
mastodon/src/main/res/menu/settings_auto_reveal_spoiler.xml
View File

@@ -2,11 +2,11 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:id="@+id/auto_reveal_never" android:id="@+id/auto_reveal_never"
android:title="@string/sk_settings_auto_reveal_never" /> android:title="@string/sk_settings_auto_reveal_nobody" />
<item <item
android:id="@+id/auto_reveal_threads" android:id="@+id/auto_reveal_threads"
android:title="@string/sk_settings_auto_reveal_threads" /> android:title="@string/sk_settings_auto_reveal_author" />
<item <item
android:id="@+id/auto_reveal_discussions" android:id="@+id/auto_reveal_discussions"
android:title="@string/sk_settings_auto_reveal_discussions" /> android:title="@string/sk_settings_auto_reveal_anyone" />
</menu> </menu>

9
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -297,9 +297,8 @@
<string name="sk_error_loading_profile">Failed loading the profile via %s</string> <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">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_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_equal_spoilers">Reveal same CWs in their replies</string>
<string name="sk_settings_auto_reveal_never">Never</string> <string name="sk_settings_auto_reveal_nobody">Nobody</string>
<string name="sk_settings_auto_reveal_threads">Same author</string> <string name="sk_settings_auto_reveal_author">Author</string>
<string name="sk_settings_auto_reveal_discussions">Discussions</string> <string name="sk_settings_auto_reveal_anyone">Anyone</string>
<string name="sk_settings_auto_reveal_always">Always</string>
</resources> </resources>