From 26ef7b7be3e923f974a46883a86e786cf02a28fd Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Wed, 25 Sep 2019 15:14:43 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E5=90=8D=E5=85=81=E8=AE=B8=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E4=B8=AD=E6=96=87=20(#3278)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Update] 修改资产主机名允许输入中文

* [Update] 修改资产主机名允许输入中文2
---
 apps/assets/forms/asset.py           |  10 +++++---
 apps/assets/serializers/asset.py     |   2 +-
 apps/locale/zh/LC_MESSAGES/django.mo | Bin 80611 -> 80631 bytes
 apps/locale/zh/LC_MESSAGES/django.po |  36 +++++++++++++--------------
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/apps/assets/forms/asset.py b/apps/assets/forms/asset.py
index 62f9748be..d83172373 100644
--- a/apps/assets/forms/asset.py
+++ b/apps/assets/forms/asset.py
@@ -14,6 +14,10 @@ __all__ = [
     'AssetCreateForm', 'AssetUpdateForm', 'AssetBulkUpdateForm', 'ProtocolForm',
 ]
 
+HELP_TEXTS_ASSET_HOSTNAME = _(
+    'Only Numbers、letters、 chinese and characters ( {} ) are allowed'
+).format(" ".join(['.', '_', '@']))
+
 
 class ProtocolForm(forms.Form):
     name = forms.ChoiceField(
@@ -68,8 +72,7 @@ class AssetCreateForm(OrgModelForm):
             'nodes': _("Node"),
         }
         help_texts = {
-            'hostname': _('Only Numbers, letters, and characters ( {} ) '
-                          'are allowed').format(" ".join(['.', '_', '@'])),
+            'hostname': HELP_TEXTS_ASSET_HOSTNAME,
             'admin_user': _(
                 'root or other NOPASSWD sudo privilege user existed in asset,'
                 'If asset is windows or other set any one, more see admin user left menu'
@@ -116,8 +119,7 @@ class AssetUpdateForm(OrgModelForm):
             'nodes': _("Node"),
         }
         help_texts = {
-            'hostname': _('Only Numbers, letters, and characters ( {} ) '
-                          'are allowed').format(" ".join(['.', '_', '@'])),
+            'hostname': HELP_TEXTS_ASSET_HOSTNAME,
             'admin_user': _(
                 'root or other NOPASSWD sudo privilege user existed in asset,'
                 'If asset is windows or other set any one, more see admin user left menu'
diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py
index f9f099ba8..008816ee5 100644
--- a/apps/assets/serializers/asset.py
+++ b/apps/assets/serializers/asset.py
@@ -94,7 +94,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer):
 
     @staticmethod
     def validate_hostname(hostname):
-        pattern = r"^[\._@a-zA-Z0-9-]+$"
+        pattern = r"^[\._@a-zA-Z0-9-\u4e00-\u9fa5]+$"
         res = re.match(pattern, hostname)
         if res is None:
             msg = _("* The hostname contains characters that are not allowed")
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 0708229e95664711bd7d6f0c8ed519bbd6f71c75..6701de0ac2621b371c3748dafa2296f05bdc7fd0 100644
GIT binary patch
delta 13043
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

delta 13023
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
V{j_ZQv3FiMvwro0l%#ta{6A`SXypI^

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index b5e92d498..5c9d8c4bd 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-25 14:29+0800\n"
+"POT-Creation-Date: 2019-09-25 15:11+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -112,7 +112,7 @@ msgstr "资产"
 #: applications/templates/applications/remote_app_detail.html:53
 #: applications/templates/applications/remote_app_list.html:20
 #: applications/templates/applications/user_remote_app_list.html:16
-#: assets/forms/asset.py:20 assets/forms/domain.py:73 assets/forms/user.py:74
+#: assets/forms/asset.py:24 assets/forms/domain.py:73 assets/forms/user.py:74
 #: assets/forms/user.py:94 assets/models/base.py:28 assets/models/cluster.py:18
 #: assets/models/cmd_filter.py:20 assets/models/domain.py:20
 #: assets/models/group.py:20 assets/models/label.py:18
@@ -576,14 +576,18 @@ msgstr "更新节点资产硬件信息: {}"
 msgid "Test if the assets under the node are connectable: {}"
 msgstr "测试节点下资产是否可连接: {}"
 
-#: assets/forms/asset.py:24 assets/models/asset.py:140
+#: assets/forms/asset.py:18
+msgid "Only Numbers、letters、 chinese and characters ( {} ) are allowed"
+msgstr "只允许包含数字、字母、中文和特殊字符（ {} ）"
+
+#: assets/forms/asset.py:28 assets/models/asset.py:140
 #: assets/models/domain.py:50
 #: assets/templates/assets/domain_gateway_list.html:69
 #: settings/templates/settings/replay_storage_create.html:59
 msgid "Port"
 msgstr "端口"
 
-#: assets/forms/asset.py:55 assets/models/asset.py:145
+#: assets/forms/asset.py:59 assets/models/asset.py:145
 #: assets/models/user.py:110 assets/templates/assets/asset_detail.html:190
 #: assets/templates/assets/asset_detail.html:198
 #: assets/templates/assets/system_user_assets.html:83
@@ -594,7 +598,7 @@ msgstr "端口"
 msgid "Nodes"
 msgstr "节点"
 
-#: assets/forms/asset.py:58 assets/forms/asset.py:106
+#: assets/forms/asset.py:62 assets/forms/asset.py:109
 #: assets/models/asset.py:149 assets/models/cluster.py:19
 #: assets/models/user.py:68 assets/templates/assets/asset_detail.html:76
 #: templates/_nav.html:44 xpack/plugins/cloud/models.py:161
@@ -603,7 +607,7 @@ msgstr "节点"
 msgid "Admin user"
 msgstr "管理用户"
 
-#: assets/forms/asset.py:61 assets/forms/asset.py:109 assets/forms/asset.py:150
+#: assets/forms/asset.py:65 assets/forms/asset.py:112 assets/forms/asset.py:152
 #: assets/templates/assets/asset_create.html:48
 #: assets/templates/assets/asset_create.html:50
 #: assets/templates/assets/asset_list.html:85
@@ -611,7 +615,7 @@ msgstr "管理用户"
 msgid "Label"
 msgstr "标签"
 
-#: assets/forms/asset.py:64 assets/forms/asset.py:112
+#: assets/forms/asset.py:68 assets/forms/asset.py:115
 #: assets/models/asset.py:144 assets/models/domain.py:26
 #: assets/models/domain.py:52 assets/templates/assets/asset_detail.html:80
 #: assets/templates/assets/user_asset_list.html:53
@@ -619,8 +623,8 @@ msgstr "标签"
 msgid "Domain"
 msgstr "网域"
 
-#: assets/forms/asset.py:68 assets/forms/asset.py:103 assets/forms/asset.py:116
-#: assets/forms/asset.py:153 assets/models/node.py:413
+#: assets/forms/asset.py:72 assets/forms/asset.py:106 assets/forms/asset.py:119
+#: assets/forms/asset.py:155 assets/models/node.py:413
 #: assets/templates/assets/asset_create.html:42
 #: perms/forms/asset_permission.py:82 perms/forms/asset_permission.py:89
 #: perms/templates/perms/asset_permission_list.html:53
@@ -635,11 +639,7 @@ msgstr "网域"
 msgid "Node"
 msgstr "节点"
 
-#: assets/forms/asset.py:71 assets/forms/asset.py:119
-msgid "Only Numbers, letters, and characters ( {} ) are allowed"
-msgstr "只允许包含数字，字母，特殊字符（ {} ）"
-
-#: assets/forms/asset.py:74 assets/forms/asset.py:122
+#: assets/forms/asset.py:77 assets/forms/asset.py:124
 msgid ""
 "root or other NOPASSWD sudo privilege user existed in asset,If asset is "
 "windows or other set any one, more see admin user left menu"
@@ -647,16 +647,16 @@ msgstr ""
 "root或其他拥有NOPASSWD: ALL权限的用户, 如果是windows或其它硬件可以随意设置一"
 "个, 更多信息查看左侧 `管理用户` 菜单"
 
-#: assets/forms/asset.py:77 assets/forms/asset.py:125
+#: assets/forms/asset.py:80 assets/forms/asset.py:127
 msgid "Windows 2016 RDP protocol is different, If is window 2016, set it"
 msgstr "Windows 2016的RDP协议与之前不同，如果是请设置"
 
-#: assets/forms/asset.py:78 assets/forms/asset.py:126
+#: assets/forms/asset.py:81 assets/forms/asset.py:128
 msgid ""
 "If your have some network not connect with each other, you can set domain"
 msgstr "如果有多个的互相隔离的网络，设置资产属于的网域，使用网域网关跳转登录"
 
-#: assets/forms/asset.py:133 assets/forms/asset.py:137
+#: assets/forms/asset.py:135 assets/forms/asset.py:139
 #: assets/forms/domain.py:17 assets/forms/label.py:15
 #: perms/templates/perms/asset_permission_asset.html:78
 #: xpack/plugins/change_auth_plan/forms.py:55
@@ -3915,7 +3915,7 @@ msgstr "您确定删除吗?"
 msgid "Search no entry matched in ou {}"
 msgstr "在ou:{}中没有匹配条目"
 
-#: settings/utils.py:120
+#: settings/utils.py:122
 msgid "The user source is not LDAP"
 msgstr "用户来源不是LDAP"