From 654c517240e58ef31c5536e6e7693ff815a21fbf Mon Sep 17 00:00:00 2001 From: rainzm Date: Thu, 10 Sep 2020 17:48:20 +0800 Subject: [PATCH] =?UTF-8?q?feat(region):=20replace=20=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E6=9C=BA=20with=20=E4=B8=BB=E6=9C=BA=20or=20=E4=BA=91=E4=B8=BB?= =?UTF-8?q?=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../share/notify_templates/compute/content/SERVER_CHANGE_FLAVOR | 2 +- .../share/notify_templates/compute/content/SERVER_CREATED | 2 +- .../share/notify_templates/compute/content/SERVER_CREATED_ADMIN | 2 +- .../share/notify_templates/compute/content/SERVER_DELETED | 2 +- .../share/notify_templates/compute/content/SERVER_DELETED_ADMIN | 2 +- .../share/notify_templates/compute/content/SERVER_PANICKED | 2 +- .../share/notify_templates/compute/content/SERVER_REBUILD_ROOT | 2 +- .../share/notify_templates/compute/title/SERVER_CHANGE_FLAVOR | 2 +- .../yunion/share/notify_templates/compute/title/SERVER_CREATED | 2 +- .../share/notify_templates/compute/title/SERVER_CREATED_ADMIN | 2 +- .../yunion/share/notify_templates/compute/title/SERVER_DELETED | 2 +- .../share/notify_templates/compute/title/SERVER_DELETED_ADMIN | 2 +- .../yunion/share/notify_templates/compute/title/SERVER_PANICKED | 2 +- .../share/notify_templates/compute/title/SERVER_REBUILD_ROOT | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CHANGE_FLAVOR b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CHANGE_FLAVOR index ae88892b55..08fa26dea4 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CHANGE_FLAVOR +++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CHANGE_FLAVOR @@ -1 +1 @@ -您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。 +您的{{ .brand }}虚拟机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。 diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED index 794534b586..c456e7b69c 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED +++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED @@ -1 +1 @@ -您的{{ .brand }}主机{{ .name }}已经创建成功，服务器IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。 +您的{{ .brand }}虚拟机{{ .name }}已经创建成功，虚拟机IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问虚拟机。 diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED_ADMIN b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED_ADMIN index ac8116d83f..9f7fa90cda 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED_ADMIN +++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED_ADMIN @@ -1 +1 @@ -项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功。 +项目{{ .tenant }}的{{ .brand }}虚拟机{{ .name }}已经创建成功。 diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED index fdb4991a1c..37787d8156 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED +++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED @@ -1 +1 @@ -您的{{ .brand }}主机{{ .name }}已经删除。 +您的{{ .brand }}虚拟机{{ .name }}已经删除。 diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED_ADMIN b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED_ADMIN index 9486f23ac3..e2a05387b2 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED_ADMIN +++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED_ADMIN @@ -1 +1 @@ -项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经删除。 +项目{{ .tenant }}的{{ .brand }}虚拟机{{ .name }}已经删除。 diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_PANICKED b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_PANICKED index 31613dacb9..d8d1c01e87 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_PANICKED +++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_PANICKED @@ -1 +1 @@ -您的{{ .brand }}主机{{ .name }}系统崩溃了: {{ .reason }} \ No newline at end of file +您的{{ .brand }}虚拟机{{ .name }}系统崩溃了: {{ .reason }} diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_REBUILD_ROOT b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_REBUILD_ROOT index f3e3dd4ae0..f7358c4d4c 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_REBUILD_ROOT +++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_REBUILD_ROOT @@ -1 +1 @@ -您的{{ .brand }}主机{{ .name }}重装系统成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。 +您的{{ .brand }}虚拟机{{ .name }}重装系统成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问虚拟机。 diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CHANGE_FLAVOR b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CHANGE_FLAVOR index ae88892b55..08fa26dea4 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CHANGE_FLAVOR +++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CHANGE_FLAVOR @@ -1 +1 @@ -您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。 +您的{{ .brand }}虚拟机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。 diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED index bce76701de..40a3fc4a45 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED +++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED @@ -1 +1 @@ -{{ .brand }}主机{{ .Name }}创建成功 +{{ .brand }}虚拟机{{ .Name }}创建成功 diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED_ADMIN b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED_ADMIN index 0b3670d8b0..b2ce4be541 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED_ADMIN +++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED_ADMIN @@ -1 +1 @@ -项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功 +项目{{ .tenant }}的{{ .brand }}虚拟机{{ .name }}已经创建成功 diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED index 88e0c7bc7c..8dc7c4013d 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED +++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED @@ -1 +1 @@ -{{ .brand }}主机{{ .name }}删除通知 +{{ .brand }}虚拟机{{ .name }}删除通知 diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED_ADMIN b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED_ADMIN index 20e8c288db..76f3ea393e 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED_ADMIN +++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED_ADMIN @@ -1 +1 @@ -项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经删除 +项目{{ .tenant }}的{{ .brand }}虚拟机{{ .name }}已经删除 diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_PANICKED b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_PANICKED index 5a3a3206c0..4acc621661 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_PANICKED +++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_PANICKED @@ -1 +1 @@ -您的{{ .brand }}主机{{ .name }}系统崩溃了 \ No newline at end of file +您的{{ .brand }}虚拟机{{ .name }}系统崩溃了 diff --git a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_REBUILD_ROOT b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_REBUILD_ROOT index 4e275a206a..1bde0f7a2c 100644 --- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_REBUILD_ROOT +++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_REBUILD_ROOT @@ -1 +1 @@ -{{ .brand }}主机{{ .name }}重装系统成功 +{{ .brand }}虚拟机{{ .name }}重装系统成功