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

[BUG] Final edits to the UI strings #1176

Merged
merged 5 commits into from
Oct 1, 2024

Conversation

asettle
Copy link

@asettle asettle commented Sep 26, 2024

  1. Currently unable to chagne the message "VirtualMachine generation is 2..."
  2. Discrepency between "cluster flow/flows" etc is out of my control for the UI string changes.

Closes rancher#6407
Issue: harvester/harvester#6407

1. Currently unable to chagne the message "VirtualMachine generation is 2..."
2. Discrepency between "cluster flow/flows" etc is out of my control for the UI string changes.

Signed-off-by: Alexandra Settle <asettle@suse.com>
@a110605
Copy link
Collaborator

a110605 commented Sep 26, 2024

Discrepency between "cluster flow/flows" etc is out of my control for the UI string changes.

You can remove 99 in harvesterhci.io.logging.clusterflow.vue to keep label/For getter use default count = 1 to get typeDisplay (list page title)

 return this.$store.getters['type-map/labelFor'](schema);

Same for harvesterhci.io.logging.clusteroutput.vue / flow.vue / output.vue

@a110605
Copy link
Collaborator

a110605 commented Sep 26, 2024

Currently unable to chagne the message "VirtualMachine generation is 2..."

Hi @Yu-Jack or @FrankYang0529 ,

Could you kindly help separate the wording "VirtualMachine" to "Virtual Machine" in harvester/vendor/sigs.k8s.io/cli-utils/pkg/kstatus/status/generic.go ?

Screenshot 2024-09-26 at 2 22 47 PM

@FrankYang0529
Copy link
Member

Currently unable to chagne the message "VirtualMachine generation is 2..."

Hi @Yu-Jack or @FrankYang0529 ,

Could you kindly help separate the wording "VirtualMachine" to "Virtual Machine" in harvester/vendor/sigs.k8s.io/cli-utils/pkg/kstatus/status/generic.go ?

Screenshot 2024-09-26 at 2 22 47 PM

Hi @a110605, we may not be able to do that. harvester/vendor/sigs.k8s.io/cli-utils/pkg/kstatus/status/generic.go is upstream code. Also, VirtualMachine is defined in upstream.

@Yu-Jack
Copy link
Collaborator

Yu-Jack commented Sep 26, 2024

BTW, it's a Kind, so it's slightly different meaning between VirtualMachine and Virtual Machine.

@Yu-Jack
Copy link
Collaborator

Yu-Jack commented Sep 26, 2024

“VirtualMachine” in “VirtualMachine generation is 2...” means that this resource is in k8s. “Virtual Machine” means that we usually used it to describe about VM. So, I suggest not to revise this word.

@a110605 a110605 added the Documentation Improvements or additions to documentation label Sep 26, 2024
@asettle
Copy link
Author

asettle commented Sep 26, 2024

“VirtualMachine” in “VirtualMachine generation is 2...” means that this resource is in k8s. “Virtual Machine” means that we usually used it to describe about VM. So, I suggest not to revise this word.

Hmm I understand. That being said, because it's the same text, it looks like a spelling mistake. Can we apply some mark-up to 'VirtualMachine' to ensure it's clear?

@a110605
Copy link
Collaborator

a110605 commented Sep 30, 2024

“VirtualMachine” in “VirtualMachine generation is 2...” means that this resource is in k8s. “Virtual Machine” means that we usually used it to describe about VM. So, I suggest not to revise this word.

Hmm I understand. That being said, because it's the same text, it looks like a spelling mistake. Can we apply some mark-up to 'VirtualMachine' to ensure it's clear?

Hi @Yu-Jack , could you help from backend side?

@Yu-Jack
Copy link
Collaborator

Yu-Jack commented Sep 30, 2024

Hi @a110605. Just like @FrankYang0529 mentioned, it's an upstream code, we can't modify it. So, you probably need to handle it in frontend code for this specific case.

@a110605
Copy link
Collaborator

a110605 commented Sep 30, 2024

“VirtualMachine” in “VirtualMachine generation is 2...” means that this resource is in k8s. “Virtual Machine” means that we usually used it to describe about VM. So, I suggest not to revise this word.

Hmm I understand. That being said, because it's the same text, it looks like a spelling mistake. Can we apply some mark-up to 'VirtualMachine' to ensure it's clear?

Quick synced with @Yu-Jack , we don't want to have any change in generic.go, since it's upstream code. cc @bk201

@asettle, can we skip this wording revision or we want to add specific logic in frontend to handle this wording ?

@Yu-Jack
Copy link
Collaborator

Yu-Jack commented Sep 30, 2024

@asettle
Copy link
Author

asettle commented Sep 30, 2024

“VirtualMachine” in “VirtualMachine generation is 2...” means that this resource is in k8s. “Virtual Machine” means that we usually used it to describe about VM. So, I suggest not to revise this word.

Hmm I understand. That being said, because it's the same text, it looks like a spelling mistake. Can we apply some mark-up to 'VirtualMachine' to ensure it's clear?

Quick synced with @Yu-Jack , we don't want to have any change in generic.go, since it's upstream code. cc @bk201

@asettle, can we skip this wording revision or we want to add specific logic in frontend to handle this wording ?

We can skip. It'll suffice for now. We can create a bug to handle this in later versions.

@a110605
Copy link
Collaborator

a110605 commented Oct 1, 2024

@asettle , I check QA reported unfinished items and seems we are still missing some items

  • 1). rancher monitoring (Addon: rancher-monitoring) is this Addon should be hyphenated ?
  • 3). Alert manager configs contradicts with Alert Manager configurations
  • 4).Logging (cluster Flow,cluster output,flow,output) contradicts with (cluster Flows.cluster Outputs,Flows,outputs) <- sorry, we should follow other resources to use plural wordings.
  • 6). Settings description (Typical users...) not changed as expected in the bug <- (should add new wording in harvester en-us.yaml)

Pushed my 3 commits in this PR. Please check and test them, thx

Signed-off-by: andy.lee <andy.lee@suse.com>
Signed-off-by: andy.lee <andy.lee@suse.com>
Signed-off-by: andy.lee <andy.lee@suse.com>
@harvester harvester deleted a comment from asettle Oct 1, 2024
Copy link
Collaborator

@a110605 a110605 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@a110605 a110605 merged commit b816c9c into harvester:master Oct 1, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants