From 30a6c233792c0152849ce094229aa7fc148d235e Mon Sep 17 00:00:00 2001 From: Stephen Turner Date: Fri, 30 May 2014 11:23:35 +0100 Subject: [PATCH] CA-136771 CA-136767 Improve deprecation messages to be applicable to next version of XenServer --- XenAdmin/TabPages/SrStoragePage.cs | 4 +-- .../NewSRWizard_Pages/ChooseSrTypePage.cs | 4 +-- XenModel/Messages.Designer.cs | 26 +++++++++---------- XenModel/Messages.resx | 14 +++++----- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/XenAdmin/TabPages/SrStoragePage.cs b/XenAdmin/TabPages/SrStoragePage.cs index 59d45026b..bd2eaab74 100644 --- a/XenAdmin/TabPages/SrStoragePage.cs +++ b/XenAdmin/TabPages/SrStoragePage.cs @@ -113,8 +113,8 @@ namespace XenAdmin.TabPages { if (sr != null && SR.IsIslOrIslLegacy(sr)) { - Banner.AppliesToVersion = Messages.XENSERVER_6_2; - Banner.BannerType = DeprecationBanner.Type.Deprecation; + Banner.AppliesToVersion = Messages.XENSERVER_6_5; + Banner.BannerType = DeprecationBanner.Type.Removal; Banner.FeatureName = Messages.ISL_SR; Banner.LinkUri = new Uri(InvisibleMessages.ISL_DEPRECATION_URL); Banner.Visible = true; diff --git a/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs b/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs index ffb01c99c..34ff21919 100644 --- a/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs +++ b/XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs @@ -67,8 +67,8 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages { if(visible) { - deprecationBanner.AppliesToVersion = Messages.XENSERVER_6_2; - deprecationBanner.BannerType = DeprecationBanner.Type.Deprecation; + deprecationBanner.AppliesToVersion = Messages.XENSERVER_6_5; + deprecationBanner.BannerType = DeprecationBanner.Type.Removal; deprecationBanner.FeatureName = Messages.ISL_SR; deprecationBanner.LinkUri = new Uri(InvisibleMessages.ISL_DEPRECATION_URL); deprecationBanner.Visible = true; diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 5aa7d35a8..a51e70e70 100644 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -11343,15 +11343,6 @@ namespace XenAdmin { } } - /// - /// Looks up a localized string similar to Cross-Server Private Network. - /// - public static string DVSCS { - get { - return ResourceManager.GetString("DVSCS", resourceCulture); - } - } - /// /// Looks up a localized string similar to Maximum memory. /// @@ -26608,7 +26599,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to '{0}': VM Protection Policies have been removed in XenServer 6.2. + /// Looks up a localized string similar to '{0}': VM Protection Policies were removed in XenServer 6.2. /// public static string RPU_WIZARD_VMPR_VMPP_DEPRECATION { get { @@ -26617,7 +26608,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to '{0}': The use of WSS servers has been removed in XenServer 6.2. + /// Looks up a localized string similar to '{0}': The use of WSS servers was removed in XenServer 6.2. /// public static string RPU_WIZARD_WSS_DEPRECATED { get { @@ -34791,7 +34782,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to The {0} feature is deprecated in {1} and may be unavailable in future versions. + /// Looks up a localized string similar to The {0} feature was deprecated in {1} and may be unavailable in future versions. /// public static string X_IS_DEPRECATED_IN_X { get { @@ -34800,7 +34791,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to The {0} feature is not available in {1}. + /// Looks up a localized string similar to The {0} feature is not available in {1} and later versions. /// public static string X_IS_REMOVED_IN_X { get { @@ -34934,6 +34925,15 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to XenServer 6.5. + /// + public static string XENSERVER_6_5 { + get { + return ResourceManager.GetString("XENSERVER_6_5", resourceCulture); + } + } + /// /// Looks up a localized string similar to XenServer Templates. /// diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index 12850f496..afce0c258 100644 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -4016,9 +4016,6 @@ Eject the CD and try again. DVD Drive {0}: - - Cross-Server Private Network - Maximum memory @@ -9260,10 +9257,10 @@ Upgrading VMs using StorageLink Gateway to XenServer 6.0 is only supported if th Checking licensing status - '{0}': VM Protection Policies have been removed in XenServer 6.2 + '{0}': VM Protection Policies were removed in XenServer 6.2 - '{0}': The use of WSS servers has been removed in XenServer 6.2 + '{0}': The use of WSS servers was removed in XenServer 6.2 Archiving @@ -12060,6 +12057,9 @@ Are you sure you want to enable automated power management for this Host? XenServer 6.2 + + XenServer 6.5 + XenServer Templates @@ -12093,10 +12093,10 @@ You will need to navigate to the Console on each of the selected VMs to complete {0} (hidden) - The {0} feature is deprecated in {1} and may be unavailable in future versions + The {0} feature was deprecated in {1} and may be unavailable in future versions - The {0} feature is not available in {1} + The {0} feature is not available in {1} and later versions {0} with warning: {1}