Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-3.3] docs: Update UI text. #3507

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ module.exports = {
ENTER_DATA_DESC: 'Please add data.',
PRIVATE_KEY_TCAP: 'Private Key',
REGISTRY_ADDRESS_TCAP: 'Registry Address',
REGISTRY_SECRET_VER_ERR: 'Registry Verification Failed.',
REGISTRY_SECRET_VER_SUC: 'Registry Verification Succeeded.',
REGISTRY_SECRET_VER_ERR: 'Registry verification failed.',
REGISTRY_SECRET_VER_SUC: 'The registry is available.',
SECRET_NO_CHINESE_CODE_DESC: 'The key of the secret must consist of alphanumeric characters, hyphens (-), underscores (_), or periods (.).',
SECRET_TYPE_DESC: 'Select a secret type.',
IMAGE_REGISTRY_VALIDATE_TIP: 'Please validate the username and password before creating the image registry secret.',
Expand Down
1 change: 1 addition & 0 deletions locales/en/l10n-toobox-resourceConsumptionStatistics.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ module.exports = {
CLUSTER_RESOURCE_CONSUMPTION_DESC: 'Consumption of resources such as CPU, memory, and volumes of <strong>clusters</strong>',
CLUSTER_NODE_CONSUMPTION_DESC: 'Consumption of resources such as CPU, memory, and volumes of cluster <strong>nodes</strong>',
CLUSTER_POD_CONSUMPTION_DESC: 'Consumption of CPU and memory of <strong>pods</strong> in nodes',
CURRENT_RESOURCE_CONSUMPTION: 'Current Resource Consumption',
VIEW: 'View',
// Workspace Recource Consumption
WORKSPACE_CONSUMPTION: 'Workspace Resource Consumption',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ export default class ImageBuilderLastRun extends React.Component {
render() {
const { count, status, imageName, startTime, name } = this.props.runDetail
const { loading } = this.props

if (loading) {
return null
}
Expand Down Expand Up @@ -236,7 +237,9 @@ export default class ImageBuilderLastRun extends React.Component {
</li>
<li>
<div className={styles.value}>
{t(`IMAGE_NAME_${status.toUpperCase()}`, { name })}
{status &&
name &&
t(`IMAGE_NAME_${status.toUpperCase()}`, { name })}
</div>
<div className={styles.label}>{t('LAST_MESSAGE_SCAP')}</div>
</li>
Expand Down