Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-29 02:18:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #82 from stephen-turner/CA-136767

Browse Source 
CA-136771 CA-136767 Improve deprecation messages to be applicable to next version of XenServer
This commit is contained in:
Mihaela Stoica 2014-06-02 11:05:01 +01:00
commit 900580e8b3
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/TabPages/SrStoragePage.cs
View File

@ -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;

4
XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs
View File

@ -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;

26
XenModel/Messages.Designer.cs generated
View File

@ -11343,15 +11343,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Cross-Server Private Network.
/// </summary>
public static string DVSCS {
get {
return ResourceManager.GetString("DVSCS", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Maximum memory.
/// </summary>
@ -26608,7 +26599,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to &apos;{0}&apos;: VM Protection Policies have been removed in XenServer 6.2.
/// Looks up a localized string similar to &apos;{0}&apos;: VM Protection Policies were removed in XenServer 6.2.
/// </summary>
public static string RPU_WIZARD_VMPR_VMPP_DEPRECATION {
get {
@ -26617,7 +26608,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to &apos;{0}&apos;: The use of WSS servers has been removed in XenServer 6.2.
/// Looks up a localized string similar to &apos;{0}&apos;: The use of WSS servers was removed in XenServer 6.2.
/// </summary>
public static string RPU_WIZARD_WSS_DEPRECATED {
get {
@ -34791,7 +34782,7 @@ namespace XenAdmin {
}
/// <summary>
/// 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.
/// </summary>
public static string X_IS_DEPRECATED_IN_X {
get {
@ -34800,7 +34791,7 @@ namespace XenAdmin {
}
/// <summary>
/// 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.
/// </summary>
public static string X_IS_REMOVED_IN_X {
get {
@ -34934,6 +34925,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to XenServer 6.5.
/// </summary>
public static string XENSERVER_6_5 {
get {
return ResourceManager.GetString("XENSERVER_6_5", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to XenServer Templates.
/// </summary>

14
XenModel/Messages.resx
View File

@ -4016,9 +4016,6 @@ Eject the CD and try again.</value>
<data name="DVD_DRIVE_LABEL_NUMBERED" xml:space="preserve">
<value>DVD Drive {0}:</value>
</data>
<data name="DVSCS" xml:space="preserve">
<value>Cross-Server Private Network</value>
</data>
<data name="DYNAMIC_MAX" xml:space="preserve">
<value>Maximum memory</value>
</data>
@ -9260,10 +9257,10 @@ Upgrading VMs using StorageLink Gateway to XenServer 6.0 is only supported if th
<value>Checking licensing status</value>
</data>
<data name="RPU_WIZARD_VMPR_VMPP_DEPRECATION" xml:space="preserve">
<value>'{0}': VM Protection Policies have been removed in XenServer 6.2</value>
<value>'{0}': VM Protection Policies were removed in XenServer 6.2</value>
</data>
<data name="RPU_WIZARD_WSS_DEPRECATED" xml:space="preserve">
<value>'{0}': The use of WSS servers has been removed in XenServer 6.2</value>
<value>'{0}': The use of WSS servers was removed in XenServer 6.2</value>
</data>
<data name="RUNNING_ARCHIVE" xml:space="preserve">
<value>Archiving</value>
@ -12060,6 +12057,9 @@ Are you sure you want to enable automated power management for this Host?</value
<data name="XENSERVER_6_2" xml:space="preserve">
<value>XenServer 6.2</value>
</data>
<data name="XENSERVER_6_5" xml:space="preserve">
<value>XenServer 6.5</value>
</data>
<data name="XENSERVER_TEMPLATES" xml:space="preserve">
<value>XenServer Templates</value>
</data>
@ -12093,10 +12093,10 @@ You will need to navigate to the Console on each of the selected VMs to complete
<value>{0} (hidden)</value>
</data>
<data name="X_IS_DEPRECATED_IN_X" xml:space="preserve">
<value>The {0} feature is deprecated in {1} and may be unavailable in future versions</value>
<value>The {0} feature was deprecated in {1} and may be unavailable in future versions</value>
</data>
<data name="X_IS_REMOVED_IN_X" xml:space="preserve">
<value>The {0} feature is not available in {1}</value>
<value>The {0} feature is not available in {1} and later versions</value>
</data>
<data name="X_WITH_WARNING_X" xml:space="preserve">
<value>{0} with warning: {1}</value>