From 8236e0358e9c550f67956e2679938c99812e3b0d Mon Sep 17 00:00:00 2001 From: pengpengshui Date: Tue, 18 Jul 2017 09:50:04 -0700 Subject: [PATCH 1/3] fix #2775 about create-rule modal connect test issue --- src/ui_ng/lib/src/service/endpoint.service.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ui_ng/lib/src/service/endpoint.service.ts b/src/ui_ng/lib/src/service/endpoint.service.ts index 1ef0a8bab..66d797349 100644 --- a/src/ui_ng/lib/src/service/endpoint.service.ts +++ b/src/ui_ng/lib/src/service/endpoint.service.ts @@ -36,7 +36,7 @@ export abstract class EndpointService { * @abstract * @param {(number | string)} endpointId * @returns {(Observable | Endpoint)} - * + * * @memberOf EndpointService */ abstract getEndpoint(endpointId: number | string): Observable | Promise | Endpoint; @@ -185,14 +185,16 @@ export class EndpointDefaultService extends EndpointService { if(!endpoint) { return Promise.reject('Invalid endpoint.'); } - let requestUrl: string = `${this._endpointUrl}/ping`; + let requestUrl: string ; if(endpoint.id) { + requestUrl = `${this._endpointUrl}/${endpoint.id}/ping`; return this.http .post(requestUrl, {}) .toPromise() .then(response=>response.status) .catch(error=>Promise.reject(error)); } else { + requestUrl = `${this._endpointUrl}/ping`; return this.http .post(requestUrl, endpoint) .toPromise() From 34f9a3b9111f9febb0945ed1311df09b2bb1d962 Mon Sep 17 00:00:00 2001 From: pengpengshui Date: Tue, 18 Jul 2017 14:00:17 -0700 Subject: [PATCH 2/3] fix issue about endpontUrl,username,password should have data when connent-test button could click #2435 --- .../create-edit-endpoint.component.html.ts | 2 +- .../create-edit-endpoint/create-edit-endpoint.component.ts | 4 ++++ .../src/create-edit-rule/create-edit-rule.component.html.ts | 2 +- .../lib/src/create-edit-rule/create-edit-rule.component.ts | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.html.ts b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.html.ts index f451b1bba..35fa32389 100644 --- a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.html.ts +++ b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.html.ts @@ -45,7 +45,7 @@ export const CREATE_EDIT_ENDPOINT_TEMPLATE: string = `
- +
diff --git a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts index 3aa79d8e7..91f85adcc 100644 --- a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts +++ b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts @@ -83,6 +83,10 @@ export class CreateEditEndpointComponent implements AfterViewChecked { }; } + get hasConnectData():boolean{ + return !this.target.endpoint || !this.target.username || !this.target.password; + } + constructor( private endpointService: EndpointService, private errorHandler: ErrorHandler, diff --git a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts index 43eb0daa9..ea309d38b 100644 --- a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts +++ b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts @@ -81,7 +81,7 @@ export const CREATE_EDIT_RULE_TEMPLATE: string = `
- +
diff --git a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts index 515bcadb1..893a302c1 100644 --- a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts +++ b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts @@ -144,7 +144,9 @@ export class CreateEditRuleComponent implements AfterViewChecked { } get connectAbled():boolean{ return !this.createEditRule.endpointId && !this.isCreateEndpoint; - + } + get hasConnectData():boolean{ + return !this.createEditRule.endpointUrl || !this.createEditRule.username || !this.createEditRule.password; } constructor( From 1810b7ed42061105b03745ffb4793a7f1d52c583 Mon Sep 17 00:00:00 2001 From: pengpengshui Date: Tue, 18 Jul 2017 19:10:16 -0700 Subject: [PATCH 3/3] fix #2800 about consistent datagrid footer indicate number of items and roll back connent-test issue --- .../create-edit-endpoint.component.html.ts | 2 +- .../create-edit-endpoint.component.ts | 4 ---- .../create-edit-rule.component.html.ts | 2 +- .../create-edit-rule/create-edit-rule.component.ts | 4 +--- .../lib/src/endpoint/endpoint.component.html.ts | 2 +- .../list-replication-rule.component.html.ts | 2 +- .../list-repository.component.html.ts | 2 +- .../src/replication/replication.component.html.ts | 2 +- .../repository-stackview.component.html.ts | 2 +- src/ui_ng/lib/src/tag/tag.component.html.ts | 2 +- .../src/vulnerability-scanning/scanning.html.ts | 3 ++- src/ui_ng/src/app/log/audit-log.component.html | 7 +++++-- .../list-project/list-project.component.html | 5 +++-- .../src/app/project/member/member.component.html | 6 +++++- .../list-project-ro/list-project-ro.component.html | 7 +++++-- .../list-repository-ro.component.html | 5 +++-- src/ui_ng/src/app/user/user.component.html | 6 ++++-- src/ui_ng/src/i18n/lang/en-us-lang.json | 14 +++++++------- src/ui_ng/src/i18n/lang/es-es-lang.json | 14 +++++++------- src/ui_ng/src/i18n/lang/zh-cn-lang.json | 4 ++++ 20 files changed, 54 insertions(+), 41 deletions(-) diff --git a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.html.ts b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.html.ts index 35fa32389..f451b1bba 100644 --- a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.html.ts +++ b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.html.ts @@ -45,7 +45,7 @@ export const CREATE_EDIT_ENDPOINT_TEMPLATE: string = `
- +
diff --git a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts index 91f85adcc..3aa79d8e7 100644 --- a/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts +++ b/src/ui_ng/lib/src/create-edit-endpoint/create-edit-endpoint.component.ts @@ -83,10 +83,6 @@ export class CreateEditEndpointComponent implements AfterViewChecked { }; } - get hasConnectData():boolean{ - return !this.target.endpoint || !this.target.username || !this.target.password; - } - constructor( private endpointService: EndpointService, private errorHandler: ErrorHandler, diff --git a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts index ea309d38b..43eb0daa9 100644 --- a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts +++ b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts @@ -81,7 +81,7 @@ export const CREATE_EDIT_RULE_TEMPLATE: string = `
- +
diff --git a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts index 893a302c1..515bcadb1 100644 --- a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts +++ b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.ts @@ -144,9 +144,7 @@ export class CreateEditRuleComponent implements AfterViewChecked { } get connectAbled():boolean{ return !this.createEditRule.endpointId && !this.isCreateEndpoint; - } - get hasConnectData():boolean{ - return !this.createEditRule.endpointUrl || !this.createEditRule.username || !this.createEditRule.password; + } constructor( diff --git a/src/ui_ng/lib/src/endpoint/endpoint.component.html.ts b/src/ui_ng/lib/src/endpoint/endpoint.component.html.ts index 1a15723a1..b09156dc8 100644 --- a/src/ui_ng/lib/src/endpoint/endpoint.component.html.ts +++ b/src/ui_ng/lib/src/endpoint/endpoint.component.html.ts @@ -31,7 +31,7 @@ export const ENDPOINT_TEMPLATE: string = ` {{t.creation_time | date: 'short'}} - {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'DESTINATION.OF' | translate}} + {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'DESTINATION.OF' | translate}} {{pagination.totalItems}} {{'DESTINATION.ITEMS' | translate}} diff --git a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts index f19268eee..60357b30f 100644 --- a/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts +++ b/src/ui_ng/lib/src/list-replication-rule/list-replication-rule.component.html.ts @@ -34,7 +34,7 @@ export const LIST_REPLICATION_RULE_TEMPLATE: string = ` - {{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'REPLICATION.OF' | translate}} {{pagination.totalItems }} {{'REPLICATION.ITEMS' | translate}} + {{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'REPLICATION.OF' | translate}} {{pagination.totalItems }} {{'REPLICATION.ITEMS' | translate}} diff --git a/src/ui_ng/lib/src/list-repository/list-repository.component.html.ts b/src/ui_ng/lib/src/list-repository/list-repository.component.html.ts index 158fac220..f0b814696 100644 --- a/src/ui_ng/lib/src/list-repository/list-repository.component.html.ts +++ b/src/ui_ng/lib/src/list-repository/list-repository.component.html.ts @@ -13,7 +13,7 @@ export const LIST_REPOSITORY_TEMPLATE = ` {{r.pull_count}} - {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'REPOSITORY.OF' | translate}} + {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'REPOSITORY.OF' | translate}} {{pagination.totalItems}}{{'REPOSITORY.ITEMS' | translate}} diff --git a/src/ui_ng/lib/src/replication/replication.component.html.ts b/src/ui_ng/lib/src/replication/replication.component.html.ts index 3bfb48634..b8a0ebc4c 100644 --- a/src/ui_ng/lib/src/replication/replication.component.html.ts +++ b/src/ui_ng/lib/src/replication/replication.component.html.ts @@ -67,7 +67,7 @@ export const REPLICATION_TEMPLATE: string = ` - {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'REPLICATION.OF' | translate}} + {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'REPLICATION.OF' | translate}} {{pagination.totalItems}} {{'REPLICATION.ITEMS' | translate}} diff --git a/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.html.ts b/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.html.ts index ce315c0cf..4be3af9c0 100644 --- a/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.html.ts +++ b/src/ui_ng/lib/src/repository-stackview/repository-stackview.component.html.ts @@ -30,7 +30,7 @@ export const REPOSITORY_STACKVIEW_TEMPLATE: string = ` {{'CONFIG.SCANNING.DB_NOT_READY' | translate }} - {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'REPOSITORY.OF' | translate}} + {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'REPOSITORY.OF' | translate}} {{pagination.totalItems}} {{'REPOSITORY.ITEMS' | translate}} diff --git a/src/ui_ng/lib/src/tag/tag.component.html.ts b/src/ui_ng/lib/src/tag/tag.component.html.ts index 014a04f93..bd1d5b65c 100644 --- a/src/ui_ng/lib/src/tag/tag.component.html.ts +++ b/src/ui_ng/lib/src/tag/tag.component.html.ts @@ -53,7 +53,7 @@ export const TAG_TEMPLATE = ` {{t.os}} - {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'REPOSITORY.OF' | translate}} + {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'REPOSITORY.OF' | translate}} {{pagination.totalItems}} {{'REPOSITORY.ITEMS' | translate}}     diff --git a/src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts b/src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts index d8459a894..9bf12093b 100644 --- a/src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts +++ b/src/ui_ng/lib/src/vulnerability-scanning/scanning.html.ts @@ -78,7 +78,8 @@ export const GRID_COMPONENT_HTML: string = ` - {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'VULNERABILITY.GRID.FOOT_OF' | translate}} {{pagination.totalItems}} {{'VULNERABILITY.GRID.FOOT_ITEMS' | translate}} + {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'VULNERABILITY.GRID.FOOT_OF' | translate}} + {{pagination.totalItems}} {{'VULNERABILITY.GRID.FOOT_ITEMS' | translate}} diff --git a/src/ui_ng/src/app/log/audit-log.component.html b/src/ui_ng/src/app/log/audit-log.component.html index 60e9a7d8e..c2d79ec6b 100644 --- a/src/ui_ng/src/app/log/audit-log.component.html +++ b/src/ui_ng/src/app/log/audit-log.component.html @@ -56,8 +56,11 @@ {{l.op_time | date: 'short'}} - {{totalRecordCount}} {{'AUDIT_LOG.ITEMS' | translate}} - + {{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'AUDIT_LOG.OF' | translate}} + {{pagination.totalItems }} {{'AUDIT_LOG.ITEMS' | translate}} + + diff --git a/src/ui_ng/src/app/project/list-project/list-project.component.html b/src/ui_ng/src/app/project/list-project/list-project.component.html index 38f28c24a..bc7c3c3ce 100644 --- a/src/ui_ng/src/app/project/list-project/list-project.component.html +++ b/src/ui_ng/src/app/project/list-project/list-project.component.html @@ -17,7 +17,8 @@ {{p.creation_time | date: 'short'}} - {{(projects ? projects.length : 0)}} {{'PROJECT.ITEMS' | translate}} - + {{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'PROJECT.OF' | translate}} + {{pagination.totalItems }} {{'PROJECT.ITEMS' | translate}} + \ No newline at end of file diff --git a/src/ui_ng/src/app/project/member/member.component.html b/src/ui_ng/src/app/project/member/member.component.html index 5f5388d06..3b99fdb0c 100644 --- a/src/ui_ng/src/app/project/member/member.component.html +++ b/src/ui_ng/src/app/project/member/member.component.html @@ -27,7 +27,11 @@ {{m.username}} {{roleInfo[m.role_id] | translate}} - {{ (members ? members.length : 0) }} {{'MEMBER.ITEMS' | translate}} + + {{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'MEMBER.OF' | translate}} + {{pagination.totalItems }} {{'MEMBER.ITEMS' | translate}} + + \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/list-project-ro/list-project-ro.component.html b/src/ui_ng/src/app/shared/list-project-ro/list-project-ro.component.html index 51f59bfea..c8df1a62c 100644 --- a/src/ui_ng/src/app/shared/list-project-ro/list-project-ro.component.html +++ b/src/ui_ng/src/app/shared/list-project-ro/list-project-ro.component.html @@ -10,7 +10,10 @@ {{p.creation_time | date: 'short'}} - {{(projects ? projects.length : 0)}} {{'PROJECT.ITEMS' | translate}} - + {{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'PROJECT.OF' | translate}} + {{pagination.totalItems }} {{'PROJECT.ITEMS' | translate}} + + \ No newline at end of file diff --git a/src/ui_ng/src/app/shared/list-repository-ro/list-repository-ro.component.html b/src/ui_ng/src/app/shared/list-repository-ro/list-repository-ro.component.html index e67f32c0b..2871d8c51 100644 --- a/src/ui_ng/src/app/shared/list-repository-ro/list-repository-ro.component.html +++ b/src/ui_ng/src/app/shared/list-repository-ro/list-repository-ro.component.html @@ -8,7 +8,8 @@ {{r.pull_count}} - {{(repositories ? repositories.length : 0)}} {{'REPOSITORY.ITEMS' | translate}} - + {{pagination.firstItem + 1}} - {{pagination.lastItem +1 }} {{'REPOSITORY.OF' | translate}} + {{pagination.totalItems }} {{'REPOSITORY.ITEMS' | translate}} + \ No newline at end of file diff --git a/src/ui_ng/src/app/user/user.component.html b/src/ui_ng/src/app/user/user.component.html index 947a712c3..85fb85292 100644 --- a/src/ui_ng/src/app/user/user.component.html +++ b/src/ui_ng/src/app/user/user.component.html @@ -27,8 +27,10 @@ {{user.email}} {{user.creation_time | date: 'short'}} - {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} of {{pagination.totalItems}} users - {{'USER.ITEMS' | translate}} + + {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'USER.OF' | translate }} + {{pagination.totalItems}} {{'USER.ITEMS' | 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 6501446e9..31824de7e 100644 --- a/src/ui_ng/src/i18n/lang/en-us-lang.json +++ b/src/ui_ng/src/i18n/lang/en-us-lang.json @@ -117,7 +117,7 @@ "DELETION_TITLE": "Confirm user deletion", "DELETION_SUMMARY": "Do you want to delete user {{param}}?", "DELETE_SUCCESS": "User deleted successfully.", - "ITEMS": "item(s)" + "ITEMS": "items" }, "PROJECT": { "PROJECTS": "Projects", @@ -143,7 +143,7 @@ "NAME_ALREADY_EXISTS": "Project name already exists.", "NAME_IS_ILLEGAL": "Project name is invalid.", "UNKNOWN_ERROR": "An unknown error occurred while creating the project.", - "ITEMS": "item(s)", + "ITEMS": "items", "DELETION_TITLE": "Confirm project deletion", "DELETION_SUMMARY": "Do you want to delete project {{param}}?", "FILTER_PLACEHOLDER": "Filter Projects", @@ -171,7 +171,7 @@ "DEVELOPER": "Developer", "GUEST": "Guest", "DELETE": "Delete", - "ITEMS": "item(s)", + "ITEMS": "items", "ACTIONS": "Actions", "USERNAME_IS_REQUIRED": "Username is required", "USERNAME_DOES_NOT_EXISTS": "Username does not exist.", @@ -199,7 +199,7 @@ "OTHERS": "Others", "ADVANCED": "Advanced", "SIMPLE": "Simple", - "ITEMS": "item(s)", + "ITEMS": "items", "FILTER_PLACEHOLDER": "Filter Logs", "INVALID_DATE": "Invalid date." }, @@ -257,7 +257,7 @@ "END_TIME": "End Time", "LOGS": "Logs", "OF": "of", - "ITEMS": "item(s)", + "ITEMS": "items", "TOGGLE_ENABLE_TITLE": "Enable Rule", "CONFIRM_TOGGLE_ENABLE_POLICY": "After enabling the replication rule, all repositories under the project will be replicated to the destination registry. \nPlease confirm to continue.", "TOGGLE_DISABLE_TITLE": "Disable Rule", @@ -296,7 +296,7 @@ "FAILED_TO_GET_TARGET": "Failed to get endpoint.", "CREATION_TIME": "Creation Time", "OF": "of", - "ITEMS": "item(s)", + "ITEMS": "items", "CREATED_SUCCESS": "Created endpoint successfully.", "UPDATED_SUCCESS": "Updated endpoint successfully.", "DELETED_SUCCESS": "Deleted endpoint successfully.", @@ -331,7 +331,7 @@ "SHOW_DETAILS": "Show Details", "REPOSITORIES": "Repositories", "OF": "of", - "ITEMS": "item(s)", + "ITEMS": "items", "POP_REPOS": "Popular Repositories", "DELETED_REPO_SUCCESS": "Deleted repository successfully.", "DELETED_TAG_SUCCESS": "Deleted tag successfully.", diff --git a/src/ui_ng/src/i18n/lang/es-es-lang.json b/src/ui_ng/src/i18n/lang/es-es-lang.json index 2fb260b59..80b68196e 100644 --- a/src/ui_ng/src/i18n/lang/es-es-lang.json +++ b/src/ui_ng/src/i18n/lang/es-es-lang.json @@ -117,7 +117,7 @@ "DELETION_TITLE": "Confirmar eliminación de usuario", "DELETION_SUMMARY": "¿Quiere eliminar el usuario {{param}}?", "DELETE_SUCCESS": "Usuario eliminado satisfactoriamente.", - "ITEMS": "elemento(s)" + "ITEMS": "elementos" }, "PROJECT": { "PROJECTS": "Proyectos", @@ -143,7 +143,7 @@ "NAME_ALREADY_EXISTS": "Ya existe un proyecto con ese nombre.", "NAME_IS_ILLEGAL": "El nombre del proyecto no es valido.", "UNKNOWN_ERROR": "Ha ocurrido un error al crear el proyecto.", - "ITEMS": "elemento(s)", + "ITEMS": "elementos", "DELETION_TITLE": "Confirmar eliminación del proyecto", "DELETION_SUMMARY": "¿Quiere eliminar el proyecto {{param}}?", "FILTER_PLACEHOLDER": "Filtrar proyectos", @@ -171,7 +171,7 @@ "DEVELOPER": "Desarrollador", "GUEST": "Invitado", "DELETE": "Eliminar", - "ITEMS": "elemento(s)", + "ITEMS": "elementos", "ACTIONS": "Acciones", "USERNAME_IS_REQUIRED": "El nombre de usuario es obligatorio", "USERNAME_DOES_NOT_EXISTS": "Ese nombre de usuario no existe.", @@ -199,7 +199,7 @@ "OTHERS": "Otros", "ADVANCED": "Avanzado", "SIMPLE": "Simple", - "ITEMS": "elemento(s)", + "ITEMS": "elementos", "FILTER_PLACEHOLDER": "Filtrar logs", "INVALID_DATE": "Fecha invalida." }, @@ -257,7 +257,7 @@ "END_TIME": "Fecha de Finalización", "LOGS": "Logs", "OF": "of", - "ITEMS": "elemento(s)", + "ITEMS": "elementos", "TOGGLE_ENABLE_TITLE": "Activar Regla", "CONFIRM_TOGGLE_ENABLE_POLICY": "Después de la activación de esta regla, todos los repositorios de este proyecto serán replicados al registro de destino.\nPor favor, confirme para continuar.", "TOGGLE_DISABLE_TITLE": "Desactivar Regla", @@ -296,7 +296,7 @@ "FAILED_TO_GET_TARGET": "Fallo al obtener el endpoint.", "CREATION_TIME": "Fecha de creación", "OF": "of", - "ITEMS": "elemento(s)", + "ITEMS": "elementos", "CREATED_SUCCESS": "Endpoint creado satisfactoriamente.", "UPDATED_SUCCESS": "Endpoint actualizado satisfactoriamente.", "DELETED_SUCCESS": "Endpoint eliminado satisfactoriamente.", @@ -332,7 +332,7 @@ "SHOW_DETAILS": "Mostrar Detalles", "REPOSITORIES": "Repositorios", "OF": "of", - "ITEMS": "elemento(s)", + "ITEMS": "elementos", "POP_REPOS": "Repositorios Populares", "DELETED_REPO_SUCCESS": "Repositorio eliminado satisfactoriamente.", "DELETED_TAG_SUCCESS": "Etiqueta eliminada satisfactoriamente.", 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 1f466442b..a99ff7abf 100644 --- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json +++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json @@ -117,6 +117,7 @@ "DELETION_TITLE": "删除用户确认", "DELETION_SUMMARY": "你确认删除用户 {{param}}?", "DELETE_SUCCESS": "成功删除用户。", + "OF": "共计", "ITEMS": "条记录" }, "PROJECT": { @@ -143,6 +144,7 @@ "NAME_ALREADY_EXISTS": "项目名称已存在。", "NAME_IS_ILLEGAL": "项目名称非法。", "UNKNOWN_ERROR": "创建项目时发生未知错误。", + "OF": "共计", "ITEMS": "条记录", "DELETION_TITLE": "删除项目确认", "DELETION_SUMMARY": "你确认删除项目 {{param}}？", @@ -171,6 +173,7 @@ "DEVELOPER": "开发人员", "GUEST": "访客", "DELETE": "删除", + "OF": "共计", "ITEMS": "条记录", "ACTIONS": "操作", "USERNAME_IS_REQUIRED": "用户名为必填项。", @@ -199,6 +202,7 @@ "OTHERS": "其他", "ADVANCED": "高级检索", "SIMPLE": "简单检索", + "OF": "共计", "ITEMS": "条记录", "FILTER_PLACEHOLDER": "过滤日志", "INVALID_DATE": "无效日期。"