ofri masad has uploaded a new change for review. Change subject: webadmin: Fix localization issue in edit quota ......................................................................
webadmin: Fix localization issue in edit quota Edit Quota popup view had some hard coded strings which are imposible to localize to some languages. The string origin in the ApplicationConstants so they could not be formated. New formated strings added to ApplicationMessages and the hard coded part was replaced with a message formating. Change-Id: I73146871d6ca7a8f91a190816df2c2dc684d9f5e Bug-Url: https://bugzilla.redhat.com/871042 Signed-off-by: Ofri Masad <oma...@redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java 2 files changed, 23 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/8914/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java index c1cd59c..e645c6e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java @@ -59,4 +59,16 @@ @DefaultMessage("{0} (VLAN {1})") String vlanNetwork(String name, String vlanId); + + @DefaultMessage("{0} out of unlimited MB") + String unlimitedMemConsumption(long mem); + + @DefaultMessage("{0} out of unlimited vCPUs") + String unlimitedVcpuConsumption(int vcpu); + + @DefaultMessage("{0} out of {1} MB") + String limitedMemConsumption(long mem, long limit); + + @DefaultMessage("{0} out of {1} vCPUs") + String limitedVcpuConsumption(int vcpu, int limit); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java index d6928c3..889177b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/quota/QuotaPopupView.java @@ -26,6 +26,7 @@ import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.quota.QuotaModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; +import org.ovirt.engine.ui.webadmin.ApplicationMessages; import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.quota.QuotaPopupPresenterWidget; import org.ovirt.engine.ui.webadmin.widget.table.column.NullableButtonCell; @@ -172,7 +173,8 @@ } @Inject - public QuotaPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants) { + public QuotaPopupView(EventBus eventBus, ApplicationResources resources, ApplicationConstants constants, + ApplicationMessages messages) { super(eventBus, resources); initListBoxEditors(); initRadioButtonEditors(); @@ -182,7 +184,7 @@ localize(constants); addStyles(); Driver.driver.initialize(this); - initTables(constants); + initTables(constants, messages); } private void addStyles() { @@ -200,8 +202,8 @@ storageGraceSlider.setSliderValueChange(GRACE_STORAGE, this); } - private void initTables(ApplicationConstants constants) { - initQuotaClusterTable(constants); + private void initTables(ApplicationConstants constants, ApplicationMessages messages) { + initQuotaClusterTable(constants, messages); initQuotaStorageTable(constants); } @@ -290,7 +292,7 @@ }); } - private void initQuotaClusterTable(final ApplicationConstants constants) { + private void initQuotaClusterTable(final ApplicationConstants constants, final ApplicationMessages messages) { quotaClusterTable = new IVdcQueryableCellTable<QuotaVdsGroup, ListModel>(); clusterQuotaTableContainer.add(quotaClusterTable); @@ -348,11 +350,10 @@ if (object.getMemSizeMB() == null) { return ""; //$NON-NLS-1$ } else if (object.getMemSizeMB().equals(QuotaVdsGroup.UNLIMITED_MEM)) { - str = constants.outOfQuota() + constants.unlimitedQuota(); + return messages.unlimitedMemConsumption(object.getMemSizeMBUsage()); } else { - str = constants.outOfQuota() + object.getMemSizeMB(); + return messages.limitedMemConsumption(object.getMemSizeMBUsage(), object.getMemSizeMB()); } - return object.getMemSizeMBUsage() + str + " MB"; //$NON-NLS-1$ } }, constants.quotaOfMemQuota()); @@ -363,11 +364,10 @@ if (object.getVirtualCpu() == null) { return ""; //$NON-NLS-1$ } else if (object.getVirtualCpu().equals(QuotaVdsGroup.UNLIMITED_VCPU)) { - str = constants.outOfQuota() + constants.unlimitedQuota(); + return messages.unlimitedVcpuConsumption(object.getVirtualCpuUsage()); } else { - str = constants.outOfQuota() + object.getVirtualCpu(); + return messages.limitedVcpuConsumption(object.getVirtualCpuUsage(), object.getVirtualCpu()); } - return object.getVirtualCpuUsage() + str + " vCPUs"; //$NON-NLS-1$ } }, constants.quotaOfVcpuQuota()); -- To view, visit http://gerrit.ovirt.org/8914 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73146871d6ca7a8f91a190816df2c2dc684d9f5e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: ofri masad <oma...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
