tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow selecting default posting language instead of auto-detect (#7828)

Browse Source 
* Allow selecting default posting language instead of auto-detect

* Enable default language setting in credentials API

* Fix form saving
This commit is contained in:
Eugen Rochko
2018-06-17 18:57:31 +02:00
committed by GitHub
parent bb21c6414d
commit a58ec29631
10 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/en.yml
View File

@ -675,6 +675,7 @@ en:
disallowed_hashtags:
one: 'contained a disallowed hashtag: %{tags}'
other: 'contained the disallowed hashtags: %{tags}'
language_detection: Automatically detect language
open_in_web: Open in web
over_character_limit: character limit of %{max} exceeded
pin_errors:

5
config/locales/simple_form.en.yml
View File

@ -12,10 +12,12 @@ en:
other: <span class="name-counter">%{count}</span> characters left
fields: You can have up to 4 items displayed as a table on your profile
header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px
locale: The language of the user interface, e-mails and push notifications
locked: Requires you to manually approve followers
note:
one: <span class="note-counter">1</span> character left
other: <span class="note-counter">%{count}</span> characters left
setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
setting_hide_network: Who you follow and who follows you will not be shown on your profile
setting_noindex: Affects your public profile and status pages
setting_theme: Affects how Mastodon looks when you're logged in from any device.
@ -24,7 +26,7 @@ en:
sessions:
otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
user:
chosen_languages: Only toots in selected languages will be displayed in public timelines. Select nothing to see toots in all languages
chosen_languages: When checked, only toots in selected languages will be displayed in public timelines
labels:
account:
fields:
@ -53,6 +55,7 @@ en:
password: Password
setting_auto_play_gif: Auto-play animated GIFs
setting_boost_modal: Show confirmation dialog before boosting
setting_default_language: Posting language
setting_default_privacy: Post privacy
setting_default_sensitive: Always mark media as sensitive
setting_delete_modal: Show confirmation dialog before deleting a toot