Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: unlocalized properties in VM General tab ......................................................................
webadmin: unlocalized properties in VM General tab - vm priority - vm sockets count - run on 'any host in cluster' Change-Id: I24151bc17538fb7489458ac0c34e10b98726812f Bug-Url: https://bugzilla.redhat.com/950826 Signed-off-by: Gilad Chaplik <gchap...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java 3 files changed, 32 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/13884/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java index dc04b3d..ddec1ca 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java @@ -7,13 +7,13 @@ import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.OriginType; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; +import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.UsbPolicy; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VmOsType; import org.ovirt.engine.core.common.businessentities.VmPauseStatus; import org.ovirt.engine.core.common.businessentities.VmType; -import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.queries.GetAllDisksByVmIdParameters; import org.ovirt.engine.core.common.queries.SearchParameters; @@ -618,8 +618,9 @@ translator = EnumTranslator.Create(UsbPolicy.class); setUsbPolicy(translator.get(vm.getUsbPolicy())); - setCpuInfo(vm.getNumOfCpus() + " " + "(" + vm.getNumOfSockets() + " Socket(s), " + vm.getCpuPerSocket() //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + " Core(s) per Socket)"); //$NON-NLS-1$ + setCpuInfo(ConstantsManager.getInstance() + .getMessages() + .cpuInfoMessage(vm.getNumOfCpus(), vm.getNumOfSockets(), vm.getCpuPerSocket())); setHasDomain(AsyncDataProvider.IsWindowsOsType(vm.getVmOs())); setDomain(vm.getVmDomain()); @@ -676,7 +677,7 @@ } else { - setDefaultHost("Any Host in Cluster"); //$NON-NLS-1$ + setDefaultHost(ConstantsManager.getInstance().getConstants().anyHostInCluster()); } } @@ -739,21 +740,17 @@ int highPriority = AsyncDataProvider.GetMaxVmPriority(); int roundedPriority = AsyncDataProvider.RoundPriority(value); - if (roundedPriority == 1) - { - return "Low"; //$NON-NLS-1$ + if (roundedPriority == 1) { + return ConstantsManager.getInstance().getConstants().vmLowPriority(); } - else if (roundedPriority == AsyncDataProvider.GetMaxVmPriority() / 2) - { - return "Medium"; //$NON-NLS-1$ + else if (roundedPriority == AsyncDataProvider.GetMaxVmPriority() / 2) { + return ConstantsManager.getInstance().getConstants().vmMediumPriority(); } - else if (roundedPriority == AsyncDataProvider.GetMaxVmPriority()) - { - return "High"; //$NON-NLS-1$ + else if (roundedPriority == AsyncDataProvider.GetMaxVmPriority()) { + return ConstantsManager.getInstance().getConstants().vmHighPriority(); } - else - { - return "Unknown"; //$NON-NLS-1$ + else { + return ConstantsManager.getInstance().getConstants().vmUnknownPriority(); } } } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java index d8719ce..990ec58 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java @@ -1,6 +1,5 @@ package org.ovirt.engine.ui.uicompat; -import org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions; import org.ovirt.engine.core.common.businessentities.VmPool; @@ -1794,4 +1793,19 @@ @DefaultStringValue("'Use Host CPU' is only available for cluster compatible with ver 3.2 or higher, when 'Do not allow migration' is selected or 'Allow manual migration' is selected and no host is specified) ") String hosCPUUnavailable(); + + @DefaultStringValue("Low") + String vmLowPriority(); + + @DefaultStringValue("Medium") + String vmMediumPriority(); + + @DefaultStringValue("High") + String vmHighPriority(); + + @DefaultStringValue("Unknown") + String vmUnknownPriority(); + + @DefaultStringValue("Any Host in Cluster") + String anyHostInCluster(); } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java index 49de335..ecb84ab 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Messages.java @@ -264,4 +264,8 @@ @DefaultMessage("Brick Details not supported for this Cluster''s compatibility version({0}).") String brickDetailsNotSupportedInClusterCompatibilityVersion(String version); + + @DefaultMessage("{0} ({1} Socket(s), {2} Core(s) per Socket)") + String cpuInfoMessage(int numOfCpus, int numOfSockets, int cpuPerSocket); + } -- To view, visit http://gerrit.ovirt.org/13884 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24151bc17538fb7489458ac0c34e10b98726812f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
