Preference to disable multiple-login usernames (#2718)
* Preference to disable multiple-login usernames (with problems) * Fix problem where 'show self username disambiguation' does not take effect immediately because MainActivity needed to be restarted * Make 'show username in toolbars' a 3-option selector, default when multiple accounts logged in * Move SHOW_SELF_USERNAME higher in preference fragment
This commit is contained in:
parent
05f9a17e7a
commit
85a6b2d96b
9 changed files with 48 additions and 3 deletions
|
|
@ -144,6 +144,12 @@
|
|||
<item>bottom</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="pref_show_self_username_values">
|
||||
<item>always</item>
|
||||
<item>disambiguate</item>
|
||||
<item>never</item>
|
||||
</string-array>
|
||||
|
||||
<string name="description_status" translatable="false">
|
||||
<!-- Display name, cw?, content?, poll? relative date, reposted by?, reposted?, favorited?, bookmarked?, username, media?; visibility, fav number?, reblog number?-->
|
||||
%1$s; %2$s; %3$s, %14$s %4$s, %5$s; %6$s, %7$s, %8$s, %9$s, %10$s; %11$s, %12$s, %13$s
|
||||
|
|
|
|||
|
|
@ -23,4 +23,10 @@
|
|||
<item>@string/post_text_size_largest</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="pref_show_self_username_names">
|
||||
<item>@string/pref_show_self_username_always</item>
|
||||
<item>@string/pref_show_self_username_disambiguate</item>
|
||||
<item>@string/pref_show_self_username_never</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
||||
|
|
@ -293,6 +293,10 @@
|
|||
<string name="post_text_size_large">Large</string>
|
||||
<string name="post_text_size_largest">Largest</string>
|
||||
|
||||
<string name="pref_show_self_username_always">Always</string>
|
||||
<string name="pref_show_self_username_disambiguate">When multiple accounts logged in</string>
|
||||
<string name="pref_show_self_username_never">Never</string>
|
||||
|
||||
<string name="notification_mention_name">New Mentions</string>
|
||||
<string name="notification_mention_descriptions">Notifications about new mentions</string>
|
||||
<string name="notification_follow_name">New Followers</string>
|
||||
|
|
@ -618,6 +622,7 @@
|
|||
<string name="no_scheduled_posts">You don\'t have any scheduled posts.</string>
|
||||
<string name="no_announcements">There are no announcements.</string>
|
||||
<string name="warning_scheduling_interval">Mastodon has a minimum scheduling interval of 5 minutes.</string>
|
||||
<string name="pref_title_show_self_username">Show username in toolbars</string>
|
||||
<string name="pref_title_show_cards_in_timelines">Show link previews in timelines</string>
|
||||
<string name="pref_title_confirm_reblogs">Show confirmation dialog before boosting</string>
|
||||
<string name="pref_title_confirm_favourites">Show confirmation dialog before favoriting</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue