diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 154c5e87a..be85f0a63 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -7,6 +7,8 @@ > Users must be able to say: “Nice enhancement, I'm eager to test it” +- [VM/network] VIF's locking mode: improve tooltip messages [#4713](https://github.com/vatesfr/xen-orchestra/issues/4713) (PR [#5227](https://github.com/vatesfr/xen-orchestra/pull/5227)) + ### Bug fixes > Users must be able to say: “I had this issue, happy to know it's fixed” @@ -27,3 +29,5 @@ > - major: if the change breaks compatibility > > In case of conflict, the highest (lowest in previous list) `$version` wins. + +- xo-web minor diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js index af8f6c4f1..d24f99c6c 100644 --- a/packages/xo-web/src/common/intl/messages.js +++ b/packages/xo-web/src/common/intl/messages.js @@ -1156,13 +1156,15 @@ const messages = { vifMacAutoGenerate: 'Auto-generated if empty', vifAllowedIps: 'Allowed IPs', vifNoIps: 'No IPs', - vifDisabledNetwork: 'Network disabled', - vifLockedNetwork: 'Network locked', + vifLockingModeDisabled: 'VIF locking mode is disabled', + vifLockingModeUnlocked: 'VIF locking mode is unlocked', + vifLockingModeLocked: 'VIF locking mode is locked', + networkDefaultLockingModeDisabled: 'Network default locking mode is disabled', + networkDefaultLockingModeUnlocked: 'Network default locking mode is unlocked', vifLockedNetworkNoIps: 'Network locked and no IPs are allowed for this interface', vifUnlockedNetworkWithIps: - 'Network not locked: some IPs are unnecessarily set as allowed for this interface', - vifUnLockedNetwork: 'Network not locked', + 'Some IPs are unnecessarily set as allowed for this interface', vifUnknownNetwork: 'Unknown network', vifCreate: 'Create', diff --git a/packages/xo-web/src/xo-app/vm/tab-network.js b/packages/xo-web/src/xo-app/vm/tab-network.js index e48c59900..07f81f518 100644 --- a/packages/xo-web/src/xo-app/vm/tab-network.js +++ b/packages/xo-web/src/xo-app/vm/tab-network.js @@ -293,7 +293,7 @@ class VifStatus extends BaseComponent { if (lockingMode === 'disabled') { return ( - + ) @@ -301,7 +301,7 @@ class VifStatus extends BaseComponent { if (lockingMode === 'unlocked') { return ( - + ) @@ -309,7 +309,7 @@ class VifStatus extends BaseComponent { if (lockingMode === 'locked') { return ( - + ) @@ -325,7 +325,7 @@ class VifStatus extends BaseComponent { } if (network.defaultIsLocked) { return ( - + +