Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)
* Allow import/export of instance-level domain blocks/allows (#1754) * Allow import/export of instance-level domain blocks/allows. Fixes #15095 * Pacify circleci * Address simple code review feedback * Add headers to exported CSV * Extract common import/export functionality to AdminExportControllerConcern * Add additional fields to instance-blocked domain export * Address review feedback * Split instance domain block/allow import/export into separate pages/controllers * Address code review feedback * Pacify DeepSource * Work around Paperclip::HasAttachmentFile for Rails 6 * Fix deprecated API warning in export tests * Remove after_commit workaround (cherry picked from commit94e98864e3
) * Add confirmation page when importing blocked domains (#1773) * Move glitch-soc-specific strings to glitch-soc-specific locale files * Add confirmation page when importing blocked domains (cherry picked from commitb91196f4b7
) * Fix authorization check in domain blocks controller (cherry picked from commit7527937758
) * Fix error strings for domain blocks and email-domain blocks Corrected issue with non-error message used for Mastodon:NotPermittedError in Domain Blocks Corrected issue Domain Blocks using the Email Domain Blocks message on ActionContoller::ParameterMissing Corrected issue with Email Domain Blocks using the not_permitted string from "custom emojii's" * Ran i18n-tasks normalize to address test failure * Removed unused admin.export_domain_blocks.not_permitted string Removing unused string as indicated by Check i18n * Fix tests (cherry picked from commit9094c2f52c
) * Fix domain block export not exporting blocks with only media rejection (cherry picked from commit26ff48ee48
) * Fix various issues with domain block import - stop using Paperclip for processing domain allow/block imports - stop leaving temporary files - better error handling - assume CSV files are UTF-8-encoded (cherry picked from commit cad824d8f501b95377e4f0a957e5a00d517a1902) Co-authored-by: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
@ -373,6 +373,8 @@ en:
|
||||
add_new: Allow federation with domain
|
||||
created_msg: Domain has been successfully allowed for federation
|
||||
destroyed_msg: Domain has been disallowed from federation
|
||||
export: Export
|
||||
import: Import
|
||||
undo: Disallow federation with domain
|
||||
domain_blocks:
|
||||
add_new: Add new domain block
|
||||
@ -382,6 +384,8 @@ en:
|
||||
edit: Edit domain block
|
||||
existing_domain_block: You have already imposed stricter limits on %{name}.
|
||||
existing_domain_block_html: You have already imposed stricter limits on %{name}, you need to <a href="%{unblock_url}">unblock it</a> first.
|
||||
export: Export
|
||||
import: Import
|
||||
new:
|
||||
create: Create block
|
||||
hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts.
|
||||
@ -391,6 +395,8 @@ en:
|
||||
silence: Limit
|
||||
suspend: Suspend
|
||||
title: New domain block
|
||||
no_domain_block_selected: No domain blocks were changed as none were selected
|
||||
not_permitted: You are not permitted to perform this action
|
||||
obfuscate: Obfuscate domain name
|
||||
obfuscate_hint: Partially obfuscate the domain name in the list if advertising the list of domain limitations is enabled
|
||||
private_comment: Private comment
|
||||
@ -422,6 +428,20 @@ en:
|
||||
resolved_dns_records_hint_html: The domain name resolves to the following MX domains, which are ultimately responsible for accepting e-mail. Blocking an MX domain will block sign-ups from any e-mail address which uses the same MX domain, even if the visible domain name is different. <strong>Be careful not to block major e-mail providers.</strong>
|
||||
resolved_through_html: Resolved through %{domain}
|
||||
title: Blocked e-mail domains
|
||||
export_domain_allows:
|
||||
new:
|
||||
title: Import domain allows
|
||||
no_file: No file selected
|
||||
export_domain_blocks:
|
||||
import:
|
||||
description_html: You are about to import a list of domain blocks. Please review this list very carefully, especially if you have not authored this list yourself.
|
||||
existing_relationships_warning: Existing follow relationships
|
||||
private_comment_description_html: 'To help you track where imported blocks come from, imported blocks will be created with the following private comment: <q>%{comment}</q>'
|
||||
private_comment_template: Imported from %{source} on %{date}
|
||||
title: Import domain blocks
|
||||
new:
|
||||
title: Import domain blocks
|
||||
no_file: No file selected
|
||||
follow_recommendations:
|
||||
description_html: "<strong>Follow recommendations help new users quickly find interesting content</strong>. When a user has not interacted with others enough to form personalized follow recommendations, these accounts are recommended instead. They are re-calculated on a daily basis from a mix of accounts with the highest recent engagements and highest local follower counts for a given language."
|
||||
language: For language
|
||||
@ -1159,6 +1179,7 @@ en:
|
||||
invalid_markup: 'contains invalid HTML markup: %{error}'
|
||||
imports:
|
||||
errors:
|
||||
invalid_csv_file: 'Invalid CSV file. Error: %{error}'
|
||||
over_rows_processing_limit: contains more than %{count} rows
|
||||
modes:
|
||||
merge: Merge
|
||||
|
Reference in New Issue
Block a user