anmolbabu has uploaded a new change for review. Change subject: webadmin : Time is shown with seconds in rebalance and remove-bricks status ......................................................................
webadmin : Time is shown with seconds in rebalance and remove-bricks status Time is shown with seconds in rebalance and remove-bricks status Change-Id: I4226646440ff721ad09e9a721441159281ffd516 Signed-off-by: Anmol Babu <[email protected]> --- A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/GlusterRebalanceDateTimeRenderer.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java 2 files changed, 34 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/13/20613/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/GlusterRebalanceDateTimeRenderer.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/GlusterRebalanceDateTimeRenderer.java new file mode 100644 index 0000000..164f65e --- /dev/null +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/GlusterRebalanceDateTimeRenderer.java @@ -0,0 +1,32 @@ +package org.ovirt.engine.ui.common.widget.renderer; + +import java.util.Date; + +import org.ovirt.engine.ui.common.CommonApplicationConstants; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.i18n.client.DateTimeFormat; +import com.google.gwt.i18n.client.LocaleInfo; +import com.google.gwt.text.shared.AbstractRenderer; + +public class GlusterRebalanceDateTimeRenderer extends AbstractRenderer<Date> { + private static final CommonApplicationConstants CONSTANTS = GWT.create(CommonApplicationConstants.class); + private static final String japaneseLocale = "ja"; //$NON-NLS-1$ + private static final DateTimeFormat formatJp = DateTimeFormat.getFormat("yyyy-MM-dd, HH:mm:ss"); //$NON-NLS-1$ + private static final DateTimeFormat format = DateTimeFormat.getFormat("yyyy-MMM-dd, HH:mm:ss"); //$NON-NLS-1$ + + @Override + public String render(Date object) { + if(object == null){ + return CONSTANTS.notAvailableLabel(); + } + return getLocalizedDateTimeFormat().format(object); + } + + public static DateTimeFormat getLocalizedDateTimeFormat() { + if (LocaleInfo.getCurrentLocale().getLocaleName().startsWith(japaneseLocale)) { + return formatJp; + } + return format; + } +} diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java index 53af264..9fc5aa3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java @@ -11,7 +11,7 @@ import org.ovirt.engine.ui.common.widget.editor.EntityModelLabelEditor; import org.ovirt.engine.ui.common.widget.editor.EntityModelRenderer; import org.ovirt.engine.ui.common.widget.parser.EntityModelParser; -import org.ovirt.engine.ui.common.widget.renderer.FullDateTimeRenderer; +import org.ovirt.engine.ui.common.widget.renderer.GlusterRebalanceDateTimeRenderer; import org.ovirt.engine.ui.common.widget.table.column.EntityModelTextColumn; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; @@ -204,7 +204,7 @@ if(entity == null) { return constants.unAvailablePropertyLabel(); } - return FullDateTimeRenderer.getLocalizedDateTimeFormat().format((Date) entity); + return GlusterRebalanceDateTimeRenderer.getLocalizedDateTimeFormat().format((Date) entity); } }, new EntityModelParser()); } -- To view, visit http://gerrit.ovirt.org/20613 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4226646440ff721ad09e9a721441159281ffd516 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
