Merge branch 'Calcium-Ion:main' into main

web/src/i18n/locales/en.json

@@ -853,7 +853,7 @@
   "数量": "quantity",
   "数量": "quantity",
   "请选择或输入创建令牌的数量": "Please select or enter the number of tokens to create",
   "请选择或输入创建令牌的数量": "Please select or enter the number of tokens to create",
   "请选择渠道": "Please select a channel",
   "请选择渠道": "Please select a channel",
-  "允许的IP，一行一个": "Allowed IPs, one per line",
+  "允许的IP，一行一个，不填写则不限制": "Allowed IPs, one per line, not filled in means no restrictions",
   "IP黑名单": "IP blacklist",
   "IP黑名单": "IP blacklist",
   "不允许的IP，一行一个": "IPs not allowed, one per line",
   "不允许的IP，一行一个": "IPs not allowed, one per line",
   "请选择该渠道所支持的模型": "Please select the model supported by this channel",
   "请选择该渠道所支持的模型": "Please select the model supported by this channel",

web/src/pages/Token/EditToken.js

@@ -401,7 +401,7 @@ const EditToken = (props) => {
           <TextArea
           <TextArea
             label={t('IP白名单')}
             label={t('IP白名单')}
             name='allow_ips'
             name='allow_ips'
-            placeholder={t('允许的IP，一行一个')}
+            placeholder={t('允许的IP，一行一个，不填写则不限制')}
             onChange={(value) => {
             onChange={(value) => {
               handleInputChange('allow_ips', value);
               handleInputChange('allow_ips', value);
             }}
             }}