Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-354879, CA-354877: Branding and version corrections.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2021-05-26 00:32:59 +01:00
parent 67d1ddd1d1
commit 33295bfc1b
9 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Branding/Branding.resx
View File

@ -177,7 +177,7 @@
<value>8.2</value>
</data>
<data name="PRODUCT_VERSION_POST_8_2" xml:space="preserve">
<value>Citrix Hypervisor 8.2.50</value>
<value>[BRANDING_PRODUCT_VERSION_TEXT]</value>
</data>
<data name="PRODUCT_VERSION_TEXT" xml:space="preserve">
<value>[BRANDING_PRODUCT_VERSION_TEXT]</value>

26
XenAdmin/Diagnostics/Problems/HostProblem/HostNotSafeToUpgradeWarning.cs
View File

@ -46,7 +46,8 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
: base(check)
{
_host = host;
var newPartitionInfo = string.Format(Messages.NOT_SAFE_TO_UPGRADE_NEW_PARTITION_INFO, BrandManager.ProductVersionPost82);
var version = $"{BrandManager.ProductBrand} {BrandManager.ProductVersionPost82}";
var newPartitionInfo = string.Format(Messages.NOT_SAFE_TO_UPGRADE_NEW_PARTITION_INFO, version);
string detail;
@ -54,23 +55,23 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
{
case HostNotSafeToUpgradeReason.NotEnoughSpace:
_shortMessage = Messages.NOT_SAFE_TO_UPGRADE_NOT_ENOUGH_SPACE;
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_NOT_ENOUGH_SPACE_WARNING, BrandManager.ProductVersionPost82);
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_NOT_ENOUGH_SPACE_WARNING, version);
break;
case HostNotSafeToUpgradeReason.VdiPresent:
_shortMessage = Messages.NOT_SAFE_TO_UPGRADE_VDI_PRESENT;
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_VDI_PRESENT_WARNING, BrandManager.ProductVersionPost82);
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_VDI_PRESENT_WARNING, version);
break;
case HostNotSafeToUpgradeReason.UtilityPartitionPresent:
_shortMessage = Messages.NOT_SAFE_TO_UPGRADE_UTILITY_PARTITION;
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_UTILITY_PARTITION_WARNING, BrandManager.ProductVersionPost82);
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_UTILITY_PARTITION_WARNING, version);
break;
case HostNotSafeToUpgradeReason.LegacyPartitionTable:
_shortMessage = Messages.NOT_SAFE_TO_UPGRADE_LEGACY_PARTITION_TABLE;
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_LEGACY_PARTITION_TABLE_WARNING, BrandManager.ProductVersionPost82);
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_LEGACY_PARTITION_TABLE_WARNING, version);
break;
default:
_shortMessage = Messages.NOT_SAFE_TO_UPGRADE_DEFAULT;
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_DEFAULT_WARNING, BrandManager.ProductVersionPost82);
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_DEFAULT_WARNING, version);
break;
}
Message = $"{_shortMessage}\n\n{newPartitionInfo}\n\n{detail}";
@ -92,30 +93,31 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
: base(check)
{
_host = host;
var newPartitionInfo = string.Format(Messages.NOT_SAFE_TO_UPGRADE_NEW_PARTITION_INFO, BrandManager.ProductVersionPost82);
var version = $"{BrandManager.ProductBrand} {BrandManager.ProductVersionPost82}";
var newPartitionInfo = string.Format(Messages.NOT_SAFE_TO_UPGRADE_NEW_PARTITION_INFO, version);
string detail;
switch (reason)
{
case HostNotSafeToUpgradeReason.NotEnoughSpace:
_shortMessage = Messages.NOT_SAFE_TO_UPGRADE_NOT_ENOUGH_SPACE;
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_NOT_ENOUGH_SPACE_PROBLEM, BrandManager.ProductVersionPost82);
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_NOT_ENOUGH_SPACE_PROBLEM, version);
break;
case HostNotSafeToUpgradeReason.VdiPresent:
_shortMessage = Messages.NOT_SAFE_TO_UPGRADE_VDI_PRESENT;
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_VDI_PRESENT_PROBLEM, BrandManager.ProductVersionPost82);
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_VDI_PRESENT_PROBLEM, version);
break;
case HostNotSafeToUpgradeReason.UtilityPartitionPresent:
_shortMessage = Messages.NOT_SAFE_TO_UPGRADE_UTILITY_PARTITION;
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_UTILITY_PARTITION_PROBLEM, BrandManager.ProductVersionPost82);
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_UTILITY_PARTITION_PROBLEM, version);
break;
case HostNotSafeToUpgradeReason.LegacyPartitionTable:
_shortMessage = Messages.NOT_SAFE_TO_UPGRADE_LEGACY_PARTITION_TABLE;
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_LEGACY_PARTITION_TABLE_PROBLEM, BrandManager.ProductVersionPost82);
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_LEGACY_PARTITION_TABLE_PROBLEM, version);
break;
default:
_shortMessage = Messages.NOT_SAFE_TO_UPGRADE_DEFAULT;
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_DEFAULT_PROBLEM, BrandManager.ProductVersionPost82);
detail = string.Format(Messages.NOT_SAFE_TO_UPGRADE_DEFAULT_PROBLEM, version);
break;
}
Message = $"{_shortMessage}\n\n{newPartitionInfo}\n\n{detail}";

6
XenAdmin/Diagnostics/Problems/PoolProblem/HealthCheckServiceProblem.cs
View File

@ -59,7 +59,7 @@ namespace XenAdmin.Diagnostics.Problems.PoolProblem
}
public override string Description =>
string.Format(Messages.PROBLEM_HEALTH_CHECK_SERVICE_DESCRIPTION, _pool, BrandManager.ProductBrand, BrandManager.ProductVersionText);
string.Format(Messages.PROBLEM_HEALTH_CHECK_SERVICE_DESCRIPTION, _pool, BrandManager.ProductBrand, BrandManager.ProductVersionPost82);
public override string HelpMessage => Messages.PROBLEM_HEALTH_CHECK_HELP;
}
@ -77,10 +77,10 @@ namespace XenAdmin.Diagnostics.Problems.PoolProblem
public override string Title => Check.Description;
public override string Description =>
string.Format(Messages.PROBLEM_HEALTH_CHECK_SERVICE_DESCRIPTION, pool, BrandManager.ProductBrand, BrandManager.ProductVersionText);
string.Format(Messages.PROBLEM_HEALTH_CHECK_SERVICE_DESCRIPTION, pool, BrandManager.ProductBrand, BrandManager.ProductVersionPost82);
public override string Message =>
string.Format(Messages.WARNING_HEALTH_CHECK_SERVICE_INFO, BrandManager.ProductBrand, BrandManager.ProductVersionText);
string.Format(Messages.WARNING_HEALTH_CHECK_SERVICE_INFO, BrandManager.ProductBrand, BrandManager.ProductVersionPost82);
protected override AsyncAction CreateAction(out bool cancelled)
{

2
XenAdmin/Dialogs/AboutDialog.cs
View File

@ -52,7 +52,7 @@ namespace XenAdmin.Dialogs
: revision.ToString();
VersionLabel.Text = string.Format(Messages.VERSION_NUMBER, BrandManager.BrandConsole,
BrandManager.ProductVersionText, BrandManager.XenCenterVersion, buildText, IntPtr.Size * 8);
BrandManager.XenCenterVersion, buildText, IntPtr.Size * 8);
label2.Text = string.Format(Messages.COPYRIGHT, BrandManager.CompanyNameLegal);
label2.Visible = !HiddenFeatures.CopyrightHidden;

2
XenAdmin/Dialogs/LegalNoticesDialog.cs
View File

@ -41,7 +41,7 @@ namespace XenAdmin.Dialogs
{
InitializeComponent();
label1.Text = string.Format(label1.Text, BrandManager.CompanyNameShort, BrandManager.ProductBrand,
BrandManager.BrandConsole, BrandManager.LegacyProduct, BrandManager.CompanyNameLegal);
BrandManager.BrandConsole, BrandManager.LegacyProduct, BrandManager.LegacyConsole, BrandManager.CompanyNameLegal);
label2.Text = string.Format(Messages.COPYRIGHT, BrandManager.CompanyNameLegal);
label1.Visible = label2.Visible = !HiddenFeatures.CopyrightHidden;
}

2
XenAdmin/Dialogs/LegalNoticesDialog.resx
View File

@ -303,7 +303,7 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
<value>1</value>
</data>
<data name="label1.Text" xml:space="preserve">
<value>{0}, {1}, {2}, {3}, Xen, the Xen logo, XenMotion are trademarks and/or registered trademarks of {4} in the United States and other countries.</value>
<value>{0}, {1}, {2}, {3}, {4}, Xen, the Xen logo, XenMotion are trademarks and/or registered trademarks of {5} in the United States and other countries.</value>
</data>
<data name="&gt;&gt;label1.Name" xml:space="preserve">
<value>label1</value>

4
XenAdmin/MainWindow.cs
View File

@ -907,9 +907,9 @@ namespace XenAdmin
if (master == null)
return;
log.InfoFormat("Connected to {0} (version {1}, build {2}.{3}) with {4} {5} (build {6})",
log.InfoFormat("Connected to {0} (version {1}, build {2}.{3}) with {4} {5}",
Helpers.GetName(master), Helpers.HostProductVersionText(master), Helpers.HostProductVersion(master),
master.BuildNumberRaw(), BrandManager.BrandConsole, BrandManager.ProductVersionText, Program.Version);
master.BuildNumberRaw(), BrandManager.BrandConsole, Program.Version);
// Check the PRODUCT_BRAND
if (!Program.RunInAutomatedTestMode && !SameProductBrand(master))

2
XenModel/Messages.Designer.cs generated
View File

@ -38456,7 +38456,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to {0} version {1} (build {2}.{3}) {4}-bit.
/// Looks up a localized string similar to {0} version {1} (build {2}) {3}-bit.
/// </summary>
public static string VERSION_NUMBER {
get {

2
XenModel/Messages.resx
View File

@ -13274,7 +13274,7 @@ To optimize VM performance, you should reduce the number of VCPUs to less than o
<value>Version</value>
</data>
<data name="VERSION_NUMBER" xml:space="preserve">
<value>{0} version {1} (build {2}.{3}) {4}-bit</value>
<value>{0} version {1} (build {2}) {3}-bit</value>
</data>
<data name="VGPU_DESCRIPTION" xml:space="preserve">
<value>{0} virtual GPU ({1} per GPU)</value>