From a385684983033ce2fad78ef29d0ac1c1da9d4d06 Mon Sep 17 00:00:00 2001 From: Steven Zou Date: Mon, 10 Apr 2017 10:39:43 +0800 Subject: [PATCH 1/2] translate copyright to zh --- .../app/shared/about-dialog/about-dialog.component.html | 2 +- src/ui_ng/src/i18n/lang/en-us-lang.json | 3 ++- src/ui_ng/src/i18n/lang/zh-cn-lang.json | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html b/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html index 0077c134c..c727a38be 100644 --- a/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html +++ b/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html @@ -10,7 +10,7 @@
-

{{'ABOUT.COPYRIGHT' | translate}} http://www.vmware.com/go/patents

+

{{'ABOUT.COPYRIGHT' | translate}} http://www.vmware.com/go/patents {{'ABOUT.COPYRIGHT_SUFIX' | translate}}

{{'ABOUT.TRADEMARK' | translate}}

{{'ABOUT.OPEN_SOURCE_LICENSE' | translate}} diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json index c807f58f5..8b7051398 100644 --- a/src/ui_ng/src/i18n/lang/en-us-lang.json +++ b/src/ui_ng/src/i18n/lang/en-us-lang.json @@ -405,12 +405,13 @@ "VERSION": "Version", "BUILD": "Build", "COPYRIGHT": "Copyright 1998-2017 VMware. Inc. All rights reserved. This product is protected by U.S. and international property laws. VMware products are covered by one or more patents listed at", + "COPYRIGHT_SUFIX": ".", "TRADEMARK": "VMware is a registered trademark or trademark of VMware. Inc. in the United States and other jurisdictions. All other marks and names mentioned herein may be trademark of their respective companies.", "END_USER_LICENSE": "End User License Agreement", "OPEN_SOURCE_LICENSE": "Open Source/Third Party License" }, "START_PAGE": { - "GETTING_START": "Project Harbor is an enterprise-class registry server that stores and distributes Docker images. Harbor extends the open source Docker Distribution by adding the functionalities usually required by an enterprise, such as security, identity and management. As an enterprise private registry, Harbor offers better performance and security.", + "GETTING_START": "", "GETTING_START_TITLE": "Getting Started" }, "TOP_REPO": "Popular Repositories", diff --git a/src/ui_ng/src/i18n/lang/zh-cn-lang.json b/src/ui_ng/src/i18n/lang/zh-cn-lang.json index d7bf9b3e8..e32d909a7 100644 --- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json +++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json @@ -404,13 +404,14 @@ "ABOUT": { "VERSION": "版本", "BUILD": "构建", - "COPYRIGHT": "Copyright 1998-2017 VMware. Inc. All rights reserved. This product is protected by U.S. and international property laws. VMware products are covered by one or more patents listed at", - "TRADEMARK": "VMware is a registered trademark or trademark of VMware. Inc. in the United States and other jurisdictions. All other marks and names mentioned herein may be trademark of their respective companies.", + "COPYRIGHT": "版权所有 © 1998-2017 VMware. Inc. 保留所有权利。此产品受美国及其他国家/地区的版权和知识产权以及国际条约保护。VMware产品受", + "COPYRIGHT_SUFIX": "上列出的一项或多项专利保护。", + "TRADEMARK": "VMware徽标及设计都是VMware. Inc.在美国和/或其他法律辖区的注册商标或者商标。此处提到的其他所有商标和名称分别是其各自公司的商标。", "END_USER_LICENSE": "终端用户许可协议", "OPEN_SOURCE_LICENSE": "开源/第三方许可协议" }, "START_PAGE": { - "GETTING_START": "Project Harbor is an enterprise-class registry server that stores and distributes Docker images. Harbor extends the open source Docker Distribution by adding the functionalities usually required by an enterprise, such as security, identity and management. As an enterprise private registry, Harbor offers better performance and security.", + "GETTING_START": "", "GETTING_START_TITLE": "从这开始" }, "TOP_REPO": "受欢迎的镜像仓库", From 7325572f38a231226c065b8b708a37d65113083f Mon Sep 17 00:00:00 2001 From: Steven Zou Date: Mon, 10 Apr 2017 10:58:10 +0800 Subject: [PATCH 2/2] Refine sign-in form validation behavior --- .../app/account/sign-in/sign-in.component.html | 4 ++-- .../src/app/account/sign-in/sign-in.component.ts | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/ui_ng/src/app/account/sign-in/sign-in.component.html b/src/ui_ng/src/app/account/sign-in/sign-in.component.html index 1b3183a21..ae4415aa4 100644 --- a/src/ui_ng/src/app/account/sign-in/sign-in.component.html +++ b/src/ui_ng/src/app/account/sign-in/sign-in.component.html @@ -3,7 +3,7 @@