From e45d402777c77aea8a1db3eeed3569361f97990d Mon Sep 17 00:00:00 2001 From: FangyuanCheng Date: Fri, 26 Apr 2019 10:16:44 +0800 Subject: [PATCH] Modify tooltips for creating replication rule Signed-off-by: FangyuanCheng --- .../create-edit-rule.component.html | 12 ++++++------ .../list-replication-rule.component.html | 5 ----- src/portal/src/i18n/lang/en-us-lang.json | 17 +++++++++-------- src/portal/src/i18n/lang/es-es-lang.json | 17 +++++++++-------- src/portal/src/i18n/lang/fr-fr-lang.json | 17 +++++++++-------- src/portal/src/i18n/lang/pt-br-lang.json | 17 +++++++++-------- src/portal/src/i18n/lang/zh-cn-lang.json | 9 +++++---- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html index a422fd678..8772ef0dc 100644 --- a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html +++ b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html @@ -147,12 +147,6 @@ -
- - - - -
@@ -165,6 +159,12 @@
+
+ + + + +
diff --git a/src/portal/lib/src/list-replication-rule/list-replication-rule.component.html b/src/portal/lib/src/list-replication-rule/list-replication-rule.component.html index bbe726bb9..8bc22a58e 100644 --- a/src/portal/lib/src/list-replication-rule/list-replication-rule.component.html +++ b/src/portal/lib/src/list-replication-rule/list-replication-rule.component.html @@ -12,7 +12,6 @@ {{'REPLICATION.REPLICATION_MODE' | translate}} {{'REPLICATION.DESTINATION_NAMESPACE' | translate}} {{'REPLICATION.REPLICATION_TRIGGER' | translate}} - {{'REPLICATION.OVERRIDE' | translate}} {{'REPLICATION.DESCRIPTION' | translate}} {{'REPLICATION.PLACEHOLDER' | translate }} @@ -38,10 +37,6 @@ {{p.dest_registry ? p.dest_registry.name : ''}} : {{p.dest_namespace? p.dest_namespace: '-'}} {{p.trigger ? p.trigger.type : ''}} - - - - {{p.description ? trancatedDescription(p.description) : '-'}} diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index b1816987d..a23815db7 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -55,13 +55,13 @@ "STOP_FAILURE": "Stop execution failed" }, "TOOLTIP": { - "NAME_FILTER": "Filter the name part of the resources. Leaving empty or '**' matches all; 'library/**' only matches the resources under 'library'. For more patterns please refer to the user guide.", - "TAG_FILTER": "Filter the tag/version part of the resources. Leaving empty or '**' matches all; '1.0*' only matches the tags that starts with '1.0'. For more patterns please refer to the user guide.", - "RESOURCE_FILTER": "Filter the type of the resources.", - "PUSH_BASED": "Push the resources from the current Harbor to the remote registry.", - "PULL_BASED": "Pull the resources from the remote registry to the current Harbor.", - "DESTINATION_NAMESPACE": "Specify the destination namespaces. The resources will be put under the same namespace with the source if it is empty.", - "OVERRIDE": "Specify whether override the resources if the same name resources found on the destination registry.", + "NAME_FILTER": "Filter the name of the resource. Leave empty or use '**' to match all. 'library/**' only matches resources under 'library'. For more patterns, please refer to the user guide.", + "TAG_FILTER": "Filter the tag/version part of the resources. Leave empty or use '**' to match all. '1.0*' only matches the tags that starts with '1.0'. For more patterns, please refer to the user guide.", + "RESOURCE_FILTER": "Filter the type of resources.", + "PUSH_BASED": "Push the resources from the local Harbor to the remote registry.", + "PULL_BASED": "Pull the resources from the remote registry to the local Harbor.", + "DESTINATION_NAMESPACE": "Specify the destination namespace. If empty, the resources will be put under the same namespace as the source.", + "OVERRIDE": "Specify whether to replace the resources at the destination if a resource with the same name exists.", "EMAIL": "Email should be a valid email address like name@example.com.", "USER_NAME": "Cannot contain special characters and maximum length should be 255 characters.", "FULL_NAME": "Maximum length should be 20 characters.", @@ -360,7 +360,8 @@ "REPLICATION": { "TOTAL": "Total", "OVERRIDE": "Override", - "OVERRIDE_INFO": "Override the destination resources if name conflicts", + "ENABLED_RULE": "Enable rule", + "OVERRIDE_INFO": "Replace the destination resources if name exists", "OPERATION": "Operation", "CURRENT": "current", "FILTER_PLACEHOLDER": "Filter Tasks", diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index d05dce0c5..b5cd35c91 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -55,13 +55,13 @@ "STOP_FAILURE": "Stop execution failed" }, "TOOLTIP": { - "NAME_FILTER": "Filter the name part of the resources. Leaving empty or '**' matches all; 'library/**' only matches the resources under 'library'. For more patterns please refer to the user guide.", - "TAG_FILTER": "Filter the tag/version part of the resources. Leaving empty or '**' matches all; '1.0*' only matches the tags that starts with '1.0'. For more patterns please refer to the user guide.", - "RESOURCE_FILTER": "Filter the type of the resources.", - "PUSH_BASED": "Push the resources from the current Harbor to the remote registry.", - "PULL_BASED": "Pull the resources from the remote registry to the current Harbor.", - "DESTINATION_NAMESPACE": "Specify the destination namespaces. The resources will be put under the same namespace with the source if it is empty.", - "OVERRIDE": "Specify whether override the resources if the same name resources found on the destination registry.", + "NAME_FILTER": "Filter the name of the resource. Leave empty or use '**' to match all. 'library/**' only matches resources under 'library'. For more patterns, please refer to the user guide.", + "TAG_FILTER": "Filter the tag/version part of the resources. Leave empty or use '**' to match all. '1.0*' only matches the tags that starts with '1.0'. For more patterns, please refer to the user guide.", + "RESOURCE_FILTER": "Filter the type of resources.", + "PUSH_BASED": "Push the resources from the local Harbor to the remote registry.", + "PULL_BASED": "Pull the resources from the remote registry to the local Harbor.", + "DESTINATION_NAMESPACE": "Specify the destination namespace. If empty, the resources will be put under the same namespace as the source.", + "OVERRIDE": "Specify whether to replace the resources at the destination if a resource with the same name exists.", "EMAIL": "El email debe ser una dirección válida como nombre@ejemplo.com.", "USER_NAME": "Debe tener una longitud máxima de 255 caracteres y no puede contener caracteres especiales.", "FULL_NAME": "La longitud máxima debería ser de 20 caracteres.", @@ -359,7 +359,8 @@ "REPLICATION": { "TOTAL": "Total", "OVERRIDE": "Override", - "OVERRIDE_INFO": "Override the destination resources if name conflicts", + "ENABLED_RULE": "Enable rule", + "OVERRIDE_INFO": "Replace the destination resources if name exists", "CURRENT": "current", "FILTER_PLACEHOLDER": "Filter Tasks", "STOP_TITLE": "Confirme Stop Executions", diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index 6aee1f37d..d07c87094 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -52,13 +52,13 @@ "STOP_FAILURE": "Stop execution failed" }, "TOOLTIP": { - "NAME_FILTER": "Filter the name part of the resources. Leaving empty or '**' matches all; 'library/**' only matches the resources under 'library'. For more patterns please refer to the user guide.", - "TAG_FILTER": "Filter the tag/version part of the resources. Leaving empty or '**' matches all; '1.0*' only matches the tags that starts with '1.0'. For more patterns please refer to the user guide.", - "RESOURCE_FILTER": "Filter the type of the resources.", - "PUSH_BASED": "Push the resources from the current Harbor to the remote registry.", - "PULL_BASED": "Pull the resources from the remote registry to the current Harbor.", - "DESTINATION_NAMESPACE": "Specify the destination namespaces. The resources will be put under the same namespace with the source if it is empty.", - "OVERRIDE": "Specify whether override the resources if the same name resources found on the destination registry.", + "NAME_FILTER": "Filter the name of the resource. Leave empty or use '**' to match all. 'library/**' only matches resources under 'library'. For more patterns, please refer to the user guide.", + "TAG_FILTER": "Filter the tag/version part of the resources. Leave empty or use '**' to match all. '1.0*' only matches the tags that starts with '1.0'. For more patterns, please refer to the user guide.", + "RESOURCE_FILTER": "Filter the type of resources.", + "PUSH_BASED": "Push the resources from the local Harbor to the remote registry.", + "PULL_BASED": "Pull the resources from the remote registry to the local Harbor.", + "DESTINATION_NAMESPACE": "Specify the destination namespace. If empty, the resources will be put under the same namespace as the source.", + "OVERRIDE": "Specify whether to replace the resources at the destination if a resource with the same name exists.", "EMAIL": "L'email doit être une adresse email valide comme name@example.com.", "USER_NAME": "Ne peut pas contenir de caractères spéciaux et la longueur maximale doit être de 255 caractères.", "FULL_NAME": "La longueur maximale doit être de 20 caractères.", @@ -352,7 +352,8 @@ "REPLICATION": { "TOTAL": "Total", "OVERRIDE": "Override", - "OVERRIDE_INFO": "Override the destination resources if name conflicts", + "ENABLED_RULE": "Enable rule", + "OVERRIDE_INFO": "Replace the destination resources if name exists", "CURRENT": "current", "FILTER_PLACEHOLDER": "Filter Tasks", "STOP_TITLE": "Confirmer arrêter les exécutions", diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index 32e9fa4f7..2d68cc5b3 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -55,13 +55,13 @@ "STOP_FAILURE": "Stop execution failed" }, "TOOLTIP": { - "NAME_FILTER": "Filter the name part of the resources. Leaving empty or '**' matches all; 'library/**' only matches the resources under 'library'. For more patterns please refer to the user guide.", - "TAG_FILTER": "Filter the tag/version part of the resources. Leaving empty or '**' matches all; '1.0*' only matches the tags that starts with '1.0'. For more patterns please refer to the user guide.", - "RESOURCE_FILTER": "Filter the type of the resources.", - "PUSH_BASED": "Push the resources from the current Harbor to the remote registry.", - "PULL_BASED": "Pull the resources from the remote registry to the current Harbor.", - "DESTINATION_NAMESPACE": "Specify the destination namespaces. The resources will be put under the same namespace with the source if it is empty.", - "OVERRIDE": "Specify whether override the resources if the same name resources found on the destination registry.", + "NAME_FILTER": "Filter the name of the resource. Leave empty or use '**' to match all. 'library/**' only matches resources under 'library'. For more patterns, please refer to the user guide.", + "TAG_FILTER": "Filter the tag/version part of the resources. Leave empty or use '**' to match all. '1.0*' only matches the tags that starts with '1.0'. For more patterns, please refer to the user guide.", + "RESOURCE_FILTER": "Filter the type of resources.", + "PUSH_BASED": "Push the resources from the local Harbor to the remote registry.", + "PULL_BASED": "Pull the resources from the remote registry to the local Harbor.", + "DESTINATION_NAMESPACE": "Specify the destination namespace. If empty, the resources will be put under the same namespace as the source.", + "OVERRIDE": "Specify whether to replace the resources at the destination if a resource with the same name exists.", "EMAIL": "Email deve ser um endereço de email válido como nome@exemplo.com.", "USER_NAME": "Não pode conter caracteres especiais e o tamanho máximo deve ser de 255 caracteres.", "FULL_NAME": "Tamanho máximo deve ser de 20 caracteres.", @@ -358,7 +358,8 @@ "REPLICATION": { "TOTAL": "Total", "OVERRIDE": "Override", - "OVERRIDE_INFO": "Override the destination resources if name conflicts", + "ENABLED_RULE": "Enable rule", + "OVERRIDE_INFO": "Replace the destination resources if name exists", "CURRENT": "current", "FILTER_PLACEHOLDER": "Filter Tasks", "STOP_TITLE": "Confirme as execuções de parada", diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index 1fa548f58..bcfa8e805 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -58,10 +58,10 @@ "NAME_FILTER": "过滤资源的名字。不填或者“”匹配所有资源；“library/”只匹配“library”下的资源。更多的匹配模式请参考用户手册。", "TAG_FILTER": "过滤资源的tag/version。不填或者“”匹配所有；“1.0*”只匹配以“1.0”开头的tag/version。", "RESOURCE_FILTER": "过滤资源的类型。", - "PUSH_BASED": "把资源由当前Harbor推送到远端仓库。", - "PULL_BASED": "把资源由远端仓库拉取到当前Harbor。", + "PUSH_BASED": "把资源由本地Harbor推送到远端仓库。", + "PULL_BASED": "把资源由远端仓库拉取到本地Harbor。", "DESTINATION_NAMESPACE": "指定目的端名称空间。如果不填，资源会被放到和源相同的名称空间下。", - "OVERRIDE": "指定如果目的端仓库中已有同名的资源是否覆盖。", + "OVERRIDE": "如果存在具有相同名称的资源，请指定是否替换目标上的资源。", "EMAIL": "请使用正确的邮箱地址，比如name@example.com。", "USER_NAME": "不能包含特殊字符且长度不能超过255。", "FULL_NAME": "长度不能超过20。", @@ -359,7 +359,8 @@ "REPLICATION": { "TOTAL": "总数", "OVERRIDE": "覆盖", - "OVERRIDE_INFO": "如果名称冲突则覆盖目标资源", + "ENABLED_RULE": "启用规则", + "OVERRIDE_INFO": "如果名称存在，则替换目标资源", "CURRENT": "当前仓库", "FILTER_PLACEHOLDER": "过滤任务", "STOP_TITLE": "确认停止任务",