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

fix: missing vnc reconnecting label (backport #1257) #1260

Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 9, 2025

Summary

vncConsole.reconnecting.message label is missing

PR Checklist

  • Is this a multi-tenancy feature/bug?
    • Yes, the relevant RBAC changes are at:
  • Do we need to backport changes to the old Rancher UI, such as RKE1?
    • Yes, the relevant PR is at:
  • Are backend engineers aware of UI changes?
    • Yes, the backend owner is:

Related Issue #

[BUG] [UI] Missing vnc reconnecting label #7182

Occurred changes and/or fixed issues

The label is missing from the shell/assets/translations/en-us.yaml in Rancher version 2.9 and lower.
Ref: https://github.com/rancher/dashboard/blob/release-2.9/shell/assets/translations/en-us.yaml#L7757-L7759.
Add translation key to pkg/harvester/l10n/en-us.yaml to fix the issue.

Technical notes summary

Add translation key to pkg/harvester/l10n/en-us.yaml to fix the issue.

Areas or cases that should be tested

  1. Go to Rancher
  2. Go to Virtualization Management -> Harvester cluster -> Virtual Machines
  3. Click on Console button
  4. Check the reconnecting label

Areas which could experience regressions

Screenshot/Video

Screenshot 2025-01-07 at 1 54 59 PM
This is an automatic backport of pull request #1257 done by [Mergify](https://mergify.com).

Signed-off-by: Yi-Ya Chen <[email protected]>
(cherry picked from commit 8b8a155)

# Conflicts:
#	pkg/harvester/l10n/en-us.yaml
@mergify mergify bot added Backport to v1.3 Backport PR target v1.3 Conflicts labels Jan 9, 2025
Copy link
Author

mergify bot commented Jan 9, 2025

Cherry-pick of 8b8a155 has failed:

On branch mergify/bp/release-harvester-v1.3/pr-1257
Your branch is up to date with 'origin/release-harvester-v1.3'.

You are currently cherry-picking commit 8b8a1550.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pkg/harvester/components/novnc/NovncConsole.vue

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/harvester/l10n/en-us.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Signed-off-by: Yi-Ya Chen <[email protected]>
@houhoucoop houhoucoop merged commit 1b23e30 into release-harvester-v1.3 Jan 10, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport to v1.3 Backport PR target v1.3 Conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant