diff --git a/client/components/domains/register-domain-step/utility.js b/client/components/domains/register-domain-step/utility.js
index 27cf0df366a21..f6481d922edff 100644
--- a/client/components/domains/register-domain-step/utility.js
+++ b/client/components/domains/register-domain-step/utility.js
@@ -57,10 +57,10 @@ export function markFeaturedSuggestions(
return output;
}
-export function filterOutDomainsWithTlds( suggestions, blacklistTlds ) {
+export function filterOutDomainsWithTlds( suggestions, disallowedTlds ) {
return suggestions.filter( ( suggestion ) => {
const tld = suggestion.domain_name.split( '.' ).pop();
- return blacklistTlds.indexOf( tld ) === -1;
+ return disallowedTlds.indexOf( tld ) === -1;
} );
}
diff --git a/client/lib/domains/constants.js b/client/lib/domains/constants.js
index ed8ff7e5038c8..2881aa321d2a0 100644
--- a/client/lib/domains/constants.js
+++ b/client/lib/domains/constants.js
@@ -25,7 +25,7 @@ export const domainAvailability = {
AVAILABLE: 'available',
AVAILABLE_PREMIUM: 'available_premium',
AVAILABILITY_CHECK_ERROR: 'availability_check_error',
- BLACKLISTED: 'blacklisted_domain',
+ DISALLOWED: 'blacklisted_domain',
DOMAIN_SUGGESTIONS_THROTTLED: 'domain_suggestions_throttled',
DOTBLOG_SUBDOMAIN: 'dotblog_subdomain',
EMPTY_QUERY: 'empty_query',
diff --git a/client/lib/domains/get-tld.js b/client/lib/domains/get-tld.js
index 4e9422efaccae..b0f326922a7d0 100644
--- a/client/lib/domains/get-tld.js
+++ b/client/lib/domains/get-tld.js
@@ -8,7 +8,7 @@ import wpcomMultiLevelTlds from './tlds/wpcom-multi-level-tlds.json';
* Parse the tld from a given domain name, semi-naively. The function
* first parses against a list of tlds that have been sold on WP.com
* and falls back to a simplistic "everything after the last dot" approach
- * if the whitelist failed. This is ultimately not comprehensive as that
+ * if the list of explicitly allowed tlds failed. This is ultimately not comprehensive as that
* is a poor base assumption (lots of second level tlds, etc). However,
* for our purposes, the approach should be "good enough" for a long time.
*
diff --git a/client/lib/domains/registration/availability-messages.js b/client/lib/domains/registration/availability-messages.js
index 08587b9fb0b8f..f2ccda0940ad0 100644
--- a/client/lib/domains/registration/availability-messages.js
+++ b/client/lib/domains/registration/availability-messages.js
@@ -233,7 +233,7 @@ function getAvailabilityNotice( domain, error, errorData ) {
);
break;
- case domainAvailability.BLACKLISTED:
+ case domainAvailability.DISALLOWED:
if ( domain && domain.toLowerCase().indexOf( 'wordpress' ) > -1 ) {
message = translate(
'Due to {{a1}}trademark policy{{/a1}}, ' +
@@ -254,7 +254,7 @@ function getAvailabilityNotice( domain, error, errorData ) {
);
} else {
message = translate(
- 'Domain cannot be mapped to a WordPress.com blog because of blacklisted term.'
+ 'Domain cannot be mapped to a WordPress.com blog because of disallowed term.'
);
}
break;
diff --git a/client/lib/domains/registration/test/availability-messages.js b/client/lib/domains/registration/test/availability-messages.js
index 7bf24157e73b0..c5919a7b4b266 100644
--- a/client/lib/domains/registration/test/availability-messages.js
+++ b/client/lib/domains/registration/test/availability-messages.js
@@ -25,7 +25,7 @@ describe( 'getAvailabilityNotice()', () => {
test( 'Should return default message when domain is not a string', () => {
expect(
- getAvailabilityNotice( null, domainAvailability.BLACKLISTED, {
+ getAvailabilityNotice( null, domainAvailability.DISALLOWED, {
site: 1,
maintenanceEndTime: 2,
} )
diff --git a/client/my-sites/current-site/domain-warnings.jsx b/client/my-sites/current-site/domain-warnings.jsx
index de210ea14a380..fc9ddce8c087a 100644
--- a/client/my-sites/current-site/domain-warnings.jsx
+++ b/client/my-sites/current-site/domain-warnings.jsx
@@ -18,7 +18,7 @@ import QuerySiteDomains from 'components/data/query-site-domains';
import isUnlaunchedSite from 'state/selectors/is-unlaunched-site';
import isSiteEligibleForFullSiteEditing from 'state/selectors/is-site-eligible-for-full-site-editing';
-const ruleWhiteList = [
+const allowedRules = [
'unverifiedDomainsCanManage',
'unverifiedDomainsCannotManage',
'expiredDomainsCanManage',
@@ -53,7 +53,7 @@ const CurrentSiteDomainWarnings = ( {
isCompact
selectedSite={ selectedSite }
domains={ domains }
- ruleWhiteList={ ruleWhiteList }
+ allowedRules={ allowedRules }
isSiteEligibleForFSE={ isSiteEligibleForFSE }
siteIsUnlaunched={ siteIsUnlaunched }
/>
diff --git a/client/my-sites/domains/components/domain-warnings/index.jsx b/client/my-sites/domains/components/domain-warnings/index.jsx
index af8038e0081e7..fc4d4edda9151 100644
--- a/client/my-sites/domains/components/domain-warnings/index.jsx
+++ b/client/my-sites/domains/components/domain-warnings/index.jsx
@@ -60,7 +60,7 @@ const newTransfersWrongNSWarning = 'new-transfer-wrong-ns';
export class DomainWarnings extends React.PureComponent {
static propTypes = {
domains: PropTypes.array,
- ruleWhiteList: PropTypes.array,
+ allowedRules: PropTypes.array,
domain: PropTypes.object,
isCompact: PropTypes.bool,
siteIsUnlaunched: PropTypes.bool,
@@ -69,7 +69,7 @@ export class DomainWarnings extends React.PureComponent {
static defaultProps = {
isCompact: false,
- ruleWhiteList: [
+ allowedRules: [
'expiredDomainsCanManage',
'expiringDomainsCanManage',
'unverifiedDomainsCanManage',
@@ -125,7 +125,7 @@ export class DomainWarnings extends React.PureComponent {
this.newTransfersWrongNS,
this.pendingConsent,
];
- const validRules = this.props.ruleWhiteList.map( ( ruleName ) => this[ ruleName ] );
+ const validRules = this.props.allowedRules.map( ( ruleName ) => this[ ruleName ] );
return intersection( allRules, validRules );
}
diff --git a/client/my-sites/domains/components/domain-warnings/test/index.js b/client/my-sites/domains/components/domain-warnings/test/index.js
index 28a18f0ed7978..eb5740f995480 100644
--- a/client/my-sites/domains/components/domain-warnings/test/index.js
+++ b/client/my-sites/domains/components/domain-warnings/test/index.js
@@ -417,11 +417,11 @@ describe( 'index', () => {
} );
describe( 'Ruleset filtering', () => {
- test( 'should only process whitelisted renderers', () => {
+ test( 'should only process allowed renderers', () => {
const props = {
translate: identity,
domain: { name: 'example.com' },
- ruleWhiteList: [],
+ allowedRules: [],
selectedSite: {},
moment,
};
@@ -435,7 +435,7 @@ describe( 'index', () => {
const props = {
translate: identity,
domain: { name: 'example.com' },
- ruleWhiteList: [ 'getDomains' ],
+ allowedRules: [ 'getDomains' ],
selectedSite: {},
moment,
};
diff --git a/client/my-sites/domains/domain-management/edit/domain-types/registered-domain-type.jsx b/client/my-sites/domains/domain-management/edit/domain-types/registered-domain-type.jsx
index a429c7ec93935..127959249eeec 100644
--- a/client/my-sites/domains/domain-management/edit/domain-types/registered-domain-type.jsx
+++ b/client/my-sites/domains/domain-management/edit/domain-types/registered-domain-type.jsx
@@ -356,7 +356,7 @@ class RegisteredDomainType extends React.Component {
domain={ this.props.domain }
position="registered-domain"
selectedSite={ this.props.selectedSite }
- ruleWhiteList={ [ 'newTransfersWrongNS', 'pendingConsent' ] }
+ allowedRules={ [ 'newTransfersWrongNS', 'pendingConsent' ] }
/>
);
}
diff --git a/client/my-sites/domains/domain-management/list/index.jsx b/client/my-sites/domains/domain-management/list/index.jsx
index 4db5bad4b7685..ec5027dd92e03 100644
--- a/client/my-sites/domains/domain-management/list/index.jsx
+++ b/client/my-sites/domains/domain-management/list/index.jsx
@@ -86,7 +86,7 @@ export class List extends React.Component {
domains={ this.props.domains }
position="domain-list"
selectedSite={ this.props.selectedSite }
- ruleWhiteList={ [
+ allowedRules={ [
'newDomainsWithPrimary',
'newDomains',
'unverifiedDomainsCanManage',
diff --git a/client/my-sites/domains/domain-management/name-servers/index.jsx b/client/my-sites/domains/domain-management/name-servers/index.jsx
index a45435d10e9a1..3f0d89dce9b92 100644
--- a/client/my-sites/domains/domain-management/name-servers/index.jsx
+++ b/client/my-sites/domains/domain-management/name-servers/index.jsx
@@ -134,7 +134,7 @@ class NameServers extends React.Component {
domain={ domain }
position="domain-name-servers"
selectedSite={ this.props.selectedSite }
- ruleWhiteList={ [ 'pendingTransfer' ] }
+ allowedRules={ [ 'pendingTransfer' ] }
/>
{ this.warning() }
{ this.planUpsellForNonPrimaryDomain( domain ) }
diff --git a/client/my-sites/plans/current-plan/index.jsx b/client/my-sites/plans/current-plan/index.jsx
index 09d712e986e64..9348f131cba07 100644
--- a/client/my-sites/plans/current-plan/index.jsx
+++ b/client/my-sites/plans/current-plan/index.jsx
@@ -153,7 +153,7 @@ class CurrentPlan extends Component {
domains={ domains }
position="current-plan"
selectedSite={ selectedSite }
- ruleWhiteList={ [
+ allowedRules={ [
'newDomainsWithPrimary',
'newDomains',
'unverifiedDomainsCanManage',
diff --git a/packages/domain-picker/src/domain-picker/index.tsx b/packages/domain-picker/src/domain-picker/index.tsx
index 40dde084db1b0..7fb0c72572ea0 100644
--- a/packages/domain-picker/src/domain-picker/index.tsx
+++ b/packages/domain-picker/src/domain-picker/index.tsx
@@ -154,6 +154,7 @@ const DomainPicker: FunctionComponent< Props > = ( {