github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

pull/7368/head
John Niang 2024-12-13 22:33:07 +08:00 committed by GitHub
parent 96329967ba
commit 229254e3d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/src/lang/modules/en.ts
View File

@ -1079,8 +1079,8 @@ const message = {
unActive: `The Fail2ban service isn't enabled at present.`, unActive: `The Fail2ban service isn't enabled at present.`,
operation: 'You will perform operation "{0}" on Fail2ban service. Do you want to continue?', operation: 'You will perform operation "{0}" on Fail2ban service. Do you want to continue?',
fail2banChange: 'Fail2ban Configuration Modification', fail2banChange: 'Fail2ban Configuration Modification',
ignoreHelper: 'The IP list in the whitelist will be ignored for blocking. 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 blacklist will be blocked by the server. 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', maxRetry: 'Maximum retry attempts',
banTime: 'Ban time', banTime: 'Ban time',
banTimeHelper: 'Default ban time is 10 minutes, -1 indicates permanent ban', banTimeHelper: 'Default ban time is 10 minutes, -1 indicates permanent ban',
@ -1090,8 +1090,8 @@ const message = {
banAction: 'Ban action', banAction: 'Ban action',
banActionOption: 'Ban specified IP addresses using {0}', banActionOption: 'Ban specified IP addresses using {0}',
allPorts: ' (All Ports)', allPorts: ' (All Ports)',
ignoreIP: 'IP whitelist', ignoreIP: 'IP allowlist',
bannedIP: 'IP blacklist', bannedIP: 'IP blocklist',
logPath: 'Log path', logPath: 'Log path',
logPathHelper: 'Default is /var/log/secure or /var/log/auth.log', logPathHelper: 'Default is /var/log/secure or /var/log/auth.log',
}, },
@ -1426,9 +1426,9 @@ const message = {
apiInterfaceAlert4: 'Usage Docs', apiInterfaceAlert4: 'Usage Docs',
apiKey: 'Interface key', apiKey: 'Interface key',
apiKeyHelper: 'API key is used for third-party applications to access the API.', 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', 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', apiKeyReset: 'Interface key reset',
apiKeyResetHelper: 'the associated key service will become invalid. Please add a new key to the service', apiKeyResetHelper: 'the associated key service will become invalid. Please add a new key to the service',
confDockerProxy: 'Configure docker proxy', 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', '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', mustSave: 'The modification needs to be saved to take effect',
fileExt: 'file extension', fileExt: 'file extension',
fileExtBlock: 'file extension blacklist', fileExtBlock: 'file extension blocklist',
value: 'value', value: 'value',
enable: 'Enable', enable: 'Enable',
proxyAddress: 'Proxy Address', proxyAddress: 'Proxy Address',
@ -2135,7 +2135,7 @@ const message = {
localSSL: 'Select server file', localSSL: 'Select server file',
privateKeyPath: 'Private key file', privateKeyPath: 'Private key file',
certificatePath: 'Certificate 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', redirect: 'Redirect',
sourceDomain: 'Source domain', sourceDomain: 'Source domain',
targetURL: 'Target URL address', targetURL: 'Target URL address',
@ -2301,14 +2301,14 @@ const message = {
notSupport: notSupport:
'No system firewall detected (firewalld or ufw). Please refer to the official documentation for installation.', 'No system firewall detected (firewalld or ufw). Please refer to the official documentation for installation.',
ccDeny: 'CC Protection', ccDeny: 'CC Protection',
ipWhiteList: 'IP whitelist', ipWhiteList: 'IP allowlist',
ipBlockList: 'IP blacklist', ipBlockList: 'IP blocklist',
fileExtBlockList: 'File extension blacklist', fileExtBlockList: 'File extension blocklist',
urlWhiteList: 'URL whitelist', urlWhiteList: 'URL allowlist',
urlBlockList: 'URL blacklist', urlBlockList: 'URL blocklist',
argsCheck: 'GET parameter check', argsCheck: 'GET parameter check',
postCheck: 'POST parameter verification', postCheck: 'POST parameter verification',
cookieBlockList: 'Cookie Blacklist', cookieBlockList: 'Cookie blocklist',
firewall: 'Firewall', 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.`, 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.`,