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

CA-381500: Revert renaming of Status to Expiry status

Browse Source 
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
This commit is contained in:
Danilo Del Busso 2023-08-16 15:11:11 +01:00
parent 81bf424013
commit 1f7fbc017c
No known key found for this signature in database
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -112,7 +112,7 @@ namespace XenAdmin.TabPages
pdSectionLicense.UpdateEntryValueWithKey(FriendlyName("host.license_params-expiry"),
ss.ExpiryDate, ss.ShowExpiryDate);
pdSectionLicense.UpdateEntryValueWithKey(Messages.LICENSE_EXPIRY_STATUS, ss.ExpiryStatus, true);
pdSectionLicense.UpdateEntryValueWithKey(Messages.LICENSE_STATUS, ss.ExpiryStatus, true);
if (xenObject is Pool p)
{
@ -1101,7 +1101,7 @@ namespace XenAdmin.TabPages
if (licenseStatus != null)
{
var ss = new GeneralTabLicenseStatusStringifier(licenseStatus);
s.AddEntry(Messages.LICENSE_EXPIRY_STATUS,
s.AddEntry(Messages.LICENSE_STATUS,
licenseStatus.Updated ? ss.ExpiryStatus : Messages.GENERAL_LICENSE_QUERYING, editItem);
if (ss.ShowExpiryDate)

18
XenModel/Messages.Designer.cs generated
View File

@ -22848,15 +22848,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Expiry status.
/// </summary>
public static string LICENSE_EXPIRY_STATUS {
get {
return ResourceManager.GetString("LICENSE_EXPIRY_STATUS", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to This field is disabled due to license restrictions on the server..
/// </summary>
@ -23145,6 +23136,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Status.
/// </summary>
public static string LICENSE_STATUS {
get {
return ResourceManager.GetString("LICENSE_STATUS", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Trial.
/// </summary>

3
XenModel/Messages.ja.resx
View File

@ -7882,6 +7882,9 @@ SR UUID: {1}</value>
<data name="LICENSE_SERVER_WEB_CONSOLE_GOTO" xml:space="preserve">
<value>表示...</value>
</data>
<data name="LICENSE_STATUS" xml:space="preserve">
<value>状態</value>
</data>
<data name="LICENSE_SUPPORT_AND_DESKTOP_CLOUD_FEATURES_ENABLED" xml:space="preserve">
<value>サポート契約が有効です
{0} Virtual Apps and Desktops {0} Cloud 機能が有効です</value>

6
XenModel/Messages.resx
View File

@ -7942,9 +7942,6 @@ SR UUID: {1}</value>
<data name="LICENSE_EXPIRES_ONE_MIN" xml:space="preserve">
<value>Expires in 1 minute</value>
</data>
<data name="LICENSE_EXPIRY_STATUS" xml:space="preserve">
<value>Expiry status</value>
</data>
<data name="LICENSE_FIELD_DISABLED" xml:space="preserve">
<value>This field is disabled due to license restrictions on the server.</value>
</data>
@ -8041,6 +8038,9 @@ SR UUID: {1}</value>
<data name="LICENSE_STANDARD_FEATURES_ENABLED" xml:space="preserve">
<value>Standard features only</value>
</data>
<data name="LICENSE_STATUS" xml:space="preserve">
<value>Status</value>
</data>
<data name="LICENSE_TRIAL" xml:space="preserve">
<value>Trial</value>
</data>

3
XenModel/Messages.zh-CN.resx
View File

@ -7878,6 +7878,9 @@ SR UUID: {1}</value>
<data name="LICENSE_SERVER_WEB_CONSOLE_GOTO" xml:space="preserve">
<value>转至...</value>
</data>
<data name="LICENSE_STATUS" xml:space="preserve">
<value>状态</value>
</data>
<data name="LICENSE_SUPPORT_AND_DESKTOP_CLOUD_FEATURES_ENABLED" xml:space="preserve">
<value>有资格获得支持
{0} Virtual Apps and Desktops {0} Cloud 功能已启用</value>