From d469d92357ed2f4600dfc0e57532816e2433272d Mon Sep 17 00:00:00 2001 From: Gabor Apati-Nagy Date: Tue, 14 Mar 2017 17:27:04 +0000 Subject: [PATCH 1/2] CP-21176: Showing XC version in the new version alert This way XC will display the name attribute of the XC-version which is expected to contain the LTSR string for LTSR version. Signed-off-by: Gabor Apati-Nagy --- XenAdmin/Alerts/Types/XenCenterUpdateAlert.cs | 2 +- XenModel/Messages.Designer.cs | 2 +- XenModel/Messages.resx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/XenAdmin/Alerts/Types/XenCenterUpdateAlert.cs b/XenAdmin/Alerts/Types/XenCenterUpdateAlert.cs index edebaf76a..2123d1e6a 100644 --- a/XenAdmin/Alerts/Types/XenCenterUpdateAlert.cs +++ b/XenAdmin/Alerts/Types/XenCenterUpdateAlert.cs @@ -61,7 +61,7 @@ namespace XenAdmin.Alerts public override string Title { - get { return Messages.ALERT_NEW_VERSION; } + get { return string.Format(Messages.ALERT_NEW_VERSION, NewVersion.Name); } } public override string Description diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 960dad1ad..a45d3c7f8 100755 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -4833,7 +4833,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to New [XenCenter] Available. + /// Looks up a localized string similar to {0} is now available.. /// public static string ALERT_NEW_VERSION { get { diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index 9c13dd4df..8424e8d5e 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -1791,7 +1791,7 @@ Note that if RBAC is enabled, only alerts which you have privileges to dismiss w Go to Web Page - New [XenCenter] Available + {0} is now available. {0} is now available. Download the new version from the [Citrix] website. From b24aafc58aca98da3dbbc4d91fc8560cc8c75de8 Mon Sep 17 00:00:00 2001 From: Gabor Apati-Nagy Date: Tue, 14 Mar 2017 17:31:32 +0000 Subject: [PATCH 2/2] CP-21176: Showing XC version in the new version alert keeping consistent to the server version's text Signed-off-by: Gabor Apati-Nagy --- XenModel/Messages.Designer.cs | 2 +- XenModel/Messages.resx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index a45d3c7f8..807f33e33 100755 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -4833,7 +4833,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to {0} is now available.. + /// Looks up a localized string similar to {0} is now available. /// public static string ALERT_NEW_VERSION { get { diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index 8424e8d5e..aef43a75d 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -1791,7 +1791,7 @@ Note that if RBAC is enabled, only alerts which you have privileges to dismiss w Go to Web Page - {0} is now available. + {0} is now available {0} is now available. Download the new version from the [Citrix] website.