From 561dc58de8af7b617e0f0ca55a52ae205f6eebdc Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Tue, 23 Apr 2019 13:37:40 +0200 Subject: [PATCH 1/9] Accept richer text from remote statuses Support abbr, del, pre, blockquote, code, strong, b, em, i, ul, ol, li and h1 to h5 tags in remote statuses. --- .../styles/mastodon/components.scss | 55 +++++++++++++++++-- app/lib/sanitize_config.rb | 11 ++-- 2 files changed, 57 insertions(+), 9 deletions(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 2326dee38..120d0d868 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -667,10 +667,6 @@ &.status__content--with-spoiler { white-space: normal; - - .status__content__text { - white-space: pre-wrap; - } } .emojione { @@ -679,7 +675,9 @@ margin: -3px 0 0; } - p { + p, + pre, + blockquote { margin-bottom: 20px; white-space: pre-wrap; @@ -688,6 +686,53 @@ } } + h1, + h2, + h3, + h4, + h5 { + margin-top: 20px; + margin-bottom: 20px; + } + + h1, + h2 { + font-weight: 500; + font-size: 18px; + } + + h2 { + font-size: 16px; + } + + blockquote { + margin-left: 20px; + color: $dark-text-color; + } + + b, + strong { + font-weight: 500; + } + + em, + i { + font-style: italic; + } + + ul, + ol { + margin-left: 1em; + } + + ul { + list-style-type: disc; + } + + ol { + list-style-type: decimal; + } + a { color: $secondary-text-color; text-decoration: none; diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb index 1bba4a5a6..0a87bf6df 100644 --- a/app/lib/sanitize_config.rb +++ b/app/lib/sanitize_config.rb @@ -20,11 +20,13 @@ class Sanitize end MASTODON_STRICT ||= freeze_config( - elements: %w(p br span a), + elements: %w(p br span a abbr del pre blockquote code b strong i em h1 h2 h3 h4 h5 ul ol li), attributes: { - 'a' => %w(href rel class), - 'span' => %w(class), + 'a' => %w(href rel class title), + 'span' => %w(class), + 'abbr' => %w(title), + 'blockquote' => %w(cite), }, add_attributes: { @@ -35,7 +37,8 @@ class Sanitize }, protocols: { - 'a' => { 'href' => HTTP_PROTOCOLS }, + 'a' => { 'href' => HTTP_PROTOCOLS }, + 'blockquote' => { 'cite' => HTTP_PROTOCOLS }, }, transformers: [ From 619945045ffd4ad6591a1bbcd9ecb97087f457c8 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Wed, 24 Apr 2019 20:55:01 +0200 Subject: [PATCH 2/9] Improve styling of rich text - Increase font weight of headers and bold text - Increase blockquote's contrast - Avoid some extra margins --- .../styles/mastodon/components.scss | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 120d0d868..26656b395 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -697,7 +697,7 @@ h1, h2 { - font-weight: 500; + font-weight: 700; font-size: 18px; } @@ -705,14 +705,26 @@ font-size: 16px; } + h3, + h4, + h5 { + font-weight: 500; + } + blockquote { - margin-left: 20px; - color: $dark-text-color; + padding-left: 10px; + border-left: 3px solid $darker-text-color; + color: $darker-text-color; + white-space: normal; + + p:last-child { + margin-bottom: 0; + } } b, strong { - font-weight: 500; + font-weight: 700; } em, @@ -723,6 +735,10 @@ ul, ol { margin-left: 1em; + + p { + margin: 0; + } } ul { From ec7046f9122d3b2220f1aa850038dc0ebc9fa71e Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Thu, 25 Apr 2019 14:17:48 +0200 Subject: [PATCH 3/9] Add setting to disable some rich text features --- .../settings/preferences_controller.rb | 1 + app/helpers/stream_entries_helper.rb | 11 +++ .../mastodon/components/status_content.js | 5 +- app/javascript/mastodon/initial_state.js | 1 + .../styles/mastodon/components.scss | 93 +++++++++++-------- app/lib/user_settings_decorator.rb | 5 + app/models/user.rb | 3 +- app/serializers/initial_state_serializer.rb | 19 ++-- .../rest/preferences_serializer.rb | 5 + app/views/settings/preferences/show.html.haml | 1 + .../stream_entries/_detailed_status.html.haml | 2 +- .../stream_entries/_simple_status.html.haml | 2 +- config/locales/en.yml | 7 ++ config/locales/simple_form.en.yml | 1 + config/settings.yml | 1 + 15 files changed, 107 insertions(+), 50 deletions(-) diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 5afdf0eec..aa17ae6ce 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -49,6 +49,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_hide_network, :setting_aggregate_reblogs, :setting_show_application, + :setting_strip_formatting, notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account), interactions: %i(must_be_follower must_be_following) ) diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index d56efbfb9..189121b3f 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -132,6 +132,17 @@ module StreamEntriesHelper end end + def text_formatting_classes + case current_user&.setting_strip_formatting + when 'none', nil + 'rich-text rich-blocks' + when 'blocks' + 'rich-text' + when 'all' + nil + end + end + def style_classes(status, is_predecessor, is_successor, include_threads) classes = ['entry'] classes << 'entry-predecessor' if is_predecessor diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js index fa8901386..9197b7b94 100644 --- a/app/javascript/mastodon/components/status_content.js +++ b/app/javascript/mastodon/components/status_content.js @@ -6,6 +6,7 @@ import { FormattedMessage } from 'react-intl'; import Permalink from './permalink'; import classnames from 'classnames'; import Icon from 'mastodon/components/icon'; +import { stripFormatting } from 'mastodon/initial_state'; const MAX_HEIGHT = 642; // 20px * 32 (+ 2px padding at the top) @@ -153,6 +154,8 @@ export default class StatusContent extends React.PureComponent { 'status__content--with-action': this.props.onClick && this.context.router, 'status__content--with-spoiler': status.get('spoiler_text').length > 0, 'status__content--collapsed': this.state.collapsed === true, + 'rich-text': stripFormatting !== 'all', + 'rich-blocks': stripFormatting === 'none', }); if (isRtl(status.get('search_index'))) { @@ -218,7 +221,7 @@ export default class StatusContent extends React.PureComponent {
('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }< %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}  diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index 0df7497e1..076cdc265 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -19,7 +19,7 @@ %span.display-name__account = acct(status.account) = fa_icon('lock') if status.account.locked? - .status__content.emojify< + .status__content.emojify{ class: text_formatting_classes }< - if status.spoiler_text? %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }< %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}  diff --git a/config/locales/en.yml b/config/locales/en.yml index 6d59411a5..260ee6a69 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -909,6 +909,13 @@ en: vote: Vote show_more: Show more sign_in_to_participate: Sign in to participate in the conversation + strip_formatting: + all: All + all_long: Strip all advanced formatting + blocks: Block elements + blocks_long: Strip formatting for title headers and block quotes + none: None + none_long: Do not strip any formatting supported by Mastodon title: '%{name}: "%{quote}"' visibilities: private: Followers-only diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 1a43e19e2..fa55c4c74 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -106,6 +106,7 @@ en: setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations setting_show_application: Disclose application used to send toots + setting_strip_formatting: Strip advanced formatting from toots setting_system_font_ui: Use system's default font setting_theme: Site theme setting_unfollow_modal: Show confirmation dialog before unfollowing someone diff --git a/config/settings.yml b/config/settings.yml index 1534d45f6..52db7035b 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -31,6 +31,7 @@ defaults: &defaults noindex: false theme: 'mastodon' aggregate_reblogs: true + strip_formatting: 'none' notification_emails: follow: false reblog: false From 42cc5cfaa4fc488c55b52bc6f8f0852862ca5617 Mon Sep 17 00:00:00 2001 From: asonix Date: Thu, 25 Apr 2019 16:46:00 -0500 Subject: [PATCH 4/9] Update locales --- config/locales/dog.yml | 7 +++++++ config/locales/lion.yml | 7 +++++++ config/locales/simple_form.dog.yml | 1 + config/locales/simple_form.lion.yml | 1 + config/locales/simple_form.squeak.yml | 1 + config/locales/squeak.yml | 7 +++++++ 6 files changed, 24 insertions(+) diff --git a/config/locales/dog.yml b/config/locales/dog.yml index d8843bc9f..0b228b04c 100644 --- a/config/locales/dog.yml +++ b/config/locales/dog.yml @@ -909,6 +909,13 @@ dog: vote: Vote show_more: Show more sign_in_to_participate: Sign in to participate in the conversation + strip_formatting: + all: All + all_long: Strip all advanced formatting + blocks: Block elements + blocks_long: Strip formatting for title headers and block quotes + none: None + none_long: Do not strip any formatting supported by Mastodon title: '%{name}: "%{quote}"' visibilities: private: Followers-only diff --git a/config/locales/lion.yml b/config/locales/lion.yml index fd78996a9..c1b5d910c 100644 --- a/config/locales/lion.yml +++ b/config/locales/lion.yml @@ -909,6 +909,13 @@ lion: vote: Vote show_more: Show more sign_in_to_participate: Sign in to participate in the conversation + strip_formatting: + all: All + all_long: Strip all advanced formatting + blocks: Block elements + blocks_long: Strip formatting for title headers and block quotes + none: None + none_long: Do not strip any formatting supported by Mastodon title: '%{name}: "%{quote}"' visibilities: private: Followers-only diff --git a/config/locales/simple_form.dog.yml b/config/locales/simple_form.dog.yml index 87e2da528..91b7b53cd 100644 --- a/config/locales/simple_form.dog.yml +++ b/config/locales/simple_form.dog.yml @@ -106,6 +106,7 @@ dog: setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations setting_show_application: Disclose application used to send toots + setting_strip_formatting: Strip advanced formatting from toots setting_system_font_ui: Use system's default font setting_theme: Site theme setting_unfollow_modal: Show confirmation dialog before unfollowing someone diff --git a/config/locales/simple_form.lion.yml b/config/locales/simple_form.lion.yml index 3400ac28e..decf0298e 100644 --- a/config/locales/simple_form.lion.yml +++ b/config/locales/simple_form.lion.yml @@ -106,6 +106,7 @@ lion: setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations setting_show_application: Disclose application used to send toots + setting_strip_formatting: Strip advanced formatting from toots setting_system_font_ui: Use system's default font setting_theme: Site theme setting_unfollow_modal: Show confirmation dialog before unfollowing someone diff --git a/config/locales/simple_form.squeak.yml b/config/locales/simple_form.squeak.yml index 19b0e489a..76a449f3f 100644 --- a/config/locales/simple_form.squeak.yml +++ b/config/locales/simple_form.squeak.yml @@ -106,6 +106,7 @@ squeak: setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations setting_show_application: Disclose application used to send toots + setting_strip_formatting: Strip advanced formatting from toots setting_system_font_ui: Use system's default font setting_theme: Site theme setting_unfollow_modal: Show confirmation dialog before unfollowing someone diff --git a/config/locales/squeak.yml b/config/locales/squeak.yml index b25d2384c..0d60e9e80 100644 --- a/config/locales/squeak.yml +++ b/config/locales/squeak.yml @@ -909,6 +909,13 @@ squeak: vote: Vote show_more: Show more sign_in_to_participate: Sign in to participate in the conversation + strip_formatting: + all: All + all_long: Strip all advanced formatting + blocks: Block elements + blocks_long: Strip formatting for title headers and block quotes + none: None + none_long: Do not strip any formatting supported by Mastodon title: '%{name}: "%{quote}"' visibilities: private: Followers-only From 13a6b78d4ef3c56e2fb32145dc5f3ce8d0d8d25d Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Thu, 25 Apr 2019 16:27:28 +0200 Subject: [PATCH 5/9] Disable `code` formatting when disabling all kind of formatting --- app/javascript/styles/mastodon/components.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 100ea476e..d07d4d3cc 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -713,6 +713,10 @@ del { text-decoration: none; } + + code { + font-family: inherit; + } } &.rich-text { From d8c324ad2ea23211ee5c62ec6159047da8947bfc Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sat, 27 Apr 2019 10:40:10 +0200 Subject: [PATCH 6/9] Crimes --- .../styles/mastodon/components.scss | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index d07d4d3cc..8d0367889 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -717,6 +717,54 @@ code { font-family: inherit; } + + h1::before { + content: '# '; + } + + h2::before { + content: '## '; + } + + h3::before { + content: '### '; + } + + h4::before { + content: '#### '; + } + + h5::before { + content: '##### '; + } + } + + &:not(.rich-blocks) { + blockquote { + position: relative; + padding-left: 1em; + overflow: hidden; + } + + blockquote::before { + position: absolute; + content: '>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a>\a'; + white-space: pre-wrap; + left: 0; + top: 0; + } + + li::before { + position: absolute; + content: '*'; + left: 0; + top: 0; + } + + li { + position: relative; + padding-left: 1em; + } } &.rich-text { From 97d8239837460adc3c12bff333f081639987d51b Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sat, 27 Apr 2019 17:15:48 +0200 Subject: [PATCH 7/9] Add forgotten tags --- app/javascript/styles/mastodon/components.scss | 9 +++++++++ app/lib/sanitize_config.rb | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 8d0367889..dd49068e7 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -718,6 +718,10 @@ font-family: inherit; } + u { + text-decoration: none; + } + h1::before { content: '# '; } @@ -788,6 +792,11 @@ i { font-style: italic; } + + sub { + font-size: smaller; + text-align: sub; + } } &.rich-blocks { diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb index 0a87bf6df..23d0a418f 100644 --- a/app/lib/sanitize_config.rb +++ b/app/lib/sanitize_config.rb @@ -20,7 +20,7 @@ class Sanitize end MASTODON_STRICT ||= freeze_config( - elements: %w(p br span a abbr del pre blockquote code b strong i em h1 h2 h3 h4 h5 ul ol li), + elements: %w(p br span a abbr del pre blockquote code b strong u sub i em h1 h2 h3 h4 h5 ul ol li), attributes: { 'a' => %w(href rel class title), From 57a1c42f3c27d80367d99eea004c5f856f5a66e1 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sat, 27 Apr 2019 17:19:22 +0200 Subject: [PATCH 8/9] More crimes --- .../styles/mastodon/components.scss | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index dd49068e7..1a7578268 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -712,6 +712,11 @@ &:not(.rich-text) { del { text-decoration: none; + + &::before, + &::after { + content: '~~'; + } } code { @@ -720,6 +725,11 @@ u { text-decoration: none; + + &::before, + &::after { + content: '__'; + } } h1::before { @@ -741,6 +751,22 @@ h5::before { content: '##### '; } + + b, + strong { + &::before, + &::after { + content: '**'; + } + } + + em, + i { + &::before, + &::after { + content: '*'; + } + } } &:not(.rich-blocks) { From 40192a8ee7ae3099444734ff5129dff98dbc0f26 Mon Sep 17 00:00:00 2001 From: asonix Date: Sat, 4 May 2019 19:42:53 -0500 Subject: [PATCH 9/9] instance -> server --- config/locales/dog.yml | 22 +++++++++++----------- config/locales/lion.yml | 24 ++++++++++++------------ config/locales/squeak.yml | 30 +++++++++++++++--------------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/config/locales/dog.yml b/config/locales/dog.yml index 0b228b04c..61a942345 100644 --- a/config/locales/dog.yml +++ b/config/locales/dog.yml @@ -399,14 +399,14 @@ dog: desc_html: Modify the look with CSS loaded on every page title: Custom CSS hero: - desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to instance thumbnail + desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to server thumbnail title: Hero image mascot: desc_html: Displayed on multiple pages. At least 293×205px recommended. When not set, falls back to default mascot title: Mascot image peers_api_enabled: - desc_html: Domain names this instance has encountered in the fediverse - title: Publish list of discovered instances + desc_html: Domain names this server has encountered in the fediverse + title: Publish list of discovered servers preview_sensitive_media: desc_html: Link previews on other websites will display a thumbnail even if the media is marked as sensitive title: Show sensitive media in OpenGraph previews @@ -437,20 +437,20 @@ dog: title: Show staff badge site_description: desc_html: Introductory paragraph on the frontpage. Describe what makes this Mastodon server special and anything else important. You can use HTML tags, in particular <a> and <em>. - title: Instance description + title: Server description site_description_extended: - desc_html: A good place for your code of conduct, rules, guidelines and other things that set your instance apart. You can use HTML tags + desc_html: A good place for your code of conduct, rules, guidelines and other things that set your server apart. You can use HTML tags title: Custom extended information site_short_description: - desc_html: Displayed in sidebar and meta tags. Describe what Mastodon is and what makes this server special in a single paragraph. If empty, defaults to instance description. - title: Short instance description + desc_html: Displayed in sidebar and meta tags. Describe what Mastodon is and what makes this server special in a single paragraph. + title: Short server description site_terms: desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags title: Custom terms of service - site_title: Instance name + site_title: Server name thumbnail: desc_html: Used for previews via OpenGraph and API. 1200x630px recommended - title: Instance thumbnail + title: Server thumbnail timeline_preview: desc_html: Display public timeline on landing page title: Timeline preview @@ -696,7 +696,7 @@ dog: one: 1 use other: "%{count} uses" max_uses_prompt: No limit - prompt: Generate and share links with others to grant access to this instance + prompt: Generate and share links with others to grant access to this server table: expires_at: Expires uses: Uses @@ -1072,7 +1072,7 @@ dog: final_action: Start posting final_step: 'Start posting! Even without followers your public messages may be seen by others, for example on the local timeline and in hashtags. You may want to introduce yourself on the #introductions hashtag.' full_handle: Your full handle - full_handle_hint: This is what you would tell your friends so they can message or follow you from another instance. + full_handle_hint: This is what you would tell your friends so they can message or follow you from another server. review_preferences_action: Change preferences review_preferences_step: Make sure to set your preferences, such as which emails you'd like to receive, or what privacy level you’d like your posts to default to. If you don’t have motion sickness, you could choose to enable GIF autoplay. subject: Welcome to Mastodon diff --git a/config/locales/lion.yml b/config/locales/lion.yml index c1b5d910c..56deeb64f 100644 --- a/config/locales/lion.yml +++ b/config/locales/lion.yml @@ -399,14 +399,14 @@ lion: desc_html: Modify the look with CSS loaded on every page title: Custom CSS hero: - desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to instance thumbnail + desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to server thumbnail title: Hero image mascot: desc_html: Displayed on multiple pages. At least 293×205px recommended. When not set, falls back to default mascot title: Mascot image peers_api_enabled: - desc_html: Domain names this instance has encountered in the fediverse - title: Publish list of discovered instances + desc_html: Domain names this server has encountered in the fediverse + title: Publish list of discovered servers preview_sensitive_media: desc_html: Link previews on other websites will display a thumbnail even if the media is marked as sensitive title: Show sensitive media in OpenGraph previews @@ -437,20 +437,20 @@ lion: title: Show staff badge site_description: desc_html: Introductory paragraph on the frontpage. Describe what makes this Mastodon server special and anything else important. You can use HTML tags, in particular <a> and <em>. - title: Instance description + title: Server description site_description_extended: - desc_html: A good place for your code of conduct, rules, guidelines and other things that set your instance apart. You can use HTML tags + desc_html: A good place for your code of conduct, rules, guidelines and other things that set your server apart. You can use HTML tags title: Custom extended information site_short_description: - desc_html: Displayed in sidebar and meta tags. Describe what Mastodon is and what makes this server special in a single paragraph. If empty, defaults to instance description. - title: Short instance description + desc_html: Displayed in sidebar and meta tags. Describe what Mastodon is and what makes this server special in a single paragraph. + title: Short server description site_terms: desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags title: Custom terms of service - site_title: Instance name + site_title: Server name thumbnail: desc_html: Used for previews via OpenGraph and API. 1200x630px recommended - title: Instance thumbnail + title: Server thumbnail timeline_preview: desc_html: Display public timeline on landing page title: Timeline preview @@ -569,7 +569,7 @@ lion: description_html: This will permanently, irreversibly remove content from your account and deactivate it. Your username will remain reserved to prevent future impersonations. proceed: Delete account success_msg: Your account was successfully deleted - warning_html: Only deletion of content from this particular instance is guaranteed. Content that has been widely shared is likely to leave traces. Offline servers and servers that have unsubscribed from your updates will not update their databases. + warning_html: Only deletion of content from this particular server is guaranteed. Content that has been widely shared is likely to leave traces. Offline servers and servers that have unsubscribed from your updates will not update their databases. warning_title: Disseminated content availability directories: directory: Profile directory @@ -696,7 +696,7 @@ lion: one: 1 use other: "%{count} uses" max_uses_prompt: No limit - prompt: Generate and share links with others to grant access to this instance + prompt: Generate and share links with others to grant access to this server table: expires_at: Expires uses: Uses @@ -1072,7 +1072,7 @@ lion: final_action: Start posting final_step: 'Start posting! Even without followers your public messages may be seen by others, for example on the local timeline and in hashtags. You may want to introduce yourself on the #introductions hashtag.' full_handle: Your full handle - full_handle_hint: This is what you would tell your friends so they can message or follow you from another instance. + full_handle_hint: This is what you would tell your friends so they can message or follow you from another server. review_preferences_action: Change preferences review_preferences_step: Make sure to set your preferences, such as which emails you'd like to receive, or what privacy level you’d like your posts to default to. If you don’t have motion sickness, you could choose to enable GIF autoplay. subject: Welcome to Mastodon diff --git a/config/locales/squeak.yml b/config/locales/squeak.yml index 0d60e9e80..32aaad82b 100644 --- a/config/locales/squeak.yml +++ b/config/locales/squeak.yml @@ -399,14 +399,14 @@ squeak: desc_html: Modify the look with CSS loaded on every page title: Custom CSS hero: - desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to instance thumbnail + desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to server thumbnail title: Hero image mascot: desc_html: Displayed on multiple pages. At least 293×205px recommended. When not set, falls back to default mascot title: Mascot image peers_api_enabled: - desc_html: Domain names this instance has encountered in the fediverse - title: Publish list of discovered instances + desc_html: Domain names this server has encountered in the fediverse + title: Publish list of discovered servers preview_sensitive_media: desc_html: Link previews on other websites will display a thumbnail even if the media is marked as sensitive title: Show sensitive media in OpenGraph previews @@ -437,20 +437,20 @@ squeak: title: Show staff badge site_description: desc_html: Introductory paragraph on the frontpage. Describe what makes this Mastodon server special and anything else important. You can use HTML tags, in particular <a> and <em>. - title: Instance description + title: Server description site_description_extended: - desc_html: A good place for your code of conduct, rules, guidelines and other things that set your instance apart. You can use HTML tags + desc_html: A good place for your code of conduct, rules, guidelines and other things that set your server apart. You can use HTML tags title: Custom extended information site_short_description: - desc_html: Displayed in sidebar and meta tags. Describe what Mastodon is and what makes this server special in a single paragraph. If empty, defaults to instance description. - title: Short instance description + desc_html: Displayed in sidebar and meta tags. Describe what Mastodon is and what makes this server special in a single paragraph. + title: Short server description site_terms: desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags title: Custom terms of service - site_title: Instance name + site_title: Server name thumbnail: desc_html: Used for previews via OpenGraph and API. 1200x630px recommended - title: Instance thumbnail + title: Server thumbnail timeline_preview: desc_html: Display public timeline on landing page title: Timeline preview @@ -532,7 +532,7 @@ squeak: cas: CAS saml: SAML register: Sign up - register_elsewhere: Sign up on another server + registration_closed: "%{instance} is not accepting new members" resend_confirmation: Resend confirmation instructions reset_password: Reset password security: Security @@ -569,7 +569,7 @@ squeak: description_html: This will permanently, irreversibly remove content from your account and deactivate it. Your username will remain reserved to prevent future impersonations. proceed: Delete account success_msg: Your account was successfully deleted - warning_html: Only deletion of content from this particular instance is guaranteed. Content that has been widely shared is likely to leave traces. Offline servers and servers that have unsubscribed from your updates will not update their databases. + warning_html: Only deletion of content from this particular server is guaranteed. Content that has been widely shared is likely to leave traces. Offline servers and servers that have unsubscribed from your updates will not update their databases. warning_title: Disseminated content availability directories: directory: Profile directory @@ -583,8 +583,8 @@ squeak: other: "%{count} people" errors: '403': You don't have permission to view this page. - '404': The page you were looking for doesn't exist. - '410': The page you were looking for doesn't exist anymore. + '404': The page you are looking for isn't here. + '410': The page you were looking for doesn't exist here anymore. '422': content: Security verification failed. Are you blocking cookies? title: Security verification failed @@ -696,7 +696,7 @@ squeak: one: 1 use other: "%{count} uses" max_uses_prompt: No limit - prompt: Generate and share links with others to grant access to this instance + prompt: Generate and share links with others to grant access to this server table: expires_at: Expires uses: Uses @@ -1072,7 +1072,7 @@ squeak: final_action: Start posting final_step: 'Start posting! Even without followers your public messages may be seen by others, for example on the local timeline and in hashtags. You may want to introduce yourself on the #introductions hashtag.' full_handle: Your full handle - full_handle_hint: This is what you would tell your friends so they can message or follow you from another instance. + full_handle_hint: This is what you would tell your friends so they can message or follow you from another server. review_preferences_action: Change preferences review_preferences_step: Make sure to set your preferences, such as which emails you'd like to receive, or what privacy level you’d like your posts to default to. If you don’t have motion sickness, you could choose to enable GIF autoplay. subject: Welcome to Mastodon