diff options
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 2 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index a1c3beb51..f769678d9 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -25,7 +25,7 @@ .fields-group = f.input :setting_default_privacy, collection: Status.selectable_visibilities, wrapper: :with_floating_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), content_tag(:span, I18n.t("statuses.visibilities.#{visibility}_long"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' - = f.input :setting_default_content_type, collection: ['text/plain', 'text/markdown', 'text/html'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| safe_join([t("simple_form.labels.defaults.setting_default_content_type_#{item.split('/')[1]}"), content_tag(:span, t("simple_form.hints.defaults.setting_default_content_type_#{item.split('/')[1]}"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' + = f.input :setting_default_content_type, collection: ['text/x-bbcode+markdown', 'text/markdown', 'text/x-bbcode', 'text/html', 'text/plain'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| safe_join([t("simple_form.labels.defaults.setting_default_content_type_#{item.split('/')[1].gsub(/[+-]/, '_')}"), content_tag(:span, t("simple_form.hints.defaults.setting_default_content_type_#{item.split('/')[1].gsub(/[+-]/, '_')}"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' = f.input :setting_default_local, as: :boolean, wrapper: :with_label = f.input :setting_always_local, as: :boolean, wrapper: :with_label diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 115407c58..126a8e52f 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -30,9 +30,11 @@ en: phrase: Will be matched regardless of casing in text or content warning of a roar scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones. setting_aggregate_reblogs: Do not show new repeats for roars that have been recently repeated (only affects newly-received repeats) - setting_default_content_type_html: When writing roars, assume they are written in raw HTML, unless specified otherwise - setting_default_content_type_markdown: When writing roars, assume they are using Markdown for rich text formatting, unless specified otherwise - setting_default_content_type_plain: When writing roars, assume they are plain text with no special formatting, unless specified otherwise (default Mastodon behavior) + setting_default_content_type_html: Assume your roars are formatted with HTML unless specified otherwise + setting_default_content_type_markdown: Assume your roars are formatted with Markdown unless specified otherwise + setting_default_content_type_plain: Assume your roars are plain text unless specified otherwise + setting_default_content_type_x_bbcode: Assume your roars are formatted with BBcode unless specified otherwise + setting_default_content_type_x_bbcode_markdown: Assume your roars are formatted with BBdown unless specified otherwise (default) setting_default_language: The language of your roars can be detected automatically, but it's not always accurate setting_display_media_default: Hide media marked as sensitive setting_display_media_hide_all: Always hide all media @@ -111,6 +113,8 @@ en: setting_default_content_type_html: HTML setting_default_content_type_markdown: Markdown setting_default_content_type_plain: Plain text + setting_default_content_type_x_bbcode: BBCode + setting_default_content_type_x_bbcode_markdown: BBdown setting_default_language: Posting language setting_default_privacy: Post privacy setting_default_local: Default to Monsterpit-only roars (in Glitch flavour) |