From a8cfccd839349f672a13afec02609919614a32de Mon Sep 17 00:00:00 2001 From: exstral Date: Sun, 3 May 2020 14:18:58 +0200 Subject: [PATCH] rename whitelist to allowlist and blacklist to blocklist --- config/locales/en.yml | 34 +++++++++++++++++----------------- config/locales/en_GB.yml | 12 ++++++------ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 9e4808ec8..b96368072 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -92,7 +92,7 @@ en: delete: Delete destroyed_msg: Moderation note successfully destroyed! accounts: - add_email_domain_block: Blacklist e-mail domain + add_email_domain_block: Blocklist e-mail domain approve: Approve approve_all: Approve all are_you_sure: Are you sure? @@ -193,7 +193,7 @@ en: username: Username warn: Warn web: Web - whitelisted: Whitelisted + whitelisted: Allowlisted action_logs: action_types: assigned_to_self_report: Assign Report @@ -238,15 +238,15 @@ en: create_account_warning: "%{name} sent a warning to %{target}" create_announcement: "%{name} created new announcement %{target}" create_custom_emoji: "%{name} uploaded new emoji %{target}" - create_domain_allow: "%{name} whitelisted domain %{target}" + create_domain_allow: "%{name} allowlisted domain %{target}" create_domain_block: "%{name} blocked domain %{target}" - create_email_domain_block: "%{name} blacklisted e-mail domain %{target}" + create_email_domain_block: "%{name} blocklisted e-mail domain %{target}" demote_user: "%{name} demoted user %{target}" destroy_announcement: "%{name} deleted announcement %{target}" destroy_custom_emoji: "%{name} destroyed emoji %{target}" - destroy_domain_allow: "%{name} removed domain %{target} from whitelist" + destroy_domain_allow: "%{name} removed domain %{target} from allowlist" destroy_domain_block: "%{name} unblocked domain %{target}" - destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}" + destroy_email_domain_block: "%{name} allowlisted e-mail domain %{target}" destroy_status: "%{name} removed status by %{target}" disable_2fa_user: "%{name} disabled two factor requirement for user %{target}" disable_custom_emoji: "%{name} disabled emoji %{target}" @@ -346,12 +346,12 @@ en: week_interactions: interactions this week week_users_active: active this week week_users_new: users this week - whitelist_mode: Whitelist mode + whitelist_mode: allowlist mode domain_allows: - add_new: Whitelist domain - created_msg: Domain has been successfully whitelisted - destroyed_msg: Domain has been removed from the whitelist - undo: Remove from whitelist + add_new: Add domain to allowlist + created_msg: Domain has been successfully added to allowlist + destroyed_msg: Domain has been removed from the allowlist + undo: Remove from allowlist domain_blocks: add_new: Add new domain block created_msg: Domain block is now being processed @@ -394,16 +394,16 @@ en: view: View domain block email_domain_blocks: add_new: Add new - created_msg: Successfully added e-mail domain to blacklist + created_msg: Successfully added e-mail domain to blocklist delete: Delete - destroyed_msg: Successfully deleted e-mail domain from blacklist + destroyed_msg: Successfully deleted e-mail domain from blocklist domain: Domain - empty: No e-mail domains currently blacklisted. + empty: No e-mail domains currently blocklisted. from_html: from %{domain} new: create: Add domain - title: New e-mail blacklist entry - title: E-mail blacklist + title: New e-mail blocklist entry + title: E-mail blocklist instances: by_domain: Domain delivery_available: Delivery is available @@ -447,7 +447,7 @@ en: pending: Waiting for relay's approval save_and_enable: Save and enable setup: Setup a relay connection - signatures_not_enabled: Relays will not work correctly while secure mode or whitelist mode is enabled + signatures_not_enabled: Relays will not work correctly while secure mode or allowlist mode is enabled status: Status title: Relays report_notes: diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index a38a36e38..8607daf36 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -181,11 +181,11 @@ en_GB: create_account_warning: "%{name} sent a warning to %{target}" create_custom_emoji: "%{name} uploaded new emoji %{target}" create_domain_block: "%{name} blocked domain %{target}" - create_email_domain_block: "%{name} blacklisted e-mail domain %{target}" + create_email_domain_block: "%{name} blocklisted e-mail domain %{target}" demote_user: "%{name} demoted user %{target}" destroy_custom_emoji: "%{name} destroyed emoji %{target}" destroy_domain_block: "%{name} unblocked domain %{target}" - destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}" + destroy_email_domain_block: "%{name} allowlisted e-mail domain %{target}" destroy_status: "%{name} removed status by %{target}" disable_2fa_user: "%{name} disabled two factor requirement for user %{target}" disable_custom_emoji: "%{name} disabled emoji %{target}" @@ -289,14 +289,14 @@ en_GB: undo: Undo domain block email_domain_blocks: add_new: Add new - created_msg: Successfully added e-mail domain to blacklist + created_msg: Successfully added e-mail domain to blocklist delete: Delete - destroyed_msg: Successfully deleted e-mail domain from blacklist + destroyed_msg: Successfully deleted e-mail domain from blocklist domain: Domain new: create: Add domain - title: New e-mail blacklist entry - title: E-mail blacklist + title: New e-mail blocklist entry + title: E-mail blocklist followers: back_to_account: Back To Account title: "%{acct}'s Followers"