From ecff96db8b41e3f53bb236e70ae104b84ed03d6a Mon Sep 17 00:00:00 2001 From: Tarrien Date: Mon, 24 Jul 2023 14:00:51 -0400 Subject: [PATCH] Fixing some customization tweaks --- app/helpers/statuses_helper.rb | 2 +- config/locales/en.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb index f1f1ea872..18b3bf064 100644 --- a/app/helpers/statuses_helper.rb +++ b/app/helpers/statuses_helper.rb @@ -53,7 +53,7 @@ module StatusesHelper def status_description(status) components = [[media_summary(status), status_text_summary(status)].compact_blank.join(' ยท ')] - if status.spoiler_text.blank? + if status.spoiler_text.blank? || Setting.preview_sensitive_media components << status.text components << poll_summary(status) end diff --git a/config/locales/en.yml b/config/locales/en.yml index 83ba4b040..91b085a94 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1165,9 +1165,9 @@ en: title: Security verification failed '429': Too many requests '500': - content: We're sorry, but something went wrong on our end. + content: We're sorry, but something went wrong on our end. You can check the status of Wobbl and its companion systems at our status page - https://status.tarrien.net/status/wobbl . title: This page is not correct - '503': The page could not be served due to a temporary server failure. + '503': The page could not be served due to a temporary server failure. You can check the status of Wobbl and its companion systems at our status page - https://status.tarrien.net/status/wobbl. noscript_html: To use the Mastodon web application, please enable JavaScript. Alternatively, try one of the native apps for Mastodon for your platform. existing_username_validator: not_found: could not find a local user with that username