gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 解决冲突

Browse Source
This commit is contained in:
@changcode
2021-08-03 09:45:10 +08:00
parent 17c28cd4ec
commit c58d3d7226
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/components/common/language/cn.js
View File

@@ -6,6 +6,7 @@ const cn = {
endpointTemplate: 'endpoint模板', endpointTemplate: 'endpoint模板',
AddByTemplate: '使用模板创建', AddByTemplate: '使用模板创建',
exprTemp: '表达式模板', exprTemp: '表达式模板',
checkAssetAge: '输入框字段过长',
oneHour: '1 小时', oneHour: '1 小时',
twoHour: '2 小时', twoHour: '2 小时',
sixHour: '6 小时', sixHour: '6 小时',

1
nezha-fronted/src/components/common/language/en.js
View File

@@ -11,6 +11,7 @@ const en = {
customPicture: 'Custom picture', customPicture: 'Custom picture',
endpointTemplate: 'Endpoint template', endpointTemplate: 'Endpoint template',
AddByTemplate: 'Add by template', AddByTemplate: 'Add by template',
checkAssetAge: 'Input field too long',
exprTemp: 'Expr temp', exprTemp: 'Expr temp',
oneHour: '1 hour', oneHour: '1 hour',
twoHour: '2 hours', twoHour: '2 hours',