Skip to content

Commit fb29917

Browse files
authored
fix: Improve some internationalized content (#7996)
1 parent 51bb42c commit fb29917

File tree

19 files changed

+579
-340
lines changed

19 files changed

+579
-340
lines changed

frontend/src/assets/iconfont/iconfont.css

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@font-face {
22
font-family: "iconfont"; /* Project id 4776196 */
3-
src: url('iconfont.woff2?t=1740392092454') format('woff2'),
4-
url('iconfont.woff?t=1740392092454') format('woff'),
5-
url('iconfont.ttf?t=1740392092454') format('truetype'),
6-
url('iconfont.svg?t=1740392092454#iconfont') format('svg');
3+
src: url('iconfont.woff2?t=1740474796282') format('woff2'),
4+
url('iconfont.woff?t=1740474796282') format('woff'),
5+
url('iconfont.ttf?t=1740474796282') format('truetype'),
6+
url('iconfont.svg?t=1740474796282#iconfont') format('svg');
77
}
88

99
.iconfont {
@@ -258,14 +258,6 @@
258258
content: "\e666";
259259
}
260260

261-
.p-gpu-1:before {
262-
content: "\e623";
263-
}
264-
265-
.p-gpu-2:before {
266-
content: "\e6d8";
267-
}
268-
269261
.p-xpack:before {
270262
content: "\e60b";
271263
}

frontend/src/assets/iconfont/iconfont.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/src/assets/iconfont/iconfont.json

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -432,20 +432,6 @@
432432
"unicode": "e666",
433433
"unicode_decimal": 58982
434434
},
435-
{
436-
"icon_id": "6176565",
437-
"name": "监控",
438-
"font_class": "gpu-1",
439-
"unicode": "e623",
440-
"unicode_decimal": 58915
441-
},
442-
{
443-
"icon_id": "640495",
444-
"name": "详细信息",
445-
"font_class": "gpu-2",
446-
"unicode": "e6d8",
447-
"unicode_decimal": 59096
448-
},
449435
{
450436
"icon_id": "3722144",
451437
"name": "钻石",

frontend/src/assets/iconfont/iconfont.svg

Lines changed: 0 additions & 4 deletions
Loading
-432 Bytes
Binary file not shown.
-252 Bytes
Binary file not shown.
-208 Bytes
Binary file not shown.

frontend/src/components/task-log/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const openWithResourceID = (taskType: string, taskOperate: string, resourceID: n
6464
6565
const handleClose = () => {
6666
open.value = false;
67+
bus.emit('close', true);
6768
bus.emit('refreshTask', true);
6869
};
6970

frontend/src/lang/modules/en.ts

Lines changed: 78 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2718,29 +2718,6 @@ const message = {
27182718
manage: 'Management',
27192719
},
27202720
},
2721-
customApp: {
2722-
name: 'Custom App Repository',
2723-
appStoreType: 'App Store Package Source',
2724-
appStoreUrl: 'Repository URL',
2725-
local: 'Local Path',
2726-
remote: 'Remote Link',
2727-
imagePrefix: 'Image Prefix',
2728-
imagePrefixHelper:
2729-
'Function: Customize the image prefix and modify the image field in the compose file. For example, when the image prefix is set to 1panel/custom, the image field for MaxKB will change to 1panel/custom/maxkb:v1.10.0',
2730-
closeHelper: 'Cancel using custom app repository',
2731-
appStoreUrlHelper: 'Only .tar.gz format is supported',
2732-
postNode: 'Sync to sub-node',
2733-
postNodeHelper: 'Sub-nodes will inherit and use the above configuration by default',
2734-
nodes: 'Nodes',
2735-
},
2736-
alert: {
2737-
isAlert: 'Alert',
2738-
alertCount: 'Alert Count',
2739-
clamHelper: 'Trigger SMS alert when scanning infected files',
2740-
cronJobHelper: 'Trigger SMS alert when scheduled task execution fails',
2741-
licenseHelper: 'Professional version supports SMS alert',
2742-
alertCountHelper: 'Maximum daily alarm frequency',
2743-
},
27442721
xpack: {
27452722
expiresTrialAlert:
27462723
'Friendly reminder: Your Pro trial will expire in {0} days, and all Pro features will no longer be accessible. Please renew or upgrade to the full version in a timely manner.',
@@ -3031,32 +3008,36 @@ const message = {
30313008
excludeUa: 'Exclude User-Agent',
30323009
},
30333010
tamper: {
3034-
tamper: 'Site Integrity',
3011+
tamper: 'Website Tamper Protection',
3012+
ignoreTemplate: 'Exclude Directory Template',
3013+
protectTemplate: 'Protect File Template',
3014+
templateContent: 'Template Content',
3015+
template: 'Template',
30353016
tamperHelper1:
3036-
'For one-click deployment type websites, it is recommended to enable the application directory anti-tampering feature. If the website malfunctions or backup/restore fails, please disable the anti-tampering feature first.',
3017+
'For one-click deployment type websites, it is recommended to enable the application directory tamper protection feature; if the website is not functioning properly or there are backup and recovery failures, please first disable the tamper protection feature;',
30373018
tamperHelper2:
3038-
'It will restrict the read, write, delete, permission, and owner modification operations of protected files under non-excluded directories',
3039-
op: 'Operation',
3040-
create: 'Create',
3041-
file: 'File',
3019+
'Operations for reading, writing, deleting, changing permissions, and modifying owners of protected files outside the excluded directories will be restricted',
30423020
tamperPath: 'Protected Directory',
3043-
tamperPathEdit: 'Modify Path',
3044-
log: 'Intercept Logs',
3045-
totalProtect: 'Total Protections',
3046-
todayProtect: 'Today’s Protections',
3021+
tamperPathEdit: 'Edit Path',
3022+
log: 'Intercept Log',
3023+
totalProtect: 'Total Protection',
3024+
todayProtect: 'Today’s Protection',
30473025
addRule: 'Add Rule',
30483026
ignore: 'Exclude Directory',
3049-
ignoreHelper: 'One entry per line, e.g., \ntmp\n./tmp',
3050-
ignoreHelper1: 'Add folder names or specific paths to exclude from protection.',
3051-
ignoreHelper2: 'Use relative paths starting with ./ to exclude specific folders.',
3052-
protect: 'Protected file',
3053-
protectHelper: 'One entry per line, e.g., \npng\n./test.css',
3054-
protectHelper1: 'Specify file names, extensions, or specific files to protect.',
3055-
protectHelper2: 'Use relative paths starting with ./ to protect specific files.',
3027+
ignoreHelper: 'One per line, e.g.: \ntmp\n./tmp',
3028+
ignoreTemplateHelper: 'Add folder names to ignore, separated by commas, e.g.: tmp,cache',
3029+
templateRule: 'Length 1-512, name cannot contain symbols like {0}',
3030+
ignoreHelper1: 'Add folder names or specific paths to ignore',
3031+
ignoreHelper2: 'To ignore a specific folder, use a relative path starting with ./',
3032+
protect: 'Protect File',
3033+
protectHelper: 'One per line, e.g.: \npng\n./test.css',
3034+
protectTemplateHelper: 'Add file names or extensions to ignore, separated by commas, e.g.: conf,.css',
3035+
protectHelper1: 'You can specify file names, extensions, or specific files to protect',
3036+
protectHelper2: 'To protect a specific file, use a relative path starting with ./',
30563037
enableHelper:
3057-
'The anti-tampering function of website {0} is about to be enabled to enhance website security. Do you want to continue?',
3038+
'The tamper protection feature for the following websites will be enabled to enhance website security. Do you want to continue?',
30583039
disableHelper:
3059-
'The anti-tampering function of website {0} is about to be disabled. Do you want to continue?',
3040+
'The tamper protection feature for the following websites will be disabled. Do you want to continue?',
30603041
},
30613042
setting: {
30623043
setting: 'Panel Settings',
@@ -3130,7 +3111,62 @@ const message = {
31303111
alertContent3:
31313112
'Provide users with custom phone numbers, daily push frequency, and daily push time configurations, making it easier for users to set up more reasonable push alerts.',
31323113
},
3114+
node: {
3115+
node: 'Node',
3116+
addr: 'Address',
3117+
memTotal: 'Total Memory',
3118+
nodeManagement: 'Node Management',
3119+
addNode: 'Add Node',
3120+
connInfo: 'Connection Information',
3121+
nodeInfo: 'Node Information',
3122+
panelExist:
3123+
'Detected that there is already 1panel service on this node. Adding this node will use the original service port and installation directory of 1panel. Do you want to continue?',
3124+
coreExist:
3125+
'Detected that there is already 1panel-core service on this node. Unable to add this node, please check and try again!',
3126+
agentExist: 'Detected that there is already 1panel-agent service on this node',
3127+
forceAdd: 'Force Add',
3128+
forceAddHelper: 'Force add will forcibly replace the 1panel-agent service on this node',
3129+
reinstallHelper: 'Reinstall node {0}, do you want to continue?',
3130+
unhealthyCheck: 'Abnormal Check',
3131+
fixOperation: 'Fix Operation',
3132+
checkName: 'Check Item',
3133+
checkSSHConn: 'Check SSH Connection Availability',
3134+
fixSSHConn: 'Manually edit the node to confirm connection information',
3135+
checkConnInfo: 'Check Agent Connection Information',
3136+
checkStatus: 'Check Node Service Availability',
3137+
fixStatus: 'Investigate Node Logs',
3138+
checkAPI: 'Check Node API Availability',
3139+
fixAPI: 'Check if the request address in the information is correct; if incorrect, modify the main node information',
3140+
forceDelete: 'Force Delete',
3141+
operateHelper: 'The following nodes will undergo {0} operation, do you want to continue?',
3142+
forceDeleteHelper: 'Force delete will ignore node deletion errors and delete database metadata',
3143+
baseDir: 'Installation Directory',
3144+
baseDirHelper:
3145+
'When the installation directory is empty, it will be installed in the /opt directory by default',
3146+
nodePort: 'Node Port',
3147+
},
3148+
customApp: {
3149+
name: 'Custom App Repository',
3150+
appStoreType: 'App Store Package Source',
3151+
appStoreUrl: 'Repository URL',
3152+
local: 'Local Path',
3153+
remote: 'Remote Link',
3154+
imagePrefix: 'Image Prefix',
3155+
imagePrefixHelper:
3156+
'Function: Customize the image prefix and modify the image field in the compose file. For example, when the image prefix is set to 1panel/custom, the image field for MaxKB will change to 1panel/custom/maxkb:v1.10.0',
3157+
closeHelper: 'Cancel using custom app repository',
3158+
appStoreUrlHelper: 'Only .tar.gz format is supported',
3159+
postNode: 'Sync to sub-node',
3160+
postNodeHelper: 'Sub-nodes will inherit and use the above configuration by default',
3161+
nodes: 'Nodes',
3162+
},
31333163
alert: {
3164+
isAlert: 'Alert',
3165+
alertCount: 'Alert Count',
3166+
clamHelper: 'Trigger SMS alert when scanning infected files',
3167+
cronJobHelper: 'Trigger SMS alert when scheduled task execution fails',
3168+
licenseHelper: 'Professional version supports SMS alert',
3169+
alertCountHelper: 'Maximum daily alarm frequency',
31343170
alert: 'SMS Alert',
31353171
logs: 'Alert Logs',
31363172
list: 'Alert List',

0 commit comments

Comments
 (0)