Add Chinese translations for Actions on the service page #7757

Chenrujie-85 · 2024-09-18T03:17:46Z

Describe the change

Add Chinese translations for Actions on the service page

Steps to test the PR

Automation testing

If applicable, explain the case scencarios covered by unit / integration / e2e tests created for this PR.

Issue reference

#7737

详细描述

ferhoyos · 2024-09-18T09:13:14Z

Thanks @Chenrujie-85 for the PR! Nice contribution to extend Kiali internationalization 🙂 I will review it soon.

ferhoyos · 2024-09-19T15:18:23Z

frontend/public/locales/zh/translation.json

@Chenrujie-85 the new entries are not ordered alphabetically. Could you execute frontend/yarn build? The build command will re-generate the translation.json file with ordered entries.

Ok, I estimate that I will complete this task from 9am to 10am Beijing time

I ran yarn build and pushed the new translation.json, which is now ordered alphabetically.

* 'master' of https://github.com/kiali/kiali: obtain the grafana and tracing version from the internal in-cluster url (kiali#7746) Adapt cypress tests to OSSMC (kiali#7656) Follow-on work to the waypoint service injection work, this looks (kiali#7756) Prevent service node injection for waypoint edges (kiali#7742) Update serialize-javascript dependency (kiali#7750) Update express dependency (again) (kiali#7738) [make] bump some olm stuff (kiali#7748) Update install istio script to make arg optional (kiali#7743) Update bookinfo install hack script such that for ambient the two "db" (kiali#7736) Upgrade images for IBM (kiali#7707) Update express, path-to-regexp and micromatch dependencies (kiali#7730) Added missing K8sGateway label name check for MissingSidecar icon (kiali#7721) Istio config list: loop call validations per namespace in backend (kiali#7688) Upgrade Patternfly to version 5.4 (kiali#7676) # Conflicts: # frontend/public/locales/zh/translation.json

ferhoyos

Great job @Chenrujie-85! Overall is quite good, only some comments about translating external variables (WIZARD_TITLES) and bold texts.

ferhoyos · 2024-09-20T08:02:40Z

frontend/src/components/IstioWizards/GatewaySelector.tsx

@@ -181,7 +182,7 @@ export class GatewaySelector extends React.Component<Props, GatewaySelectorState
                id="includeMesh"
                label={
                  <>
-                    Include <b>mesh</b> gateway
+                  {t('Include')} <b>mesh</b> {t('gateway')}


In this case, I think it is better to have the entire statement translated rather than just the bold word mesh. In other languages maybe the word order is not the same.

Suggested change

{t('Include')} <b>mesh</b> {t('gateway')}

{t('Include mesh gateway')}

ferhoyos · 2024-09-20T08:24:20Z

frontend/src/components/IstioWizards/WizardActions.ts

@@ -103,13 +104,13 @@ export type WizardAction =
 export type WizardMode = 'create' | 'update';

 export const WIZARD_TITLES = {


Adding the t function to an external variable does not translate the variable. This is only used to generate the translation statements in translation.json file. For external variables not defined within a React component you have to perform an extra step: adding the t function to the WIZARD_TITLES variable in the Kiali application.

${t(WIZARD_TITLES[this.props.type])}

I have added some suggestions. Look for all the WIZARD_TITLES variables used and add them the t function.

ferhoyos · 2024-09-20T08:25:57Z

frontend/src/components/IstioWizards/ServiceWizard.tsx

+          ? `${t('Update')} ${WIZARD_TITLES[this.props.type]}`
+          : `${t('Create')} ${WIZARD_TITLES[this.props.type]}`


Add the t function to the WIZARD_TITLES variable to be translated (explained in another comment):

Suggested change

? `${t('Update')} ${WIZARD_TITLES[this.props.type]}`

: `${t('Create')} ${WIZARD_TITLES[this.props.type]}`

? `${t('Update')} ${t(WIZARD_TITLES[this.props.type])}`

: `${t('Create')} ${t(WIZARD_TITLES[this.props.type])}`

ferhoyos · 2024-09-20T08:26:26Z

frontend/src/components/IstioWizards/ServiceWizard.tsx

+          ? `${t('Update')} ${WIZARD_TITLES[this.props.type]}`
+          : `${t('Create')} ${WIZARD_TITLES[this.props.type]}`


Suggested change

? `${t('Update')} ${WIZARD_TITLES[this.props.type]}`

: `${t('Create')} ${WIZARD_TITLES[this.props.type]}`

? `${t('Update')} ${t(WIZARD_TITLES[this.props.type])}`

: `${t('Create')} ${t(WIZARD_TITLES[this.props.type])}`

I have corrected the error you mentioned. Please review it when you have time. Thank you very much.

ferhoyos · 2024-09-23T12:40:46Z

frontend/src/components/IstioWizards/WizardActions.ts

-  [WIZARD_REQUEST_TIMEOUTS]: t('Request Timeouts'),
-  [WIZARD_K8S_REQUEST_ROUTING]: t('K8s HTTP Routing'),
-  [WIZARD_K8S_GRPC_REQUEST_ROUTING]: t('K8s GRPC Routing')
+  [WIZARD_REQUEST_ROUTING]: 'Request Routing',


The t funciton is needed here as well. If you remove it, the literal statements won't be included in translation.json file.

In summary, the t function is used twice for external variables:

In the definition of the external variable, to include the literal statements to translation.json file

In the variable usage within the React component, to translate the variable.

Thank you for your review. I've corrected the problem.

ferhoyos

Thanks for the quick fix. There are 2 small additional changes, not your fault but it would be great to have them in the PR.

ferhoyos · 2024-09-23T14:14:04Z

frontend/src/components/IstioWizards/FaultInjection/AbortFault.tsx

@@ -70,7 +71,7 @@ export class AbortFault extends React.Component<Props> {
            />
            <FormHelperText>
              <HelperText>
-                <HelperTextItem>{isValid(this.props.isValid) ? httpStatusMsg : httpStatusMsg}</HelperTextItem>
+                <HelperTextItem>{isValid(this.props.isValid) ? t(httpStatusMsg) : t(httpStatusMsg)}</HelperTextItem>


This is not your fault, but it doesn't make sense to show the same message for both true and false.

Suggested change

<HelperTextItem>{isValid(this.props.isValid) ? t(httpStatusMsg) : t(httpStatusMsg)}</HelperTextItem>

<HelperTextItem>{t(httpStatusMsg)}</HelperTextItem>

ferhoyos · 2024-09-23T14:15:17Z

frontend/src/components/IstioWizards/RequestTimeouts/RouteRetry.tsx

@@ -67,7 +68,7 @@ export class RouteRetry extends React.Component<RouteRetryProps> {
              />
              <FormHelperText>
                <HelperText>
-                  <HelperTextItem>{isValid(this.props.isValidRetry) ? tryTimeoutMsg : tryTimeoutMsg}</HelperTextItem>
+                  <HelperTextItem>{isValid(this.props.isValidRetry) ? t(tryTimeoutMsg) : t(tryTimeoutMsg)}</HelperTextItem>


the same here.

Suggested change

<HelperTextItem>{isValid(this.props.isValidRetry) ? t(tryTimeoutMsg) : t(tryTimeoutMsg)}</HelperTextItem>

<HelperTextItem>{t(tryTimeoutMsg)}</HelperTextItem>

As you suggested, the code here should indeed be modified. I have completed the modification, please review it when you have time

Signed-off-by: CTakanashiRikka <[email protected]>

ferhoyos

Good job @Chenrujie-85! I have tested the PR and it looks great! You have added many i18n labels to the Kiali application. I just have one final request before approving the PR. Please re-generate the translation.json file by running frontend/yarn build to remove deprecated entries. Also there are some conflicts to be addressed.

ferhoyos · 2024-09-24T07:06:22Z

frontend/public/locales/zh/translation.json

  "FQDN": "完全限定域名",
+  "gateway": "网关",


This entry does not longer exist in the application. Please re-generate the translation.json

Ok, I re-run yarn build and submitted the updated translation.json.

I think I have resolved the conflict. Please review it for me when you have time. If you have any questions, please continue to raise them and I will continue to improve them.

* origin/master: Add Chinese translation

* 'master' of https://github.com/kiali/kiali: Show workload action list in kiosk mode (kiali#7752) rename in_cluster_url to internal_url; rename url to external_url (kiali#7759) Add new cypress test (kiali#7763) [hack] support Sail on vanilla Kubernetes now that OperatorHub.io has the Sail operator (kiali#7761) [Ambient] Add bi-directional edge support for waypoint traffic (kiali#7719) # Conflicts: # frontend/public/locales/zh/translation.json # frontend/src/components/IstioWizards/WorkloadWizardDropdown.tsx

* origin/master: # Conflicts: # frontend/src/components/IstioWizards/WorkloadWizardDropdown.tsx

ferhoyos · 2024-09-24T10:21:05Z

Thanks for solving the conflicts @Chenrujie-85. I have created a small PR to your PR since some of the labels you translated have been moved to a new component WorkloadWizardActionsDropdownGroup. Merge my PR into your PR or add directly the changes, and I think we are ready to approve and merge this PR 🙂

Add i18n labels to WorkloadWizardActionsDropdownGroup

Chenrujie-85 · 2024-09-24T10:27:01Z

Thanks for solving the conflicts @Chenrujie-85. I have created a small PR to your PR since some of the labels you translated have been moved to a new component WorkloadWizardActionsDropdownGroup. Merge my PR into your PR or add directly the changes, and I think we are ready to approve and merge this PR 🙂

I have merged your PR, thank you very much for your help

Chenrujie-85 · 2024-09-24T11:21:40Z

Do I need to pass all the tests to be merged?

ferhoyos

LGTM. All tests passed.

Thank you very much for your contribution @Chenrujie-85! I'm looking forward to seeing more Chinese translations in other areas of the Kiali application in the future.

Chenrujie-85 · 2024-09-24T12:38:05Z

LGTM. All tests passed.

Thank you very much for your contribution @Chenrujie-85! I'm looking forward to seeing more Chinese translations in other areas of the Kiali application in the future.

Thank you very much for your help in the process, and I will continue to add Chinese translations in kiali in the future.

c00887447 added 3 commits September 10, 2024 09:04

[DTS|CloudReq|Issue No.][feat] 一句话描述主题

b62efdf

详细描述

Add Chinese translation

9f72343

Add Chinese translation

638dc2c

ferhoyos assigned Chenrujie-85 Sep 18, 2024

ferhoyos added the test: n/a PR does not need test additions or updates label Sep 18, 2024

ferhoyos reviewed Sep 19, 2024

View reviewed changes

c00887447 added 2 commits September 20, 2024 08:47

Add Chinese translation

1ec0fa5

ferhoyos requested changes Sep 20, 2024

View reviewed changes

Add Chinese translation

6c220cb

ferhoyos requested changes Sep 23, 2024

View reviewed changes

Add Chinese translation

55df6e9

ferhoyos requested changes Sep 23, 2024

View reviewed changes

Add Chinese translation

412910b

Signed-off-by: CTakanashiRikka <[email protected]>

ferhoyos requested changes Sep 24, 2024

View reviewed changes

c00887447 and others added 6 commits September 24, 2024 16:21

Add Chinese translation

f1989e9

Merge remote-tracking branch 'origin/master'

c17b935

* origin/master: Add Chinese translation

Merge branch 'master' into master

d24aab1

Merge remote-tracking branch 'origin/master'

f9d127a

* origin/master: # Conflicts: # frontend/src/components/IstioWizards/WorkloadWizardDropdown.tsx

Add i18n labels to WorkloadWizardActionsDropdownGroup

d02513c

Merge pull request #1 from ferhoyos/i18n-service-wizard

df2a4ac

Add i18n labels to WorkloadWizardActionsDropdownGroup

ferhoyos approved these changes Sep 24, 2024

View reviewed changes

ferhoyos merged commit bdadf6f into kiali:master Sep 24, 2024
10 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Chinese translations for Actions on the service page #7757

Add Chinese translations for Actions on the service page #7757

Chenrujie-85 commented Sep 18, 2024

ferhoyos commented Sep 18, 2024

ferhoyos Sep 19, 2024

Chenrujie-85 Sep 19, 2024

Chenrujie-85 Sep 20, 2024

ferhoyos left a comment

ferhoyos Sep 20, 2024 •

edited

Loading

ferhoyos Sep 20, 2024 •

edited

Loading

ferhoyos Sep 20, 2024 •

edited

Loading

ferhoyos Sep 20, 2024

Chenrujie-85 Sep 23, 2024

ferhoyos Sep 23, 2024

Chenrujie-85 Sep 23, 2024

ferhoyos left a comment

ferhoyos Sep 23, 2024

ferhoyos Sep 23, 2024

Chenrujie-85 Sep 23, 2024

ferhoyos left a comment •

edited

Loading

ferhoyos Sep 24, 2024

Chenrujie-85 Sep 24, 2024

Chenrujie-85 Sep 24, 2024

ferhoyos commented Sep 24, 2024 •

edited

Loading

Chenrujie-85 commented Sep 24, 2024

Chenrujie-85 commented Sep 24, 2024

ferhoyos left a comment

Chenrujie-85 commented Sep 24, 2024

	{t('Include')} <b>mesh</b> {t('gateway')}
	{t('Include mesh gateway')}

		@@ -103,13 +104,13 @@ export type WizardAction =
		export type WizardMode = 'create' \| 'update';

		export const WIZARD_TITLES = {

		? `${t('Update')} ${WIZARD_TITLES[this.props.type]}`
		: `${t('Create')} ${WIZARD_TITLES[this.props.type]}`

	<HelperTextItem>{isValid(this.props.isValid) ? t(httpStatusMsg) : t(httpStatusMsg)}</HelperTextItem>
	<HelperTextItem>{t(httpStatusMsg)}</HelperTextItem>

	<HelperTextItem>{isValid(this.props.isValidRetry) ? t(tryTimeoutMsg) : t(tryTimeoutMsg)}</HelperTextItem>
	<HelperTextItem>{t(tryTimeoutMsg)}</HelperTextItem>

Add Chinese translations for Actions on the service page #7757

Add Chinese translations for Actions on the service page #7757

Conversation

Chenrujie-85 commented Sep 18, 2024

Describe the change

Steps to test the PR

Automation testing

Issue reference

ferhoyos commented Sep 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ferhoyos left a comment

Choose a reason for hiding this comment

ferhoyos Sep 20, 2024 • edited Loading

Choose a reason for hiding this comment

ferhoyos Sep 20, 2024 • edited Loading

Choose a reason for hiding this comment

ferhoyos Sep 20, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ferhoyos left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ferhoyos left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ferhoyos commented Sep 24, 2024 • edited Loading

Chenrujie-85 commented Sep 24, 2024

Chenrujie-85 commented Sep 24, 2024

ferhoyos left a comment

Choose a reason for hiding this comment

Chenrujie-85 commented Sep 24, 2024

ferhoyos Sep 20, 2024 •

edited

Loading

ferhoyos Sep 20, 2024 •

edited

Loading

ferhoyos Sep 20, 2024 •

edited

Loading

ferhoyos left a comment •

edited

Loading

ferhoyos commented Sep 24, 2024 •

edited

Loading