Merge pull request goharbor#9696 from jwangyangls/fix-webhook-wrong-text

Modify the tootip words of verify remote cert.
ilo-repo · Nov 4, 2019 · 8cf5dba · 8cf5dba
2 parents e28aae0 + dd9a786
commit 8cf5dba
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 3 deletions.
diff --git a/src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.html b/src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.html
@@ -34,7 +34,7 @@
           <clr-tooltip>
             <clr-icon clrTooltipTrigger shape="info-circle" size="24"></clr-icon>
             <clr-tooltip-content clrPosition="top-right" clrSize="lg" *clrIfOpen>
-              {{'CONFIG.TOOLTIP.VERIFY_REMOTE_CERT' | translate}}
+              {{'WEBHOOK.VERIFY_REMOTE_CERT_TOOLTIP' | translate}}
             </clr-tooltip-content>
           </clr-tooltip>
         </label>

diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
@@ -364,6 +364,7 @@
         "CREATE_WEBHOOK": "Getting started with webhooks",
         "EDIT_WEBHOOK_DESC": "Specify the endpoint for receiving webhook notifications",
         "CREATE_WEBHOOK_DESC": "To get started with webhooks, provide an endpoint and credentials to access the webhook server.",
+        "VERIFY_REMOTE_CERT_TOOLTIP": "Determine whether the webhook should verify the certificate of a remote url Uncheck this box when the remote url uses a self-signed or untrusted certificate.",
         "ENDPOINT_URL": "Endpoint URL",
         "URL_IS_REQUIRED": "Endpoint URL is required.",
         "AUTH_HEADER": "Auth Header",

diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
@@ -365,6 +365,7 @@
         "CREATE_WEBHOOK": "Getting started with webhooks",
         "EDIT_WEBHOOK_DESC": "Specify the endpoint for receiving webhook notifications",
         "CREATE_WEBHOOK_DESC": "To get started with webhooks, provide an endpoint and credentials to access the webhook server.",
+        "VERIFY_REMOTE_CERT_TOOLTIP": "Determine whether the webhook should verify the certificate of a remote url Uncheck this box when the remote url uses a self-signed or untrusted certificate.",
         "ENDPOINT_URL": "Endpoint URL",
         "URL_IS_REQUIRED": "Endpoint URL is required.",
         "AUTH_HEADER": "Auth Header",

diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json
@@ -357,6 +357,7 @@
         "CREATE_WEBHOOK": "Getting started with webhooks",
         "EDIT_WEBHOOK_DESC": "Specify the endpoint for receiving webhook notifications",
         "CREATE_WEBHOOK_DESC": "To get started with webhooks, provide an endpoint and credentials to access the webhook server.",
+        "VERIFY_REMOTE_CERT_TOOLTIP": "Determine whether the webhook should verify the certificate of a remote url Uncheck this box when the remote url uses a self-signed or untrusted certificate.",
         "ENDPOINT_URL": "Endpoint URL",
         "URL_IS_REQUIRED": "Endpoint URL is required.",
         "AUTH_HEADER": "Auth Header",

diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json
@@ -393,6 +393,7 @@
         "CREATE_WEBHOOK": "Getting started with webhooks",
         "EDIT_WEBHOOK_DESC": "Specify the endpoint for receiving webhook notifications",
         "CREATE_WEBHOOK_DESC": "To get started with webhooks, provide an endpoint and credentials to access the webhook server.",
+        "VERIFY_REMOTE_CERT_TOOLTIP": "Determine whether the webhook should verify the certificate of a remote url Uncheck this box when the remote url uses a self-signed or untrusted certificate.",
         "ENDPOINT_URL": "Endpoint URL",
         "URL_IS_REQUIRED": "Endpoint URL is required.",
         "AUTH_HEADER": "Auth Header",

diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json
@@ -364,6 +364,7 @@
         "CREATE_WEBHOOK": "Ağ kancaları ile başladı",
         "EDIT_WEBHOOK_DESC": "Ağ kancası bildirimleri almak için bitiş noktasını belirtin",
         "CREATE_WEBHOOK_DESC": "Ağ kancalarına başlamak için, web kanca sunucusuna erişmek için bir uç nokta ve kimlik bilgisi sağlayın.",
+        "VERIFY_REMOTE_CERT_TOOLTIP": "Determine whether the webhook should verify the certificate of a remote url Uncheck this box when the remote url uses a self-signed or untrusted certificate.",
         "ENDPOINT_URL": "Uç Nokta URL",
         "URL_IS_REQUIRED": "Uç Nokra URL gereklidir.",
         "AUTH_HEADER": "Yetkilendirme Başlığı",

diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json
@@ -248,7 +248,7 @@
         "HELMCHART": "Helm Charts",
         "ROBOT_ACCOUNTS": "机器人账户",
         "WEBHOOKS": "Webhooks",
-        "IMMUTABLE_TAG": "不变的Tag"
+        "IMMUTABLE_TAG": "不可变的Tag"
     },
     "PROJECT_CONFIG": {
         "REGISTRY": "项目仓库",
@@ -363,6 +363,7 @@
         "CREATE_WEBHOOK": "创建 Webhooks",
         "EDIT_WEBHOOK_DESC": "指定接收 Webhook 通知的目标",
         "CREATE_WEBHOOK_DESC": "为了启用 webhook, 请提供 Endpoint 和凭据以访问 Webhook 服务器。",
+        "VERIFY_REMOTE_CERT_TOOLTIP": "勾选此框表示Webhook需要验证远程地址的证书。当远程地址使用自签名或不受信任的证书时，请取消选中。",
         "ENDPOINT_URL": "Endpoint 地址",
         "URL_IS_REQUIRED": "Endpoint 地址必填",
         "AUTH_HEADER": "Auth Header",
@@ -1244,7 +1245,7 @@
         "REP_SEPARATOR": "使用逗号分隔repos,repo*和**。",
         "TAGS": "Tags",
         "TAG_SEPARATOR": "使用逗号分割tags,tag*和**。",
-        "EDIT_TITLE": "编辑不改变的规则",
+        "EDIT_TITLE": "编辑不改变的Tag规则",
         "EXC": "排除",
         "MAT": "匹配",
         "AND": "且",