From 6d3fa7828ea3cddc267f19634d7bc5d917e62be8 Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 3 Mar 2022 16:14:44 +0100 Subject: Redesign /about when already logged in (#17348) * Redesign /about when already logged in * Fix sign up form still showing when OMNIAUTH_ONLY is set * Fix tests * Change wording based on suggestions Co-authored-by: Eugen Rochko Co-authored-by: Eugen Rochko --- config/locales/en.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config/locales/en.yml b/config/locales/en.yml index 6a5594185..98a07aa6a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -16,6 +16,7 @@ en: contact: Contact contact_missing: Not set contact_unavailable: N/A + continue_to_web: Continue to web app discover_users: Discover users documentation: Documentation federation_hint_html: With an account on %{instance} you'll be able to follow people on any Mastodon server and beyond. @@ -25,6 +26,8 @@ en: This account is a virtual actor used to represent the server itself and not any individual user. It is used for federation purposes and should not be blocked unless you want to block the whole instance, in which case you should use a domain block. learn_more: Learn more + logged_in_as_html: You are currently logged in as %{username}. + logout_before_registering: You are already logged in. privacy_policy: Privacy policy rules: Server rules rules_html: 'Below is a summary of rules you need to follow if you want to have an account on this server of Mastodon:' -- cgit From 02dbc59c91dbde9bfa67202200f4389971fc815b Mon Sep 17 00:00:00 2001 From: Claire Date: Thu, 3 Mar 2022 16:18:58 +0100 Subject: Add option to automatically delete toots after one week (#17691) Fixes #17658 --- app/models/account_statuses_cleanup_policy.rb | 1 + config/locales/en.yml | 1 + 2 files changed, 2 insertions(+) (limited to 'config') diff --git a/app/models/account_statuses_cleanup_policy.rb b/app/models/account_statuses_cleanup_policy.rb index 0f78c1a54..365123653 100644 --- a/app/models/account_statuses_cleanup_policy.rb +++ b/app/models/account_statuses_cleanup_policy.rb @@ -23,6 +23,7 @@ class AccountStatusesCleanupPolicy < ApplicationRecord include Redisable ALLOWED_MIN_STATUS_AGE = [ + 1.week.seconds, 2.weeks.seconds, 1.month.seconds, 2.months.seconds, diff --git a/config/locales/en.yml b/config/locales/en.yml index 98a07aa6a..2367d5ded 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1487,6 +1487,7 @@ en: '2629746': 1 month '31556952': 1 year '5259492': 2 months + '604800': 1 week '63113904': 2 years '7889238': 3 months min_age_label: Age threshold -- cgit