Alexander Wels has uploaded a new change for review. Change subject: userportal, webadmin: i18n refresh 'sec' ......................................................................
userportal, webadmin: i18n refresh 'sec' - Fixed 'sec' not being i18ned on the refresh panel drop down. - Renamed MilisecondRenderer to MillisecondRenderer Change-Id: I0eadb1085e6b59239d1091d894de52ca3fc3e88a Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=871354 Signed-off-by: Alexander Wels <aw...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/BaseRefreshPanel.java D frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/MilisecondRenderer.java A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/MillisecondRenderer.java 4 files changed, 47 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/13525/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index eda2939..98446c4 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -1078,6 +1078,9 @@ @DefaultStringValue("Refresh Rate") String refreshRate(); + @DefaultStringValue("sec") + String refreshRateSeconds(); + // Network Host @DefaultStringValue("Network Device Status") String statusNetworkHost(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/BaseRefreshPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/BaseRefreshPanel.java index b3931bf..e1bd412 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/BaseRefreshPanel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/refresh/BaseRefreshPanel.java @@ -5,7 +5,7 @@ import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.idhandler.HasElementId; import org.ovirt.engine.ui.common.utils.ElementIdUtils; -import org.ovirt.engine.ui.common.widget.renderer.MilisecondRenderer; +import org.ovirt.engine.ui.common.widget.renderer.MillisecondRenderer; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Style; @@ -101,7 +101,7 @@ getElement().appendChild(checkItem.getElement()); Anchor textItem = new Anchor(); - textItem.setText(MilisecondRenderer.getInstance().render(refreshRate)); + textItem.setText(MillisecondRenderer.getInstance().render(refreshRate)); textItem.setStylePrimaryName(style.textItem()); getElement().appendChild(textItem.getElement()); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/MilisecondRenderer.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/MilisecondRenderer.java deleted file mode 100644 index d103f23..0000000 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/MilisecondRenderer.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ovirt.engine.ui.common.widget.renderer; - -import com.google.gwt.text.shared.AbstractRenderer; - -public class MilisecondRenderer extends AbstractRenderer<Integer> { - - private static final MilisecondRenderer INSTANCE = new MilisecondRenderer(); - - public static MilisecondRenderer getInstance() { - return INSTANCE; - } - - @Override - public String render(Integer object) { - return object / 1000 + " sec"; //$NON-NLS-1$ - } - -} diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/MillisecondRenderer.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/MillisecondRenderer.java new file mode 100644 index 0000000..d46c373 --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/MillisecondRenderer.java @@ -0,0 +1,42 @@ +package org.ovirt.engine.ui.common.widget.renderer; + +import org.ovirt.engine.ui.common.CommonApplicationConstants; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.text.shared.AbstractRenderer; + +/** + * Render the refresh panel 'seconds' indicator. + */ +public class MillisecondRenderer extends AbstractRenderer<Integer> { + /** + * GWT CommonApplicationConstants to get sec label. + */ + private static final CommonApplicationConstants CONSTANTS = GWT.create(CommonApplicationConstants.class); + /** + * What to divide a number by to turn milli seconds into seconds. + */ + private static final Integer MILLI_SECOND_DIVISION = 1000; + /** + * The object instance. + */ + private static final MillisecondRenderer INSTANCE = new MillisecondRenderer(); + + /** + * Get the object instance. + * @return {@code MilisecondRenderer} object instance. + */ + public static MillisecondRenderer getInstance() { + return INSTANCE; + } + + @Override + public String render(final Integer seconds) { + StringBuilder builder = new StringBuilder(); + builder.append(seconds / MILLI_SECOND_DIVISION); + builder.append(' '); //$NON-NLS-1$ + builder.append(CONSTANTS.refreshRateSeconds()); + return builder.toString(); + } + +} -- To view, visit http://gerrit.ovirt.org/13525 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0eadb1085e6b59239d1091d894de52ca3fc3e88a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <aw...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
