Merge pull request #2911 from liuliaozhong/3.8.x_issue_2901

fix: 全局设置中windows默认账号命名规则与描述不符 #2901
TencentBlueKing · Apr 18, 2024 · ef9a5b7 · ef9a5b7
2 parents f0e0794 + a6c8561
commit ef9a5b7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/backend/job-manage/service-job-manage/src/main/resources/i18n/message.properties b/src/backend/job-manage/service-job-manage/src/main/resources/i18n/message.properties
@@ -80,8 +80,8 @@ job.manage.whiteip.actionScope.fileDistribution=文件分发
 
 # 全局设置部分
 job.manage.globalsettings.defaultNameRules.description.linux=使用小写字母或 _ 开头，由 2-32 个英文字母、数字、_ 或 - 组成的字符
-job.manage.globalsettings.defaultNameRules.description.windows=由1~32个大小写字母或-组成的字符
-job.manage.globalsettings.defaultNameRules.description.database=由1~16个大小写 / 数字 / . / - / _ 组成的字符
+job.manage.globalsettings.defaultNameRules.description.windows=由1~32个大小写字母、数字或-组成的字符
+job.manage.globalsettings.defaultNameRules.description.database=由1~16个大小写字母 / 数字 / . / - / _ 组成的字符
 job.manage.globalsettings.defaultTitleHead=作业平台 | 腾讯蓝鲸智云
 job.manage.globalsettings.contactBKHelper=联系BK助手
 job.manage.globalsettings.BKDesktop=蓝鲸桌面

diff --git a/src/backend/job-manage/service-job-manage/src/main/resources/i18n/message_en.properties b/src/backend/job-manage/service-job-manage/src/main/resources/i18n/message_en.properties
@@ -80,7 +80,7 @@ job.manage.whiteip.actionScope.fileDistribution=File Transfer
 
 # 全局设置部分
 job.manage.globalsettings.defaultNameRules.description.linux=Characters starting with a lowercase letter or _ , composed of 2-32 lowercase / numbers / _ or -
-job.manage.globalsettings.defaultNameRules.description.windows=Composed of 1 to 32 uppercase and lowercase or -
+job.manage.globalsettings.defaultNameRules.description.windows=Composed of 1 to 32 uppercase or lowercase or numbers or -
 job.manage.globalsettings.defaultNameRules.description.database=Composed of 1 to 16 uppercase / lowercase / numbers / . / - / _
 job.manage.globalsettings.defaultTitleHead=Job | Tencent BlueKing
 job.manage.globalsettings.contactBKHelper=Contact BK-Helper

diff --git a/src/backend/job-manage/service-job-manage/src/main/resources/i18n/message_en_US.properties b/src/backend/job-manage/service-job-manage/src/main/resources/i18n/message_en_US.properties
@@ -80,7 +80,7 @@ job.manage.whiteip.actionScope.fileDistribution=File Transfer
 
 # 全局设置部分
 job.manage.globalsettings.defaultNameRules.description.linux=Characters starting with a lowercase letter or _ , composed of 2-32 lowercase / numbers / _ or -
-job.manage.globalsettings.defaultNameRules.description.windows=Composed of 1 to 32 uppercase and lowercase or -
+job.manage.globalsettings.defaultNameRules.description.windows=Composed of 1 to 32 uppercase and lowercase or numbers or -
 job.manage.globalsettings.defaultNameRules.description.database=Composed of 1 to 16 uppercase / lowercase / numbers / . / - / _
 job.manage.globalsettings.defaultTitleHead=Job | Tencent BlueKing
 job.manage.globalsettings.contactBKHelper=Contact BK-Helper

diff --git a/src/backend/job-manage/service-job-manage/src/main/resources/i18n/message_zh.properties b/src/backend/job-manage/service-job-manage/src/main/resources/i18n/message_zh.properties
@@ -80,8 +80,8 @@ job.manage.whiteip.actionScope.fileDistribution=文件分发
 
 # 全局设置部分
 job.manage.globalsettings.defaultNameRules.description.linux=使用小写字母或 _ 开头，由 2-32 个英文字母、数字、_ 或 - 组成的字符
-job.manage.globalsettings.defaultNameRules.description.windows=由1~32个大小写字母或-组成的字符
-job.manage.globalsettings.defaultNameRules.description.database=由1~16个大小写 / 数字 / . / - / _ 组成的字符
+job.manage.globalsettings.defaultNameRules.description.windows=由1~32个大小写字母、数字或-组成的字符
+job.manage.globalsettings.defaultNameRules.description.database=由1~16个大小写字母 / 数字 / . / - / _ 组成的字符
 job.manage.globalsettings.defaultTitleHead=作业平台 | 腾讯蓝鲸智云
 job.manage.globalsettings.contactBKHelper=联系BK助手
 job.manage.globalsettings.BKDesktop=蓝鲸桌面

diff --git a/src/backend/job-manage/service-job-manage/src/main/resources/i18n/message_zh_CN.properties b/src/backend/job-manage/service-job-manage/src/main/resources/i18n/message_zh_CN.properties
@@ -80,8 +80,8 @@ job.manage.whiteip.actionScope.fileDistribution=文件分发
 
 # 全局设置部分
 job.manage.globalsettings.defaultNameRules.description.linux=使用小写字母或 _ 开头，由 2-32 个英文字母、数字、_ 或 - 组成的字符
-job.manage.globalsettings.defaultNameRules.description.windows=由1~32个大小写字母或-组成的字符
-job.manage.globalsettings.defaultNameRules.description.database=由1~16个大小写 / 数字 / . / - / _ 组成的字符
+job.manage.globalsettings.defaultNameRules.description.windows=由1~32个大小写字母、数字或-组成的字符
+job.manage.globalsettings.defaultNameRules.description.database=由1~16个大小写字母 / 数字 / . / - / _ 组成的字符
 job.manage.globalsettings.defaultTitleHead=作业平台 | 腾讯蓝鲸智云
 job.manage.globalsettings.contactBKHelper=联系BK助手
 job.manage.globalsettings.BKDesktop=蓝鲸桌面