Skip to content

Commit

Permalink
fix: Fix name description
Browse files Browse the repository at this point in the history
  • Loading branch information
leoliu committed Jul 8, 2020
1 parent a3c3407 commit 9b2e961
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 28 deletions.
7 changes: 4 additions & 3 deletions src/locales/en/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default {
LB_RANDOM: 'RANDOM',

CLUSTER_NAME_DESC:
'It can only contain lowercase letters, numbers and hyphens("-"), and must begin with a lowercase letter, ending with a number or lowercase letter. The maximum length of characters is set to 14.',
'It can only contain lowercase letters, numbers and hyphens("-"), and must begin and end with a lowercase letter or a number. The maximum length of characters is set to 14.',

CLUSTER_ALIAS_DESC:
'Alias can be composed of any character to help you better distinguish resources and support Chinese names.',
Expand Down Expand Up @@ -96,6 +96,7 @@ export default {
'Traffic governance depends on the microservice module, the current cluster does not enable the microservice module',
TRACING_NO_MICROSERVICE_TIP:
'Tracing depends on the microservice module, the current cluster does not enable the microservice module',

APPLICATION_SERVICE_DESC: 'You can set different service components based on the service type in an application. Stateful and stateless services are both supported.'

APPLICATION_SERVICE_DESC:
'You can set different service components based on the service type in an application. Stateful and stateless services are both supported.',
}
7 changes: 3 additions & 4 deletions src/locales/en/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ export default {
DETAILS: 'Details',
NODES: 'Nodes',
NAME_DESC:
'It can only contain lowercase letters, numbers and hyphens("-"), and must begin with a lowercase letter, ending with a number or lowercase letter. The maximum length of characters is set to 63.',
'It can only contain lowercase letters, numbers and hyphens("-"), and must begin and end with a lowercase letter or a number. The maximum length of characters is set to 63.',
LONG_NAME_DESC:
'It can only contain lowercase letters, numbers and hyphens("-"), and must begin with a lowercase letter, ending with a number or lowercase letter. The maximum length of characters is set to 253.',
'It can only contain lowercase letters, numbers and hyphens("-"), and must begin and end with a lowercase letter or a number. The maximum length of characters is set to 253.',
NAME_TOO_LONG: 'The maximum length of characters is set to 63.',
LONG_NAME_TOO_LONG: 'The maximum length of characters is set to 253.',
LONG_DESC_TOO_LONG: 'The maximum length of characters is set to 1000.',
Expand Down Expand Up @@ -158,8 +158,7 @@ export default {
APP_STORE_MANAGEMENT_DESC:
'Unified lifecycle management of cloud native applications including their release, removal and review',

PLATFORM_SETTINGS_DESC:
'Customized platform settings including basic info',
PLATFORM_SETTINGS_DESC: 'Customized platform settings including basic info',

DATA_SOURCE: 'Data Source',

Expand Down
4 changes: 2 additions & 2 deletions src/locales/en/service.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default {
SERVICE_SELECTOR_AFFECT_2: ' affect {count} workloads',

SERVICE_NAME_DESC:
'It can only contain lowercase letters, numbers and hyphens("-"), and must begin with a lowercase letter, ending with a number or lowercase letter. The maximum length of characters is set to 63.',
'It can only contain lowercase letters, numbers and hyphens("-"), and must begin and end with a lowercase letter or a number. The maximum length of characters is set to 63.',
SERVICE_DESC:
'A Service is an abstraction that defines a logical collection of Pods and a strategy for accessing them.',
SERVICE_CREATE_DESC:
Expand Down Expand Up @@ -92,6 +92,6 @@ export default {
'Set the port to expose the container image and the service port.',
SPECIFY_WORKLOAD_DESC:
'Specify a workload that needs to be associated with the service.',

EIP_POOL_DESC: 'Access method within the cluster (DNS)',
}
32 changes: 17 additions & 15 deletions src/locales/en/workload.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default {
CRONJOB_CREATE_DESC:
'A CronJob creates Jobs on a time-based schedule. For example, it runs a job periodically on a given schedule or only runs a job once on a given time.',
CRONJOB_NAME_DESC:
'It can only contain lowercase letters, numbers and hyphens("-"), and must begin with a lowercase letter, ending with a number or lowercase letter. The maximum length of characters is set to 52.',
'It can only contain lowercase letters, numbers and hyphens("-"), and must begin and end with a lowercase letter or a number. The maximum length of characters is set to 52.',
CRONJOB_NAME_TOO_LONG: 'The maximum length of characters is set to 52.',

REPLICAS_SCALE_NOTIFY_TITLE: 'Does it take effect immediately?',
Expand Down Expand Up @@ -99,9 +99,9 @@ export default {
PORT_INPUT_DESC:
'The name is required and cannot be duplicated when there are multiple ports,',
PORT_NAME_DESC:
'The port name can only contain lowercase letters, numbers and hyphens("-"), and must begin with a lowercase letter, ending with a number or lowercase letter. The maximum length of characters is set to 63.',
'The port name can only contain lowercase letters, numbers and hyphens("-"), and must begin and end with a lowercase letter or a number. The maximum length of characters is set to 63.',
WORKLOAD_PORT_NAME_DESC:
'The port name can only contain lowercase letters, numbers and hyphens("-"), and must begin with a lowercase letter, ending with a number or lowercase letter. The maximum length of characters is set to 15.',
'The port name can only contain lowercase letters, numbers and hyphens("-"), and must begin and end with a lowercase letter or a number. The maximum length of characters is set to 15.',

DEPLOYMENTS_BASEINFO_DESC:
'You can give the deployment a name that is easy to distinguish when you use it.',
Expand Down Expand Up @@ -137,11 +137,14 @@ export default {
'You can mount a temporary volumes, or persistent volumes to a Pod of the job.',

JOB_BACK_OFF_LIMIT_LABEL: 'Back off Limit',
JOB_BACK_OFF_LIMIT_DESC: 'It specifies the number of retries before marking this job failed. It defaults to 6.',
JOB_BACK_OFF_LIMIT_DESC:
'It specifies the number of retries before marking this job failed. It defaults to 6.',
JOB_PARALLELISM_LABEL: 'Parallelism',
JOB_PARALLELISM_DESC: 'It specifies the maximum desired number of pods the job should run at any given time.',
JOB_PARALLELISM_DESC:
'It specifies the maximum desired number of pods the job should run at any given time.',
JOB_COMPLETION_LABEL: 'Completions',
JOB_COMPLETION_DESC: 'It specifies the desired number of successfully finished pods the job should be run with.',
JOB_COMPLETION_DESC:
'It specifies the desired number of successfully finished pods the job should be run with.',
JOB_ACTIVE_DL_SECONDS_LABEL: 'Active Deadline Seconds',
JOB_ACTIVE_DL_SECONDS:
'It specifies the duration in seconds relative to the startTime that the job may be active before the system tries to terminate it; value must be positive integer.',
Expand Down Expand Up @@ -211,14 +214,14 @@ export default {
WORKLOAD_REPLICA_MSG:
'In the user-defined scope, if the number of Pods increases, the ReplicationController will terminate the extra Pods. Instead, the RC will create a new Pod that remains in the defined scope. For example, the RC will recreate the Pod on the node after Pod maintenance (such as kernel upgrades).',
DEPLOYMENTS_REPLICA_DESC:
"Deployment is used to describe a desired state that is expected to be reached by the application. It is mainly used to describe stateless applications. The number and state of replicas are maintained by the deployment controller, ensuring the state is consistent with the defined expected state. You can increase the replicas to meet higher loads. Rolling back the deployment version can eliminate program bugs. And you can create an autoscaler to flexibly handle the load in different scenarios.",
'Deployment is used to describe a desired state that is expected to be reached by the application. It is mainly used to describe stateless applications. The number and state of replicas are maintained by the deployment controller, ensuring the state is consistent with the defined expected state. You can increase the replicas to meet higher loads. Rolling back the deployment version can eliminate program bugs. And you can create an autoscaler to flexibly handle the load in different scenarios.',
STATEFULSETS_REPLICA_DESC:
"StatefulSet is used to describe stateful applications, such as master-slave relations between replicas and persistent data storage. Like a Deployment, a StatefulSet creates identical replicas. The difference is that each replica has a persistent and unique identifier that it maintains across any rescheduling. You can use StatefulSets to achieve ordered deployment, deletion and rolling updates.",
'StatefulSet is used to describe stateful applications, such as master-slave relations between replicas and persistent data storage. Like a Deployment, a StatefulSet creates identical replicas. The difference is that each replica has a persistent and unique identifier that it maintains across any rescheduling. You can use StatefulSets to achieve ordered deployment, deletion and rolling updates.',
DAEMONSETS_REPLICA_DESC:
'DaemonSet ensures that each node in the cluster runs a replica. When a node joins the cluster or leaves, the number of replicas is automatically adjusted to ensure that the number of replicas is the same as the number of nodes in the cluster. You can use DaemonSets to run storage services (GlusterFS, Ceph, etc.), log collection services (Fluentd, Logstash, etc.), and monitoring services.',

REFFER_CONFIGMAP_DESC: "Add a new volume from the ConfigMap value.",
REFFER_SECRET_DESC: "Add a new volume from the Secret value.",
REFFER_CONFIGMAP_DESC: 'Add a new volume from the ConfigMap value.',
REFFER_SECRET_DESC: 'Add a new volume from the Secret value.',

MONITORING_ALERT_DESC:
'The current monitoring graph displays five replicas at most. You can click "View All Replicas" to view more monitoring graphs if the number of replicas exceeds five.',
Expand All @@ -229,12 +232,11 @@ export default {
"It's used as the judgment of resource allocation when scheduling containers. The container is allowed to be scheduled to the node only if the total amount of CPU that can be allocated on the node is equal or greater than the request value of the container CPU.",
CONTAINER_MEMORY_DESC:
"It's used as the judgment of resource allocation when scheduling containers. The container is allowed to be scheduled to the node only if the total amount of memory that can be allocated on the node is equal or greater than the request value of the container memory.",
IMAGE_PULL_POLICY_ALWAYS:
'Redownload Image (Always)',
IMAGE_PULL_POLICY_IFNOTPRESENT:
'Use Local Image First (IfNotPresent)',
IMAGE_PULL_POLICY_ALWAYS: 'Redownload Image (Always)',
IMAGE_PULL_POLICY_IFNOTPRESENT: 'Use Local Image First (IfNotPresent)',
IMAGE_PULL_POLICY_NEVER: 'Only Use Local Image (Never)',
IMAGE_PULL_POLICY_ALWAYS_DESC: 'Pull the image every time the pod is started.',
IMAGE_PULL_POLICY_ALWAYS_DESC:
'Pull the image every time the pod is started.',
IMAGE_PULL_POLICY_IFNOTPRESENT_DESC:
'Pull the image only if it does not exist locally.',
IMAGE_PULL_POLICY_NEVER_DESC:
Expand Down
2 changes: 1 addition & 1 deletion src/locales/zh/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export default {
APP_ICON_TIP: '点击上传应用图标,尺寸最大为 120px * 120px',

CLUSTER_NAME_DESC:
'最长 14 个字符,只能包含小写字母、数字及分隔符("-"),且必须以小写字母开头, 小写字母或数字结尾',
'最长 14 个字符,只能包含小写字母、数字及分隔符("-"),且必须以小写字母或数字开头及结尾',

CLUSTER_ALIAS_DESC:
'别名可以由任意字符组成,帮助您更好的区分资源,并支持中文名称',
Expand Down
4 changes: 2 additions & 2 deletions src/locales/zh/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,11 @@ export default {
MINUTE_TIME: '{count} 分钟',

NAME_DESC:
'最长 63 个字符,只能包含小写字母、数字及分隔符("-"),且必须以小写字母开头, 小写字母或数字结尾',
'最长 63 个字符,只能包含小写字母、数字及分隔符("-"),且必须以小写字母或数字开头及结尾',
NAME_TOO_LONG: '最长 63 个字符',

LONG_NAME_DESC:
'最长 253 个字符,只能包含小写字母、数字及分隔符("-"),且必须以小写字母开头, 小写字母或数字结尾',
'最长 253 个字符,只能包含小写字母、数字及分隔符("-"),且必须以小写字母或数字开头及结尾',
LONG_NAME_TOO_LONG: '最长 253 个字符',
LONG_DESC_TOO_LONG: '最长 1000 个字符',
ALIAS_DESC: '别名可以由任意字符组成,帮助您更好的区分资源,并支持中文名称',
Expand Down
2 changes: 1 addition & 1 deletion src/locales/zh/workload.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export default {
'定时任务 (CronJob) 管理基于时间的任务,例如在给定时间点只运行一次,或周期性地在给定时间点运行。',

CRONJOB_NAME_DESC:
'最长 52 个字符,只能包含小写字母、数字及分隔符("-"),且必须以小写字母开头, 小写字母或数字结尾',
'最长 52 个字符,只能包含小写字母、数字及分隔符("-"),且必须以小写字母或数字开头及结尾',
CRONJOB_NAME_TOO_LONG: '最长 52 个字符',

IMAGE_PLACEHOLDER: '点击右侧图标可选择镜像,或直接输入名称 例:nginx:latest',
Expand Down

0 comments on commit 9b2e961

Please sign in to comment.