From b7c5fc05629365d5e3e67cccfe5b1a5101afad1c Mon Sep 17 00:00:00 2001 From: Will Sun <30999793+AllForNothing@users.noreply.github.com> Date: Fri, 15 Jan 2021 15:26:48 +0800 Subject: [PATCH] Modify i18n text for push permission (#14015) Signed-off-by: AllForNothing --- src/portal/src/app/system-robot-accounts/system-robot-util.ts | 2 +- src/portal/src/i18n/lang/de-de-lang.json | 3 ++- src/portal/src/i18n/lang/en-us-lang.json | 3 ++- src/portal/src/i18n/lang/es-es-lang.json | 3 ++- src/portal/src/i18n/lang/fr-fr-lang.json | 3 ++- src/portal/src/i18n/lang/pt-br-lang.json | 3 ++- src/portal/src/i18n/lang/tr-tr-lang.json | 3 ++- src/portal/src/i18n/lang/zh-cn-lang.json | 3 ++- src/portal/src/i18n/lang/zh-tw-lang.json | 3 ++- tests/resources/Harbor-Pages/Robot_Account.robot | 2 +- 10 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/portal/src/app/system-robot-accounts/system-robot-util.ts b/src/portal/src/app/system-robot-accounts/system-robot-util.ts index 54dcf4bb6..be2257484 100644 --- a/src/portal/src/app/system-robot-accounts/system-robot-util.ts +++ b/src/portal/src/app/system-robot-accounts/system-robot-util.ts @@ -96,7 +96,7 @@ export const INITIAL_ACCESSES: FrontAccess[] = [ ]; export const ACTION_RESOURCE_I18N_MAP = { - 'push': 'ROBOT_ACCOUNT.PUSH', + 'push': 'SYSTEM_ROBOT.PUSH_AND_PULL', // push permission contains pull permission 'pull': 'ROBOT_ACCOUNT.PULL', 'read': 'SYSTEM_ROBOT.READ', 'create': 'SYSTEM_ROBOT.CREATE', diff --git a/src/portal/src/i18n/lang/de-de-lang.json b/src/portal/src/i18n/lang/de-de-lang.json index 18cd88057..0c0f1cdeb 100644 --- a/src/portal/src/i18n/lang/de-de-lang.json +++ b/src/portal/src/i18n/lang/de-de-lang.json @@ -1668,6 +1668,7 @@ "SCANNER_PULL": "Scanner Pull", "SEARCH_BY_NAME": "Search by name(without prefix)", "FINAL_PROJECT_NAME_TIP": "The final project robot name consists of the prefix,the project name,a plus mark and the current input value", - "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value" + "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value", + "PUSH_AND_PULL": "Push&Pull" } } diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index 53b84e2b6..d8cbfd0d6 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -1668,6 +1668,7 @@ "SCANNER_PULL": "Scanner Pull", "SEARCH_BY_NAME": "Search by name(without prefix)", "FINAL_PROJECT_NAME_TIP": "The final project robot name consists of the prefix,the project name,a plus mark and the current input value", - "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value" + "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value", + "PUSH_AND_PULL": "Push&Pull" } } diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index a65a92127..4bbc94683 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -1666,6 +1666,7 @@ "SCANNER_PULL": "Scanner Pull", "SEARCH_BY_NAME": "Search by name(without prefix)", "FINAL_PROJECT_NAME_TIP": "The final project robot name consists of the prefix,the project name,a plus mark and the current input value", - "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value" + "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value", + "PUSH_AND_PULL": "Push&Pull" } } diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index 9a92c4730..c2ceb967a 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -1636,6 +1636,7 @@ "SCANNER_PULL": "Scanner Pull", "SEARCH_BY_NAME": "Search by name(without prefix)", "FINAL_PROJECT_NAME_TIP": "The final project robot name consists of the prefix,the project name,a plus mark and the current input value", - "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value" + "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value", + "PUSH_AND_PULL": "Push&Pull" } } diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index c2483b084..9c628367a 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -1664,7 +1664,8 @@ "SCANNER_PULL": "Scanner Pull", "SEARCH_BY_NAME": "Search by name(without prefix)", "FINAL_PROJECT_NAME_TIP": "The final project robot name consists of the prefix,the project name,a plus mark and the current input value", - "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value" + "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value", + "PUSH_AND_PULL": "Push&Pull" } } diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json index 6ba0bc2b3..9f051a22c 100644 --- a/src/portal/src/i18n/lang/tr-tr-lang.json +++ b/src/portal/src/i18n/lang/tr-tr-lang.json @@ -1668,6 +1668,7 @@ "SCANNER_PULL": "Scanner Pull", "SEARCH_BY_NAME": "Search by name(without prefix)", "FINAL_PROJECT_NAME_TIP": "The final project robot name consists of the prefix,the project name,a plus mark and the current input value", - "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value" + "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value", + "PUSH_AND_PULL": "Push&Pull" } } diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index 679e997e6..b94aeeaae 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -1665,6 +1665,7 @@ "SCANNER_PULL": "扫描器拉取", "SEARCH_BY_NAME": "按名称(不含前缀)搜索", "FINAL_PROJECT_NAME_TIP": "项目级机器人的最终名称由前缀，项目名称，一个加号以及当前输入值组成", - "FINAL_SYSTEM_NAME_TIP": "系统级机器人的最终名称由前缀和当前输入值组成" + "FINAL_SYSTEM_NAME_TIP": "系统级机器人的最终名称由前缀和当前输入值组成", + "PUSH_AND_PULL": "推送&拉取" } } diff --git a/src/portal/src/i18n/lang/zh-tw-lang.json b/src/portal/src/i18n/lang/zh-tw-lang.json index decf92af6..9c326ee7f 100644 --- a/src/portal/src/i18n/lang/zh-tw-lang.json +++ b/src/portal/src/i18n/lang/zh-tw-lang.json @@ -1652,6 +1652,7 @@ "SCANNER_PULL": "Scanner Pull", "SEARCH_BY_NAME": "Search by name(without prefix)", "FINAL_PROJECT_NAME_TIP": "The final project robot name consists of the prefix,the project name,a plus mark and the current input value", - "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value" + "FINAL_SYSTEM_NAME_TIP": "The final system robot name consists of the prefix and the current input value", + "PUSH_AND_PULL": "Push&Pull" } } diff --git a/tests/resources/Harbor-Pages/Robot_Account.robot b/tests/resources/Harbor-Pages/Robot_Account.robot index b5e5e21f4..8cae87b41 100644 --- a/tests/resources/Harbor-Pages/Robot_Account.robot +++ b/tests/resources/Harbor-Pages/Robot_Account.robot @@ -21,7 +21,7 @@ Resource ../../resources/Util.robot *** Keywords *** Create A Random Permission Item List - ${permission_item_all_list}= Create List Push Artifact + ${permission_item_all_list}= Create List Push&Pull Artifact ... Pull Artifact ... Delete Artifact ... Read Helm Chart