Skip to content

Commit

Permalink
Merge pull request #1261 from harvester/mergify/bp/release-harvester-…
Browse files Browse the repository at this point in the history
…v1.4/pr-1257

fix: missing vnc reconnecting label (backport #1257)
  • Loading branch information
houhoucoop authored Jan 10, 2025
2 parents 4273038 + 30caf7c commit 44b8e44
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pkg/harvester/components/novnc/NovncConsole.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<main class="main-layout">
<div class="text-center">
<h2 class="text-secondary mt-20">
{{ t('vncConsole.reconnecting.message') }}:{{ retryTimes }} of {{ maximumRetryTimes }}
{{ t('harvester.virtualMachine.vncConsole.reconnecting.message') }}:{{ retryTimes }} of {{ maximumRetryTimes }}
</h2>
</div>
</main>
Expand Down
13 changes: 8 additions & 5 deletions pkg/harvester/l10n/en-us.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,9 @@ harvester:
console:
novnc: Open in WebVNC
serial: Open in Serial Console
vncConsole:
reconnecting:
message: Web VNC console reconnection attempt
promptRemove:
title: 'Select the volume you want to delete:'
deleteAll: Delete All
Expand Down Expand Up @@ -850,14 +853,14 @@ harvester:
doc: Read the <a href="{url}" target="_blank">documentation</a> before starting the upgrade process. Ensure that you complete procedures that are relevant to your environment and the version you are upgrading to.
tip: Unmet system requirements and incorrectly performed procedures may cause complete upgrade failure and other issues that require manual workarounds.
moreNotes: For more details about the release notes, please visit -

schedule:
label: Virtual Machine Schedules
createTitle: Create Schedule
createButtonText: Create Schedule
scheduleType: Virtual Machine Schedule Type
cron: Cron Schedule
detail:
detail:
namespace: Namespace
sourceVM: Source Virtual Machine
tabs:
Expand All @@ -867,12 +870,12 @@ harvester:
message:
noSetting:
suffix: before creating a backup schedule
retain:
retain:
label: Retain
count: Count
tooltip: Number of up-to-date VM backups to retain. Maximum to 250, minimum to 2.
tooltip: Number of up-to-date VM backups to retain. Maximum to 250, minimum to 2.
maxFailure:
label: Max Failure
label: Max Failure
count: Count
tooltip: Max number of consecutive failed backups that could be tolerated. If reach this threshold, Harvester controller will suspend the schedule job. This value should less than retain count
virtualMachine:
Expand Down

0 comments on commit 44b8e44

Please sign in to comment.