Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-181445: Changes message and page title on the Upload Page in the Updates Wizard. If we are actually downloading an update, then the message will mention that. Otherwise, it will only mention the upload.

Browse Source
This commit is contained in:
Carmen Agimof 2015-09-07 13:37:52 +01:00
parent b13e72c14f
commit 2a8a80b5fd
3 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
XenAdmin/Wizards/PatchingWizard/PatchingWizard_UploadPage.cs
View File

@ -26,7 +26,8 @@ namespace XenAdmin.Wizards.PatchingWizard
public override string Text { get { return Messages.PATCHINGWIZARD_UPLOADPAGE_TEXT; } }
public override string PageTitle { get { return Messages.PATCHINGWIZARD_UPLOADPAGE_TITLE; } }
private string pageTitle = Messages.PATCHINGWIZARD_UPLOADPAGE_TITLE_ONLY_UPLOAD;
public override string PageTitle { get { return pageTitle; } }
public override string HelpID { get { return "UploadPatch"; } }
@ -40,7 +41,7 @@ namespace XenAdmin.Wizards.PatchingWizard
public readonly Dictionary<Pool_patch, string> NewUploadedPatches = new Dictionary<Pool_patch, string>();
private Dictionary<string, List<Host>> uploadedUpdates = new Dictionary<string, List<Host>>();
private Pool_patch _patch = null;
private Pool_patch _patch;
public Pool_patch Patch
{
get { return _patch; }
@ -73,9 +74,13 @@ namespace XenAdmin.Wizards.PatchingWizard
|| !File.Exists(AllDownloadedPatches[selectedPatch.Uuid])))
{
DownloadFile();
label2.Text = Messages.PATCHINGWIZARD_UPLOADPAGE_MESSAGE_DOWNLOAD_AND_UPLOAD;
pageTitle = Messages.PATCHINGWIZARD_UPLOADPAGE_TITLE_DOWNLOAD_AND_UPLOAD;
}
else
{
label2.Text = Messages.PATCHINGWIZARD_UPLOADPAGE_MESSAGE_ONLY_UPLOAD;
pageTitle = Messages.PATCHINGWIZARD_UPLOADPAGE_TITLE_ONLY_UPLOAD;
if (selectedPatch != null && AllDownloadedPatches.ContainsKey(selectedPatch.Uuid))
SelectedNewPatchPath = AllDownloadedPatches[selectedPatch.Uuid];
PrepareUploadActions();

37
XenModel/Messages.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18444
// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -25966,6 +25966,26 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to XenCenter is now downloading your update and uploading it to the servers specified in the previous step.
///Please wait for these operations to complete, then click Next to continue with the installation..
/// </summary>
public static string PATCHINGWIZARD_UPLOADPAGE_MESSAGE_DOWNLOAD_AND_UPLOAD {
get {
return ResourceManager.GetString("PATCHINGWIZARD_UPLOADPAGE_MESSAGE_DOWNLOAD_AND_UPLOAD", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to XenCenter is now uploading your update to the servers specified in the previous step.
///Please wait for this operation to complete, then click Next to continue with the installation..
/// </summary>
public static string PATCHINGWIZARD_UPLOADPAGE_MESSAGE_ONLY_UPLOAD {
get {
return ResourceManager.GetString("PATCHINGWIZARD_UPLOADPAGE_MESSAGE_ONLY_UPLOAD", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Upload.
/// </summary>
@ -25976,11 +25996,20 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Uploading selected file to your servers.
/// Looks up a localized string similar to Downloading and uploading the selected file to your servers.
/// </summary>
public static string PATCHINGWIZARD_UPLOADPAGE_TITLE {
public static string PATCHINGWIZARD_UPLOADPAGE_TITLE_DOWNLOAD_AND_UPLOAD {
get {
return ResourceManager.GetString("PATCHINGWIZARD_UPLOADPAGE_TITLE", resourceCulture);
return ResourceManager.GetString("PATCHINGWIZARD_UPLOADPAGE_TITLE_DOWNLOAD_AND_UPLOAD", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Uploading the selected file to your servers.
/// </summary>
public static string PATCHINGWIZARD_UPLOADPAGE_TITLE_ONLY_UPLOAD {
get {
return ResourceManager.GetString("PATCHINGWIZARD_UPLOADPAGE_TITLE_ONLY_UPLOAD", resourceCulture);
}
}

15
XenModel/Messages.resx
View File

@ -8961,11 +8961,22 @@ However, there is not enough space to perform the repartitioning, so the current
<data name="PATCHINGWIZARD_SELECTSERVERPAGE_TITLE" xml:space="preserve">
<value>Select the servers you wish to update</value>
</data>
<data name="PATCHINGWIZARD_UPLOADPAGE_MESSAGE_DOWNLOAD_AND_UPLOAD" xml:space="preserve">
<value>XenCenter is now downloading your update and uploading it to the servers specified in the previous step.
Please wait for these operations to complete, then click Next to continue with the installation.</value>
</data>
<data name="PATCHINGWIZARD_UPLOADPAGE_MESSAGE_ONLY_UPLOAD" xml:space="preserve">
<value>XenCenter is now uploading your update to the servers specified in the previous step.
Please wait for this operation to complete, then click Next to continue with the installation.</value>
</data>
<data name="PATCHINGWIZARD_UPLOADPAGE_TEXT" xml:space="preserve">
<value>Upload</value>
</data>
<data name="PATCHINGWIZARD_UPLOADPAGE_TITLE" xml:space="preserve">
<value>Uploading selected file to your servers</value>
<data name="PATCHINGWIZARD_UPLOADPAGE_TITLE_DOWNLOAD_AND_UPLOAD" xml:space="preserve">
<value>Downloading and uploading the selected file to your servers</value>
</data>
<data name="PATCHINGWIZARD_UPLOADPAGE_TITLE_ONLY_UPLOAD" xml:space="preserve">
<value>Uploading the selected file to your servers</value>
</data>
<data name="PATCHING_EJECT_CDS" xml:space="preserve">
<value>Eject any virtual CDs from your VMs</value>