Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 15:29:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CP-41433: Legacy console name is not applicable any more.

Browse Source 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
This commit is contained in:
Konstantina Chremmou 2023-01-15 16:08:53 +00:00
parent ca021b95dd
commit 72f411b950
8 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Branding/Branding.resx
View File

@ -132,9 +132,6 @@
<data name="HELP_PATH" xml:space="preserve"> <data name="HELP_PATH" xml:space="preserve">
<value>xencenter/current-release/</value> <value>xencenter/current-release/</value>
</data> </data>
<data name="LEGACY_CONSOLE" xml:space="preserve">
<value>XenCenter</value>
</data>
<data name="LEGACY_PRODUCT" xml:space="preserve"> <data name="LEGACY_PRODUCT" xml:space="preserve">
<value>XenServer</value> <value>XenServer</value>
</data> </data>

2
XenAdmin/Commands/InstallNewUpdateCommand.cs
View File

@ -72,7 +72,7 @@ namespace XenAdmin.Commands
if (connected.Count > 0 && connected.All(c => !Helpers.Post82X(c))) if (connected.Count > 0 && connected.All(c => !Helpers.Post82X(c)))
return string.Format(Messages.INSTALL_PENDING_UPDATES_DISABLED_REASON, return string.Format(Messages.INSTALL_PENDING_UPDATES_DISABLED_REASON,
BrandManager.BrandConsole, BrandManager.ProductVersion821, BrandManager.LegacyConsole); BrandManager.BrandConsole, Program.VersionText, BrandManager.ProductVersion821);
return base.GetCantRunReasonCore(item); return base.GetCantRunReasonCore(item);
} }

2
XenAdmin/MainWindow.cs
View File

@ -1009,7 +1009,7 @@ namespace XenAdmin
Program.Invoke(Program.MainWindow, delegate Program.Invoke(Program.MainWindow, delegate
{ {
var msg = string.Format(Messages.GUI_NOT_COMPATIBLE, BrandManager.BrandConsole, var msg = string.Format(Messages.GUI_NOT_COMPATIBLE, BrandManager.BrandConsole,
BrandManager.ProductVersion821, Helpers.GetName(coordinator), BrandManager.LegacyConsole); BrandManager.ProductVersion821, Helpers.GetName(coordinator));
var url = InvisibleMessages.OUT_OF_DATE_WEBSITE; var url = InvisibleMessages.OUT_OF_DATE_WEBSITE;
var title = string.Format(Messages.CONNECTION_REFUSED_TITLE, Helpers.GetName(coordinator).Ellipsise(80)); var title = string.Format(Messages.CONNECTION_REFUSED_TITLE, Helpers.GetName(coordinator).Ellipsise(80));
var error = $"{msg}\n{url}"; var error = $"{msg}\n{url}";

2
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -1871,7 +1871,7 @@ namespace XenAdmin.TabPages
else if (!Helpers.Post82X(xenObject.Connection)) else if (!Helpers.Post82X(xenObject.Connection))
{ {
Banner.BannerType = DeprecationBanner.Type.Deprecation; Banner.BannerType = DeprecationBanner.Type.Deprecation;
Banner.WarningMessage = string.Format(Messages.WARNING_PRE_CLOUD_VERSION_CONNECTION, BrandManager.BrandConsole, BrandManager.ProductVersion821, BrandManager.LegacyConsole); Banner.WarningMessage = string.Format(Messages.WARNING_PRE_CLOUD_VERSION_CONNECTION, BrandManager.BrandConsole, Program.VersionText, BrandManager.ProductVersion821);
Banner.LinkText = Messages.PATCHING_WIZARD_WEBPAGE_CELL; Banner.LinkText = Messages.PATCHING_WIZARD_WEBPAGE_CELL;
Banner.LinkUri = new Uri(InvisibleMessages.OUT_OF_DATE_WEBSITE); Banner.LinkUri = new Uri(InvisibleMessages.OUT_OF_DATE_WEBSITE);
Banner.Visible = true; Banner.Visible = true;

2
XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.cs
View File

@ -40,7 +40,7 @@ namespace XenAdmin.Wizards.PatchingWizard
public PatchingWizard_FirstPage() public PatchingWizard_FirstPage()
{ {
InitializeComponent(); InitializeComponent();
label5.Text = string.Format(label5.Text, BrandManager.ProductVersion821, BrandManager.LegacyConsole); label5.Text = string.Format(label5.Text, BrandManager.ProductVersion821, BrandManager.BrandConsole);
label9.Text = string.Format(label9.Text, BrandManager.BrandConsole); label9.Text = string.Format(label9.Text, BrandManager.BrandConsole);
label5.Visible = ConnectionsManager.XenConnectionsCopy.Any(c => c.IsConnected && !Helpers.Post82X(c)); label5.Visible = ConnectionsManager.XenConnectionsCopy.Any(c => c.IsConnected && !Helpers.Post82X(c));
} }

2
XenModel/BrandManager.cs
View File

@ -79,8 +79,6 @@ namespace XenAdmin.Core
public static readonly string LegacyProduct = Get("LEGACY_PRODUCT"); public static readonly string LegacyProduct = Get("LEGACY_PRODUCT");
public static readonly string LegacyConsole = Get("LEGACY_CONSOLE");
public static readonly string PerfAlertMailDefaultLanguage = Get("PERF_ALERT_MAIL_DEFAULT_LANGUAGE"); public static readonly string PerfAlertMailDefaultLanguage = Get("PERF_ALERT_MAIL_DEFAULT_LANGUAGE");
public static readonly string ProductBrand; public static readonly string ProductBrand;

8
XenModel/Messages.Designer.cs generated
View File

@ -18468,7 +18468,7 @@ namespace XenAdmin {
/// <summary> /// <summary>
/// Looks up a localized string similar to This version of {0} can only connect to {1} and greater versions. It cannot connect to {2}. /// Looks up a localized string similar to This version of {0} can only connect to {1} and greater versions. It cannot connect to {2}.
/// ///
///You can get a compatible version of {3} from the following location:. ///You can get a compatible version of {0} from the following location:.
/// </summary> /// </summary>
public static string GUI_NOT_COMPATIBLE { public static string GUI_NOT_COMPATIBLE {
get { get {
@ -21650,8 +21650,8 @@ namespace XenAdmin {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to {0} cannot be used for installing updates on servers running {1}. /// Looks up a localized string similar to {0} {1} cannot be used for installing updates on servers running {2}.
///Please use latest available {2} for {1} instead.. ///Please use latest available {0} for {2} instead..
/// </summary> /// </summary>
public static string INSTALL_PENDING_UPDATES_DISABLED_REASON { public static string INSTALL_PENDING_UPDATES_DISABLED_REASON {
get { get {
@ -40875,7 +40875,7 @@ namespace XenAdmin {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to {0} is not recommended for general management of servers running {1}. Please use latest available {2} for {1} instead.. /// Looks up a localized string similar to {0} {1} is not recommended for general management of servers running {2}. Please use latest available {0} for {2} instead..
/// </summary> /// </summary>
public static string WARNING_PRE_CLOUD_VERSION_CONNECTION { public static string WARNING_PRE_CLOUD_VERSION_CONNECTION {
get { get {

8
XenModel/Messages.resx
View File

@ -6455,7 +6455,7 @@ Note: Any custom color selections will remain unchanged</value>
<data name="GUI_NOT_COMPATIBLE" xml:space="preserve"> <data name="GUI_NOT_COMPATIBLE" xml:space="preserve">
<value>This version of {0} can only connect to {1} and greater versions. It cannot connect to {2}. <value>This version of {0} can only connect to {1} and greater versions. It cannot connect to {2}.
You can get a compatible version of {3} from the following location:</value> You can get a compatible version of {0} from the following location:</value>
</data> </data>
<data name="GUI_OUT_OF_DATE" xml:space="preserve"> <data name="GUI_OUT_OF_DATE" xml:space="preserve">
<value>This version of {0} is out of date and cannot connect to {1}. <value>This version of {0} is out of date and cannot connect to {1}.
@ -7544,8 +7544,8 @@ This might result in failure to migrate VMs to this server during the RPU or to
<value>Install pending &amp;updates...</value> <value>Install pending &amp;updates...</value>
</data> </data>
<data name="INSTALL_PENDING_UPDATES_DISABLED_REASON" xml:space="preserve"> <data name="INSTALL_PENDING_UPDATES_DISABLED_REASON" xml:space="preserve">
<value>{0} cannot be used for installing updates on servers running {1}. <value>{0} {1} cannot be used for installing updates on servers running {2}.
Please use latest available {2} for {1} instead.</value> Please use latest available {0} for {2} instead.</value>
</data> </data>
<data name="INSTALL_SERVER_CERTIFICATE_ACTION_LINK" xml:space="preserve"> <data name="INSTALL_SERVER_CERTIFICATE_ACTION_LINK" xml:space="preserve">
<value>Install certificate...</value> <value>Install certificate...</value>
@ -14117,7 +14117,7 @@ Schedule:
<value>Health Check has been removed in {0} {1}. If you are going to upgrade the pool to this version, you must disable Health Check first.</value> <value>Health Check has been removed in {0} {1}. If you are going to upgrade the pool to this version, you must disable Health Check first.</value>
</data> </data>
<data name="WARNING_PRE_CLOUD_VERSION_CONNECTION" xml:space="preserve"> <data name="WARNING_PRE_CLOUD_VERSION_CONNECTION" xml:space="preserve">
<value>{0} is not recommended for general management of servers running {1}. Please use latest available {2} for {1} instead.</value> <value>{0} {1} is not recommended for general management of servers running {2}. Please use latest available {0} for {2} instead.</value>
</data> </data>
<data name="WEB_BROWSER_FAILED" xml:space="preserve"> <data name="WEB_BROWSER_FAILED" xml:space="preserve">
<value>Cannot find '{0}'.</value> <value>Cannot find '{0}'.</value>