From 2f7d744228fdf0d4c0b9d3adac22f7291f6e143a Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Mon, 13 Jul 2020 10:19:29 -0700
Subject: [PATCH] Rename whitelist error to allowed (#6372)

---
 src/translations/en.json                  |  2 +-
 test-mocha/common/entity/entity_filter.ts | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/translations/en.json b/src/translations/en.json
index 1f454dbe12..ea27d153e6 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -2319,7 +2319,7 @@
                 }
               },
               "abort": {
-                "not_whitelisted": "Your computer is not whitelisted."
+                "not_allowed": "Your computer is not allowed."
               }
             }
           }
diff --git a/test-mocha/common/entity/entity_filter.ts b/test-mocha/common/entity/entity_filter.ts
index 74f4b48e7b..35e1f7ac05 100644
--- a/test-mocha/common/entity/entity_filter.ts
+++ b/test-mocha/common/entity/entity_filter.ts
@@ -13,14 +13,14 @@ describe("EntityFilter", () => {
   });
 
   // case 2
-  it("allows whitelisting entities by entity id", () => {
+  it("allows entities by entity id", () => {
     const filter = generateFilter(undefined, ["light.kitchen"]);
 
     assert(filter("light.kitchen"));
     assert(!filter("light.living_room"));
   });
 
-  it("allows whitelisting entities by domain", () => {
+  it("allows entities by domain", () => {
     const filter = generateFilter(["switch"]);
 
     assert(filter("switch.bla"));
@@ -28,7 +28,7 @@ describe("EntityFilter", () => {
   });
 
   // case 3
-  it("allows blacklisting entities by entity id", () => {
+  it("excluding entities by entity id", () => {
     const filter = generateFilter(undefined, undefined, undefined, [
       "light.kitchen",
     ]);
@@ -37,7 +37,7 @@ describe("EntityFilter", () => {
     assert(filter("light.living_room"));
   });
 
-  it("allows blacklisting entities by domain", () => {
+  it("excluding entities by domain", () => {
     const filter = generateFilter(undefined, undefined, ["switch"]);
 
     assert(!filter("switch.bla"));
@@ -45,7 +45,7 @@ describe("EntityFilter", () => {
   });
 
   // case 4a
-  it("allows whitelisting domain and blacklisting entity", () => {
+  it("allows domain and excluding entity", () => {
     const filter = generateFilter(["switch"], undefined, undefined, [
       "switch.kitchen",
     ]);
@@ -55,7 +55,7 @@ describe("EntityFilter", () => {
     assert(!filter("sensor.bla"));
   });
 
-  it("allows whitelisting entity while whitelisting other domains", () => {
+  it("allows entity while other domains", () => {
     const filter = generateFilter(["switch"], ["light.kitchen"]);
 
     assert(filter("switch.living_room"));
@@ -64,7 +64,7 @@ describe("EntityFilter", () => {
   });
 
   // case 4b
-  it("allows blacklisting domain and whitelisting entity", () => {
+  it("excluding domain and entity", () => {
     const filter = generateFilter(undefined, ["switch.kitchen"], ["switch"]);
 
     assert(filter("switch.kitchen"));
@@ -72,7 +72,7 @@ describe("EntityFilter", () => {
     assert(filter("sensor.bla"));
   });
 
-  it("allows blacklisting domain and excluding entities", () => {
+  it("excluding domain and excluding entities", () => {
     const filter = generateFilter(
       undefined,
       undefined,
@@ -86,7 +86,7 @@ describe("EntityFilter", () => {
   });
 
   // case 4c
-  it("allows whitelisting entities", () => {
+  it("allows entities", () => {
     const filter = generateFilter(undefined, ["light.kitchen"]);
 
     assert(filter("light.kitchen"));