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

Improve UI with more inclusive words (#16548)

Browse Source 
Signed-off-by: AllForNothing <sshijun@vmware.com>
This commit is contained in:
孙世军 2022-03-22 17:21:10 +08:00 committed by GitHub
parent 84523a2da5
commit 33da8e2bcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.html
View File

@ -42,7 +42,7 @@
</clr-dropdown>
</clr-dg-action-bar>
<clr-dg-column>{{'REPLICATION.NAME' | translate}}</clr-dg-column>
<clr-dg-column [clrDgField]="'status'" class="status-width">{{'REPLICATION.STATUS' | translate}}</clr-dg-column>
<clr-dg-column class="status-width">{{'REPLICATION.STATUS' | translate}}</clr-dg-column>
<clr-dg-column class="col-width">{{'REPLICATION.SRC_REGISTRY' | translate}}</clr-dg-column>
<clr-dg-column class="col-width">{{'REPLICATION.REPLICATION_MODE' | translate}}</clr-dg-column>
<clr-dg-column class="min-width">{{'REPLICATION.DESTINATION_NAMESPACE' | translate}}</clr-dg-column>
@ -54,14 +54,12 @@
<clr-dg-row *ngFor="let p of rules; let i=index" [clrDgItem]="p">
<clr-dg-cell>{{p.name}}</clr-dg-cell>
<clr-dg-cell class="status-width">
<div [ngSwitch]="p.enabled">
<clr-tooltip *ngSwitchCase="false" class="tooltip-lg">
<clr-icon clrTooltipTrigger shape="exclamation-triangle" class="is-warning text-alignment" size="22"></clr-icon>Disabled
<clr-tooltip-content clrPosition="top-right" clrSize="xs" *clrIfOpen>
<span>{{'REPLICATION.RULE_DISABLED' | translate}}</span>
</clr-tooltip-content>
</clr-tooltip>
<div *ngSwitchCase="true" ><clr-icon shape="success-standard" class="is-success text-alignment" size="18"></clr-icon> Enabled</div>
<div>
<div *ngIf="!p?.enabled">
<clr-icon shape="exclamation-triangle" class="is-warning text-alignment" size="18"></clr-icon>Deactivated
</div>
<div *ngIf="p?.enabled">
<clr-icon shape="success-standard" class="is-success text-alignment" size="18"></clr-icon> Enabled</div>
</div>
</clr-dg-cell>
<clr-dg-cell class="col-width">

2
src/portal/src/app/base/left-side-nav/replication/replication/list-replication-rule/list-replication-rule.component.scss
View File

@ -12,7 +12,7 @@
width: 140px;
}
.status-width {
width: 105px;
width: 130px;
}
.icon-style {

6
src/portal/src/app/base/project/webhook/last-trigger/last-trigger.component.html
View File

@ -5,12 +5,12 @@
<clr-dg-column>{{'WEBHOOK.LAST_TRIGGERED' | translate}}</clr-dg-column>
<clr-dg-row *clrDgItems="let item of lastTriggers">
<clr-dg-cell>{{eventTypeToText(item.event_type)}}</clr-dg-cell>
<clr-dg-cell [ngSwitch]="item.enabled">
<div *ngSwitchCase="true" class="icon-wrap">
<clr-dg-cell>
<div *ngIf="item?.enabled" class="icon-wrap">
<clr-icon shape="check-circle" size="20" class="is-success enabled-icon"></clr-icon>
<span>{{'WEBHOOK.ENABLED' | translate}}</span>
</div>
<div *ngSwitchCase="false" class="icon-wrap">
<div *ngIf="!item?.enabled" class="icon-wrap">
<clr-icon shape="exclamation-triangle" size="20" class="is-warning"></clr-icon>
<span>{{'WEBHOOK.DISABLED' | translate}}</span>
</div>

2
src/portal/src/app/base/project/webhook/webhook.component.html
View File

@ -50,7 +50,7 @@
</div>
</clr-dg-action-bar>
<clr-dg-column [clrDgField]="'name'">{{'WEBHOOK.NAME' | translate}}</clr-dg-column>
<clr-dg-column>{{'WEBHOOK.ENABLED' | translate}}</clr-dg-column>
<clr-dg-column class="width-120">{{'WEBHOOK.ENABLED' | translate}}</clr-dg-column>
<clr-dg-column>{{'WEBHOOK.NOTIFY_TYPE' | translate}}</clr-dg-column>
<clr-dg-column class="min-width-340">{{'WEBHOOK.TARGET' | translate}}</clr-dg-column>
<clr-dg-column>{{'WEBHOOK.EVENT_TYPES' | translate}}</clr-dg-column>

5
src/portal/src/app/base/project/webhook/webhook.component.scss
View File

@ -85,4 +85,7 @@
letter-spacing: 0px;
margin: 0;
margin-top: -0.4rem;
}
}
.width-120 {
width: 120px;
}

64
src/portal/src/i18n/lang/en-us-lang.json
View File

@ -53,7 +53,7 @@
"RUN": "RUN",
"CONTINUE": "CONTINUE",
"ENABLE": "ENABLE",
"DISABLE": "DISABLE"
"DISABLE": "DEACTIVATE"
},
"BATCH": {
"DELETED_SUCCESS": "Deleted successfully",
@ -354,7 +354,7 @@
"EDIT": "Edit",
"ITEMS": "items",
"OF": "of",
"DISABLE_ACCOUNT": "Disable Account",
"DISABLE_ACCOUNT": "Deactivate Account",
"ENABLE_ACCOUNT": "Enable Account",
"DELETE": "Delete",
"CREAT_ROBOT_ACCOUNT": "Create Robot Account",
@ -382,12 +382,12 @@
"WEBHOOK": {
"EDIT_BUTTON": "EDIT",
"ENABLED_BUTTON": "ENABLE",
"DISABLED_BUTTON": "DISABLE",
"DISABLED_BUTTON": "DEACTIVATE",
"TYPE": "Webhook",
"STATUS": "Status",
"CREATED": "Created",
"ENABLED": "Enabled",
"DISABLED": "Disabled",
"DISABLED": "Deactivated",
"OF": "of",
"ITEMS": "items",
"LAST_TRIGGERED": "Last Triggered",
@ -408,14 +408,14 @@
"TEST_ENDPOINT_FAILURE": "Failed to ping endpoint.",
"ENABLED_WEBHOOK_TITLE": "Enable Webhook",
"ENABLED_WEBHOOK_SUMMARY": "Do you want to enable webhook {{name}}?",
"DISABLED_WEBHOOK_TITLE": "Disable Webhook",
"DISABLED_WEBHOOK_SUMMARY": "Do you want to disable webhook {{name}}?",
"DISABLED_WEBHOOK_TITLE": "Deactivate Webhook",
"DISABLED_WEBHOOK_SUMMARY": "Do you want to deactivate webhook {{name}}?",
"DELETE_WEBHOOK_TITLE": "Delete Webhook(s)",
"DELETE_WEBHOOK_SUMMARY": "Do you want to delete webhook(s) {{names}}?",
"WEBHOOKS": "Webhooks",
"NEW_WEBHOOK": "New Webhook",
"ENABLE": "Enable",
"DISABLE": "Disable",
"DISABLE": "Deactivate",
"NAME": "Name",
"TARGET": "Endpoint URL",
"EVENT_TYPES": "Event types",
@ -548,7 +548,7 @@
"NAME_IS_REQUIRED": "Name is required.",
"DESCRIPTION": "Description",
"ENABLE": "Enable",
"DISABLE": "Disable",
"DISABLE": "Deactivate",
"REPLICATION_MODE": "Replication Mode",
"SRC_REGISTRY": "Source registry",
"DESTINATION_NAMESPACE": "Destination Registry:Namespace",
@ -560,7 +560,7 @@
"DESTINATION_PASSWORD": "Password",
"ALL_STATUS": "All Status",
"ENABLED": "Enabled",
"DISABLED": "Disabled",
"DISABLED": "Deactivated",
"LAST_START_TIME": "Last Start Time",
"ACTIVATION": "Activation",
"REPLICATION_EXECUTION": "Execution",
@ -586,7 +586,7 @@
"ITEMS": "items",
"NO_LOGS": "No log",
"TOGGLE_ENABLE_TITLE": "Enable Rule",
"TOGGLE_DISABLE_TITLE": "Disable Rule",
"TOGGLE_DISABLE_TITLE": "Deactivate Rule",
"CREATED_SUCCESS": "Created replication rule successfully.",
"UPDATED_SUCCESS": "Updated replication rule successfully.",
"DELETED_SUCCESS": "Deleted replications rule successfully.",
@ -618,7 +618,7 @@
"NAME_TOOLTIP": "replication rule name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
"DESTINATION_NAME_TOOLTIP": "Destination name should be at least 2 characters long with lower case characters, numbers and ._- and must be start with characters or numbers.",
"ACKNOWLEDGE": "Acknowledge",
"RULE_DISABLED": "This rule has been disabled because a label used in its filter has been deleted. \n Edit the rule and update its filter to enable it.",
"RULE_DISABLED": "This rule has been deactivated because a label used in its filter has been deleted. \n Edit the rule and update its filter to enable it.",
"REPLI_MODE": "Replication mode",
"SOURCE_REGISTRY": "Source registry",
"SOURCE_NAMESPACES": "Source namespaces",
@ -630,12 +630,12 @@
"RESOURCE": "Resource",
"ENABLE_TITLE": "Enable rule",
"ENABLE_SUMMARY": "Do you want to enable rule {{param}}?",
"DISABLE_TITLE": "Disable rule",
"DISABLE_SUMMARY": "Do you want to disable rule {{param}}?",
"DISABLE_TITLE": "Deactivate rule",
"DISABLE_SUMMARY": "Do you want to deactivate rule {{param}}?",
"ENABLE_SUCCESS": "Enabled rule successfully",
"ENABLE_FAILED": "Enabling rule failed",
"DISABLE_SUCCESS": "Disabled rule successfully",
"DISABLE_FAILED": "Disabling rule failed",
"DISABLE_SUCCESS": "Deactivated rule successfully",
"DISABLE_FAILED": "Deactivating rule failed",
"DES_REPO_FLATTENING": "Destination Repository Flattening",
"NAMESPACE": "Namespace",
"REPO_FLATTENING": "Flattening",
@ -892,7 +892,7 @@
"NO_CHANGE": "Save abort because nothing changed",
"TOOLTIP": {
"SELF_REGISTRATION_ENABLE": "Enable sign up.",
"SELF_REGISTRATION_DISABLE": "Disable sign up.",
"SELF_REGISTRATION_DISABLE": "Deactivate sign up.",
"VERIFY_REMOTE_CERT": "Determine whether the image replication should verify the certificate of a remote Harbor registry. Uncheck this box when the remote registry uses a self-signed or untrusted certificate.",
"AUTH_MODE": "By default the authentication mode is database, i.e. the credentials are stored in a local database. Set it to LDAP if you want to verify a user's credential against an LDAP server.",
"LDAP_SEARCH_DN": "A user's DN who has the permission to search the LDAP/AD server. If your LDAP/AD server does not support anonymous search, you should configure this DN and ldap_search_pwd.",
@ -1220,7 +1220,7 @@
},
"UNKNOWN_ERROR": "Unknown errors have occurred. Please try again later.",
"UNAUTHORIZED_ERROR": "Your session is invalid or has expired. You need to sign in to continue your action.",
"REPO_READ_ONLY": "Harbor is set to read-only mode, Deleting repository, artifact, tag and pushing image will be disabled under read-only mode.",
"REPO_READ_ONLY": "Harbor is set to read-only mode, Deleting repository, artifact, tag and pushing image will be deactivated under read-only mode.",
"FORBIDDEN_ERROR": "You do not have the proper privileges to perform the action.",
"GENERAL_ERROR": "Errors have occurred when performing service call: {{param}}.",
"BAD_REQUEST_ERROR": "We are unable to perform your action because of a bad request.",
@ -1317,7 +1317,7 @@
"DETAILS": "Details",
"REPOSITORY": "Repository",
"EDIT": "Edit",
"DISABLE": "Disable",
"DISABLE": "Deactivate",
"ENABLE": "Enable",
"DELETE": "Delete",
"ADD_TITLE": "Add Tag Retention Rule",
@ -1390,7 +1390,7 @@
"ADD_RULE": "ADD RULE",
"ADD_RULE_HELP_1": "Click the ADD RULE button to add a rule.",
"EDIT": "Edit",
"DISABLE": "Disable",
"DISABLE": "Deactivate",
"ENABLE": "Enable",
"DELETE": "Delete",
"ADD_TITLE": "Add Tag Immutability Rule",
@ -1454,7 +1454,7 @@
"NEW_SCANNER": "NEW SCANNER",
"SET_AS_DEFAULT": "SET AS DEFAULT",
"HEALTH": "Health",
"DISABLED": "Disabled",
"DISABLED": "Deactivated",
"NO_SCANNER": "Can not find any scanner",
"DEFAULT": "Default",
"HEALTHY": "Healthy",
@ -1469,7 +1469,7 @@
"SELECT_SCANNER": "Select Scanner",
"ENABLED": "Enabled",
"ENABLE": "Enable",
"DISABLE": "Disable",
"DISABLE": "Deactivate",
"DELETE_SUCCESS": "Successfully deleted",
"TOTAL": "Total",
"FIXABLE": "Fixable",
@ -1496,7 +1496,7 @@
"PREHEAT_ACTION": "Preheat",
"EDIT_ACTION": "Edit",
"ENABLE_ACTION": "Enable",
"DISABLE_ACTION": "Disable",
"DISABLE_ACTION": "Deactivate",
"DELETE_ACTION": "Delete",
"NOT_FOUND": "We couldn't find any instance!",
"NAME": "Name",
@ -1509,8 +1509,8 @@
"DELETION_SUMMARY": "Do you want to delete instance(s) {{param}}?",
"ENABLE_TITLE": "Enable instance(s)",
"ENABLE_SUMMARY": "Do you want to enable instance(s) {{param}}?",
"DISABLE_TITLE": "Disable instance(s)",
"DISABLE_SUMMARY": "Do you want to disable instance(s) {{param}}?",
"DISABLE_TITLE": "Deactivate instance(s)",
"DISABLE_SUMMARY": "Do you want to deactivate instance(s) {{param}}?",
"IMAGE": "Image",
"START_TIME": "Start time",
"FINISH_TIME": "Finish Time",
@ -1522,8 +1522,8 @@
"DELETED_FAILED": "Deleting instance(s) failed",
"ENABLE_SUCCESS": "Instance(s) enabled successfully",
"ENABLE_FAILED": "Enabling instance(s) failed",
"DISABLE_SUCCESS": "Instance(s) disabled successfully",
"DISABLE_FAILED": "Disabling instance(s) failed",
"DISABLE_SUCCESS": "Instance(s) deactivated successfully",
"DISABLE_FAILED": "Deactivating instance(s) failed",
"UPDATE_SUCCESS": "Instance updated successfully",
"UPDATE_FAILED": "Updating instance failed",
"REQUEST_PREHEAT_SUCCESS": "Preheat request successfully",
@ -1549,7 +1549,7 @@
"SET_AS_DEFAULT": "Set as default",
"DELETE_INSTANCE": "Delete instance",
"ENABLE_INSTANCE": "Enable instance",
"DISABLE_INSTANCE": "Disable instance",
"DISABLE_INSTANCE": "Deactivate instance",
"SET_DEFAULT_SUCCESS": "Set as default successfully",
"SET_DEFAULT_FAILED": "Setting as default failed",
"UPDATE_INSTANCE": "Update instance",
@ -1568,9 +1568,9 @@
"DESCRIPTION": "Description",
"NO_POLICY": "No policy",
"ENABLED_POLICY_SUMMARY": "Do you want to enable policy {{name}}?",
"DISABLED_POLICY_SUMMARY": "Do you want to disable policy {{name}}?",
"DISABLED_POLICY_SUMMARY": "Do you want to deactivate policy {{name}}?",
"ENABLED_POLICY_TITLE": "Enable Policy",
"DISABLED_POLICY_TITLE": "Disable Policy",
"DISABLED_POLICY_TITLE": "Deactivate Policy",
"DELETE_POLICY_SUMMARY": "Do you want to delete policy {{names}}?",
"EDIT_POLICY": "Edit P2P Provider Policy",
"ADD_POLICY": "Create P2P Provider policy",
@ -1646,10 +1646,10 @@
"DELETE_ROBOT_SUCCESS": "Deleted robot(s) successfully",
"ENABLE_TITLE": "Enable Robot",
"ENABLE_SUMMARY": "Do you want to enable robot {{param}}?",
"DISABLE_TITLE": "Disable Robot",
"DISABLE_SUMMARY": "Do you want to disable robot {{param}}?",
"DISABLE_TITLE": "Deactivate Robot",
"DISABLE_SUMMARY": "Do you want to deactivate robot {{param}}?",
"ENABLE_ROBOT_SUCCESSFULLY": "Enabled robot successfully",
"DISABLE_ROBOT_SUCCESSFULLY": "Disabled robot successfully",
"DISABLE_ROBOT_SUCCESSFULLY": "Deactivated robot successfully",
"ROBOT_ACCOUNT": "Robot account",
"PROJECTS": "Projects",
"ALL_PROJECTS": "All projects with",