Replace whitelist and blacklist with allowlist and blocklist (#7358)

1Panel-dev · Dec 13, 2024 · 229254e · 229254e
1 parent 9632996
commit 229254e
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts
@@ -1079,8 +1079,8 @@ const message = {
             unActive: `The Fail2ban service isn't enabled at present.`,
             operation: 'You will perform operation "{0}" on Fail2ban service. Do you want to continue?',
             fail2banChange: 'Fail2ban Configuration Modification',
-            ignoreHelper: 'The IP list in the whitelist will be ignored for blocking. Do you want to continue?',
-            bannedHelper: 'The IP list in the blacklist will be blocked by the server. Do you want to continue?',
+            ignoreHelper: 'The IP list in the allowlist will be ignored for blocking. Do you want to continue?',
+            bannedHelper: 'The IP list in the blocklist will be blocked by the server. Do you want to continue?',
             maxRetry: 'Maximum retry attempts',
             banTime: 'Ban time',
             banTimeHelper: 'Default ban time is 10 minutes, -1 indicates permanent ban',
@@ -1090,8 +1090,8 @@ const message = {
             banAction: 'Ban action',
             banActionOption: 'Ban specified IP addresses using {0}',
             allPorts: ' (All Ports)',
-            ignoreIP: 'IP whitelist',
-            bannedIP: 'IP blacklist',
+            ignoreIP: 'IP allowlist',
+            bannedIP: 'IP blocklist',
             logPath: 'Log path',
             logPathHelper: 'Default is /var/log/secure or /var/log/auth.log',
         },
@@ -1426,9 +1426,9 @@ const message = {
         apiInterfaceAlert4: 'Usage Docs',
         apiKey: 'Interface key',
         apiKeyHelper: 'API key is used for third-party applications to access the API.',
-        ipWhiteList: 'IP whitelist',
+        ipWhiteList: 'IP allowlist',
         ipWhiteListEgs: 'One per line. For example,\n172.161.10.111\n172.161.10.0/24',
-        ipWhiteListHelper: 'IPs within the whitelist can access the API.',
+        ipWhiteListHelper: 'IPs within the allowlist can access the API.',
         apiKeyReset: 'Interface key reset',
         apiKeyResetHelper: 'the associated key service will become invalid. Please add a new key to the service',
         confDockerProxy: 'Configure docker proxy',
@@ -1994,7 +1994,7 @@ const message = {
             'Accumulatively request the same URL more than {1} times within {0} seconds, trigger CC defense, block this IP',
         mustSave: 'The modification needs to be saved to take effect',
         fileExt: 'file extension',
-        fileExtBlock: 'file extension blacklist',
+        fileExtBlock: 'file extension blocklist',
         value: 'value',
         enable: 'Enable',
         proxyAddress: 'Proxy Address',
@@ -2135,7 +2135,7 @@ const message = {
         localSSL: 'Select server file',
         privateKeyPath: 'Private key file',
         certificatePath: 'Certificate file',
-        ipWhiteListHelper: 'The role of IP whitelist: all rules are invalid for IP whitelist',
+        ipWhiteListHelper: 'The role of IP allowlist: all rules are invalid for IP allowlist',
         redirect: 'Redirect',
         sourceDomain: 'Source domain',
         targetURL: 'Target URL address',
@@ -2301,14 +2301,14 @@ const message = {
         notSupport:
             'No system firewall detected (firewalld or ufw). Please refer to the official documentation for installation.',
         ccDeny: 'CC Protection',
-        ipWhiteList: 'IP whitelist',
-        ipBlockList: 'IP blacklist',
-        fileExtBlockList: 'File extension blacklist',
-        urlWhiteList: 'URL whitelist',
-        urlBlockList: 'URL blacklist',
+        ipWhiteList: 'IP allowlist',
+        ipBlockList: 'IP blocklist',
+        fileExtBlockList: 'File extension blocklist',
+        urlWhiteList: 'URL allowlist',
+        urlBlockList: 'URL blocklist',
         argsCheck: 'GET parameter check',
         postCheck: 'POST parameter verification',
-        cookieBlockList: 'Cookie Blacklist',
+        cookieBlockList: 'Cookie blocklist',
 
         firewall: 'Firewall',
         dockerHelper: `Linux firewall "{0}" can't disable Docker port mapping. The application can edit the parameters on the "App Store -> Installed" page to control whether the port is released.`,