Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-27 21:12:42 +02:00
Code Issues Projects Releases Wiki Activity

Fix item number and i18n issues

Browse Source 
Fix item number presentation on Group, charts, chart versions, member group add

Signed-off-by: Qian Deng <dengq@vmware.com>
This commit is contained in:
Qian Deng 2018-08-16 20:32:59 +08:00
parent 317a01fa99
commit 8cf7d4f822
11 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ui_ng/lib/src/helm-chart/helm-chart.component.html
View File

@ -45,7 +45,10 @@
<clr-dg-cell>{{ chart.created | date }}</clr-dg-cell>
</clr-dg-row>
<clr-dg-footer>
<clr-dg-pagination #pagination [clrDgPageSize]="pageSize">
<clr-dg-pagination #pagination [clrDgPageSize]="pageSize" [clrDgTotalItems]="totalCount">
<span *ngIf="pagination.totalItems">
{{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'HELM_CHART.OF' | translate}}
</span>
{{pagination.totalItems}} {{'HELM_CHART.ITEMS'| translate}}
</clr-dg-pagination>
</clr-dg-footer>

1
src/ui_ng/lib/src/helm-chart/helm-chart.component.ts
View File

@ -105,6 +105,7 @@ export class HelmChartComponent implements OnInit {
charts => {
this.charts = charts.filter(x => x.name.includes(this.lastFilteredChartName));
this.chartsCopy = charts.map(x => Object.assign({}, x));
this.totalCount = charts.length;
},
err => {
this.errorHandler.error(err);

7
src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.html
View File

@ -66,8 +66,11 @@
<clr-dg-cell>{{ v.created | date}}</clr-dg-cell>
</clr-dg-row>
<clr-dg-footer>
<clr-dg-pagination #pagination [clrDgPageSize]="pageSize">
{{pagination.totalItems}} {{'HELM_CHART.ITEMS' | translate}}
<clr-dg-pagination #pagination [clrDgPageSize]="pageSize" [clrDgTotalItems]="totalCount">
<span *ngIf="pagination.totalItems">
{{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'HELM_CHART.OF' | translate}}
</span>
{{pagination.totalItems}} {{'HELM_CHART.ITEMS'| translate}}
</clr-dg-pagination>
</clr-dg-footer>
</clr-datagrid>

1
src/ui_ng/lib/src/helm-chart/versions/helm-chart-version.component.ts
View File

@ -117,6 +117,7 @@ export class ChartVersionComponent implements OnInit {
versions => {
this.chartVersions = versions.filter(x => x.version.includes(this.lastFilteredVersionName));
this.versionsCopy = versions.map(x => Object.assign({}, x));
this.totalCount = versions.length;
},
err => {
this.errorHandler.error(err);

5
src/ui_ng/src/app/group/group.component.html
View File

@ -30,7 +30,10 @@
</clr-dg-row>
<clr-dg-footer>
<clr-dg-pagination #pagination [clrDgPageSize]="15">
{{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'USER.OF' | translate }} {{pagination.totalItems}} {{'GROUP.GROUPS' | translate}}
<span *ngIf="pagination.totalItems">
{{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'GROUP.OF' | translate}}
</span>
{{pagination.totalItems}} {{'GROUP.ITEMS' | translate}}
</clr-dg-pagination>
</clr-dg-footer>
</clr-datagrid>

5
src/ui_ng/src/app/project/member/add-group/add-group.component.html
View File

@ -75,7 +75,10 @@
</clr-dg-row>
<clr-dg-footer>
<clr-dg-pagination #pagination [clrDgPageSize]="5">
<clr-dg-pagination #pagination [clrDgPageSize]="5" [clrDgTotalItems]="totalCount">
<span *ngIf="pagination.totalItems">
{{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'MEMBER.OF' | translate}}
</span>
{{pagination.totalItems}} {{'MEMBER.ITEMS' | translate}}
</clr-dg-pagination>
</clr-dg-footer>

2
src/ui_ng/src/app/project/member/add-group/add-group.component.ts
View File

@ -34,6 +34,7 @@ export class AddGroupComponent implements OnInit {
group = new UserGroup();
selectedGroups: UserGroup[] = [];
groups: UserGroup[] = [];
totalCount = 0;
dnTooltip = 'TOOLTIP.ITEM_REQUIRED';
@ -76,6 +77,7 @@ export class AddGroupComponent implements OnInit {
return group.group_name.includes(this.currentTerm)
&& !this.memberList.some(member => member.entity_type === 'g' && member.entity_id === group.id);
});
this.totalCount = groups.length;
this.onLoading = false;
this.ref.detectChanges();
});

4
src/ui_ng/src/i18n/lang/en-us-lang.json
View File

@ -265,7 +265,9 @@
"REG_TIME": "Registration Time",
"ADD_GROUP_SUCCESS": "Add group success",
"EDIT_GROUP_SUCCESS": "Edit group success",
"LDAP_TYPE": "LDAP"
"LDAP_TYPE": "LDAP",
"OF": "of",
"ITEMS": "items"
},
"AUDIT_LOG": {
"USERNAME": "Username",

4
src/ui_ng/src/i18n/lang/es-es-lang.json
View File

@ -264,7 +264,9 @@
"REG_TIME": "Registration Time",
"ADD_GROUP_SUCCESS": "Add group success",
"EDIT_GROUP_SUCCESS": "Edit group success",
"LDAP_TYPE": "LDAP"
"LDAP_TYPE": "LDAP",
"OF": "of",
"ITEMS": "items"
},
"AUDIT_LOG": {
"USERNAME": "Nombre de usuario",

4
src/ui_ng/src/i18n/lang/fr-fr-lang.json
View File

@ -248,7 +248,9 @@
"REG_TIME": "Registration Time",
"ADD_GROUP_SUCCESS": "Add group success",
"EDIT_GROUP_SUCCESS": "Edit group success",
"LDAP_TYPE": "LDAP"
"LDAP_TYPE": "LDAP",
"OF": "of",
"ITEMS": "items"
},
"AUDIT_LOG": {
"USERNAME": "Nom d'utilisateur",

8
src/ui_ng/src/i18n/lang/zh-cn-lang.json
View File

@ -264,7 +264,9 @@
"REG_TIME": "注册时间",
"ADD_GROUP_SUCCESS": "添加组成功",
"EDIT_GROUP_SUCCESS": "修改组成功",
"LDAP_TYPE": "LDAP"
"LDAP_TYPE": "LDAP",
"OF": "共计",
"ITEMS": "条记录"
},
"AUDIT_LOG": {
"USERNAME": "用户名",
@ -492,7 +494,7 @@
"REPO": "仓库",
"FILTER_FOR_CHARTS": "过滤Chart",
"DELETE": "删除",
"OF": "的",
"OF": "共计",
"VERSIONS": "版本",
"APP_VERSION": "应用版本",
"IMAGES": "镜像",
@ -512,7 +514,7 @@
"SIGN": "签名",
"SIGNED": "已签名",
"UNSIGNED": "未签名",
"ITEMS": "项",
"ITEMS": "条记录",
"NO_README": "此Chart未提供README文件",
"SECURITY": "安全",
"ACTIVE": "正常",