Merge pull request #340 from MihaelaStoica/CA-161003

CA-161003: Implement NameWithLocation for container objects
This commit is contained in:
Gabor Apati-Nagy 2015-02-24 10:25:44 +00:00
commit 7bc964cdbe
3 changed files with 22 additions and 0 deletions

View File

@ -292,5 +292,15 @@ namespace XenAdmin.Model
: status.StartsWith("Up") ? vm_power_state.Running : vm_power_state.Halted;
}
}
public override string NameWithLocation
{
get
{
if (parent == null)
return base.NameWithLocation;
return string.Format(Messages.CONTAINER_ON_VM_TITLE, Name, parent.Name, parent.LocationString);
}
}
}
}

View File

@ -7860,6 +7860,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to {0} on &apos;{1}&apos; {2}.
/// </summary>
public static string CONTAINER_ON_VM_TITLE {
get {
return ResourceManager.GetString("CONTAINER_ON_VM_TITLE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Ports.
/// </summary>

View File

@ -2840,6 +2840,9 @@ You can only connect to a single Citrix XenServer Express Edition server at a ti
<data name="CONTAINER_GENERAL_TAB_TITLE" xml:space="preserve">
<value>Container General Properties</value>
</data>
<data name="CONTAINER_ON_VM_TITLE" xml:space="preserve">
<value>{0} on '{1}' {2}</value>
</data>
<data name="CONTAINER_PORTS" xml:space="preserve">
<value>Ports</value>
</data>