Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-26 20:26:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4626 from pengpengshui/fixIssue

Browse Source 
Fix issue about links text and i18n
This commit is contained in:
pengpengshui 2018-04-11 16:17:40 +08:00 committed by GitHub
commit 230e197c61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html.ts
View File

@ -20,7 +20,7 @@ export const CREATE_EDIT_RULE_TEMPLATE: string = `
</div>
<!--Projects-->
<div class="form-group form-group-override">
<label class="form-group-label-override required">{{'REPLICATION.SOURCE' | translate}}&nbsp;{{'PROJECT.PROJECTS' | translate | lowercase}}</label>
<label class="form-group-label-override required">{{'REPLICATION.SOURCE_PROJECT' | translate}}</label>
<div formArrayName="projects">
<div class="projectInput inputWidth" *ngFor="let project of projects.controls; let i= index" [formGroupName]="i" (mouseleave)="leaveInput()">
<input *ngIf="!projectId" formControlName="name" type="text" class="inputWidth" value="name" required

7
src/ui_ng/lib/src/repository-gridview/repository-gridview.component.ts
View File

@ -163,6 +163,13 @@ export class RepositoryGridviewComponent implements OnChanges, OnInit {
});
return;
}
if (error.status === 503) {
Observable.forkJoin(this.translateService.get('BATCH.DELETED_FAILURE'),
this.translateService.get('REPOSITORY.TAGS_NO_DELETE')).subscribe(res => {
findedList = BathInfoChanges(findedList, res[0], false, true, res[1]);
});
return;
}
this.translateService.get('BATCH.DELETED_FAILURE').subscribe(res => {
findedList = BathInfoChanges(findedList, res, false, true);
});

2
src/ui_ng/lib/src/repository/repository.component.html.ts
View File

@ -3,7 +3,7 @@ export const REPOSITORY_TEMPLATE = `
<div class="title-wrapper">
<div class="arrow-block">
<a (click)="goProBack()">< {{'SIDE_NAV.PROJECTS'| translate}}</a>
<a (click)="goRepBack()">< {{'SIDE_NAV.SYSTEM_MGMT.REGISTRY'| translate}}</a>
<a (click)="goRepBack()">< {{'REPOSITORY.REPOSITORIES'| translate}}</a>
</div>
<div>
<h2 sub-header-title class="custom-h2">{{repoName}}</h2>

2
src/ui_ng/lib/src/tag/tag-detail.component.html.ts
View File

@ -4,7 +4,7 @@ export const TAG_DETAIL_HTML: string = `
<div class="title-wrapper">
<div class="arrow-block">
<a (click)="onBackPro()">< {{'SIDE_NAV.PROJECTS'| translate}}</a>
<a (click)="onBackRep()">< {{'SIDE_NAV.SYSTEM_MGMT.REGISTRY'| translate}}</a>
<a (click)="onBackRep()">< {{'REPOSITORY.REPOSITORIES'| translate}}</a>
<a (click)="onBackTag()">< {{repositoryId}}</a>
</div>
<div class="">

2
src/ui_ng/package.json
View File

@ -30,7 +30,7 @@
"clarity-icons": "0.10.24",
"clarity-ui": "0.10.24",
"core-js": "^2.4.1",
"harbor-ui": "0.6.72",
"harbor-ui": "0.6.73",
"intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0",

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

@ -336,7 +336,7 @@
"TARGETS":"Target",
"MODE": "Mode",
"TRIGGER_MODE": "Trigger Mode",
"SOURCE": "Source",
"SOURCE_PROJECT": "Source project",
"REPLICATE": "Replicate",
"DELETE_REMOTE_IMAGES":"Delete remote images when locally deleted",
"REPLICATE_IMMEDIATE":"Replicate existing images immediately",
@ -627,7 +627,7 @@
"COPY_ERROR": "Copy failed, please try to manually copy.",
"FILTER_FOR_TAGS": "Filter Tags",
"AUTHOR": "Author",
"LABELS": "LABELS"
"LABELS": "Labels"
},
"LABEL": {
"LABEL": "Label",

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

@ -336,7 +336,7 @@
"TARGETS":"Target",
"MODE": "Mode",
"TRIGGER_MODE": "Trigger Mode",
"SOURCE": "Source",
"SOURCE_PROJECT": "Source project",
"REPLICATE": "Replicate",
"DELETE_REMOTE_IMAGES":"Delete remote images when locally deleted",
"REPLICATE_IMMEDIATE":"Replicate existing images immediately",
@ -627,7 +627,7 @@
"COPY_ERROR": "Copy failed, please try to manually copy.",
"FILTER_FOR_TAGS": "Etiquetas de filtro",
"AUTHOR": "Author",
"LABELS": "LABELS"
"LABELS": "Labels"
},
"LABEL": {
"LABEL": "Label",

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

@ -297,7 +297,25 @@
"INVALID_DATE": "Date non valide.",
"PLACEHOLDER": "Nous n'avons trouvé aucune règle de réplication !",
"JOB_PLACEHOLDER": "Nous n'avons trouvé aucun travail de réplication !",
"JOB_LOG_VIEWER": "Afficher les logs des travaux de réplication"
"JOB_LOG_VIEWER": "Afficher les logs des travaux de réplication",
"NO_ENDPOINT_INFO": "Please add an endpoint first",
"NO_PROJECT_INFO": "Please add a project name first",
"SOURCE_IMAGES_FILTER": "Source images filter",
"SCHEDULE": "Scheduled",
"MANUAL": "Manual",
"IMMEDIATE": "Immediate",
"DAILY": "Daily",
"WEEKLY": "Weekly",
"SETTING":"Options",
"TRIGGER":"Triggering Condition",
"TARGETS":"Target",
"MODE": "Mode",
"TRIGGER_MODE": "Trigger Mode",
"SOURCE_PROJECT": "Source project",
"REPLICATE": "Replicate",
"DELETE_REMOTE_IMAGES":"Delete remote images when locally deleted",
"REPLICATE_IMMEDIATE":"Replicate existing images immediately",
"NEW": "New"
},
"DESTINATION": {
"NEW_ENDPOINT": "Nouveau Point Final",
@ -567,7 +585,7 @@
"COPY_ERROR": "Copie échouée, veuillez essayer de copier manuellement.",
"FILTER_FOR_TAGS": "Filter Tags",
"AUTHOR": "Author",
"LABELS": "LABELS"
"LABELS": "Labels"
},
"LABEL": {
"LABEL": "Label",

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

@ -336,7 +336,7 @@
"TARGETS":"目标",
"MODE": "模式",
"TRIGGER_MODE": "触发模式",
"SOURCE": "源",
"SOURCE_PROJECT": "源项目",
"REPLICATE": "复制",
"DELETE_REMOTE_IMAGES":"删除本地镜像时同时也删除远程的镜像。",
"REPLICATE_IMMEDIATE":"立即复制现有的镜像。",

0
src/ui_ng/{ Normal file
View File