From 1bc97079c6adc2a3ae12d1853a7e0662a3c12d9b Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Tue, 8 Oct 2013 10:40:54 +1000 Subject: [PATCH 1/2] fix statistics display after api change --- .../client/resources/WebTransMessages.java | 7 ++----- .../webtrans/client/ui/TransUnitCountBar.java | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java b/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java index ed812d9db2..168d94e507 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java @@ -21,16 +21,13 @@ public interface WebTransMessages extends Messages { @DefaultMessage("(No Content)") String noContent(); - @DefaultMessage("{0}% ({1,number,#.#}hrs) {2}") - String statusBarPercentageHrs(double approved, double remainingHours, + @DefaultMessage("{0} ({1,number,#.#}hrs) {2}") + String statusBarPercentageHrs(String approved, double remainingHours, String by); @DefaultMessage("{0,number,#.#}") String statusBarLabelHours(double remainingHours); - @DefaultMessage("{0}%") - String statusBarLabelPercentage(double approved); - @DefaultMessage("http://zanata.org/") String hrefHelpLink(); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java index 9d0af896f5..d4be403815 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java @@ -1,5 +1,6 @@ package org.zanata.webtrans.client.ui; +import com.google.gwt.i18n.client.NumberFormat; import org.zanata.common.LocaleId; import org.zanata.rest.dto.stats.ContainerTranslationStatistics; import org.zanata.rest.dto.stats.TranslationStatistics; @@ -38,6 +39,7 @@ public class TransUnitCountBar extends Composite implements protected final TooltipPopupPanel tooltipPanel; private static final int TOTAL_WIDTH = 100; + private final NumberFormat percentFormat = NumberFormat.getPercentFormat(); interface TransUnitCountBarUiBinder extends UiBinder { @@ -169,31 +171,31 @@ public void refresh() { } private void setLabelText() { - // TODO rhbz953734 - remaining hours switch (labelFormat) { case PERCENT_COMPLETE_HRS: TranslationStatistics wordStats = stats.getStats(localeId.getId(), StatUnit.WORD); if (statsByWords) { label.setText(messages.statusBarPercentageHrs( - wordStats.getPercentTranslated(), + percentFormat.format(wordStats.getPercentTranslated() / 100), wordStats.getRemainingHours(), "Words")); } else { TranslationStatistics msgStats = stats.getStats(localeId.getId(), StatUnit.MESSAGE); label.setText(messages.statusBarPercentageHrs( - msgStats.getPercentTranslated(), + percentFormat.format(msgStats.getPercentTranslated() / 100), wordStats.getRemainingHours(), "Msg")); } break; case PERCENT_COMPLETE: if (statsByWords) { - label.setText(messages.statusBarLabelPercentage(stats.getStats( - localeId.getId(), StatUnit.WORD).getPercentTranslated())); + double wordPercent = stats.getStats( + localeId.getId(), StatUnit.WORD).getPercentTranslated() / 100; + label.setText(percentFormat.format(wordPercent)); } else { - label.setText(messages.statusBarLabelPercentage(stats.getStats( - localeId.getId(), StatUnit.MESSAGE) - .getPercentTranslated())); + double messagePercent = stats.getStats( + localeId.getId(), StatUnit.MESSAGE).getPercentTranslated() / 100; + label.setText(percentFormat.format(messagePercent)); } break; default: From 6ed82d974f3f826d25829dd395875fe409347a59 Mon Sep 17 00:00:00 2001 From: Patrick Huang Date: Tue, 8 Oct 2013 11:40:36 +1000 Subject: [PATCH 2/2] wording change --- .../webtrans/client/ui/TransUnitCountBar.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java index d4be403815..9aa2e68272 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java @@ -177,25 +177,29 @@ private void setLabelText() { stats.getStats(localeId.getId(), StatUnit.WORD); if (statsByWords) { label.setText(messages.statusBarPercentageHrs( - percentFormat.format(wordStats.getPercentTranslated() / 100), + percentFormat.format( + wordStats.getPercentTranslated() / 100), wordStats.getRemainingHours(), "Words")); } else { TranslationStatistics msgStats = stats.getStats(localeId.getId(), StatUnit.MESSAGE); label.setText(messages.statusBarPercentageHrs( - percentFormat.format(msgStats.getPercentTranslated() / 100), + percentFormat.format( + msgStats.getPercentTranslated() / 100), wordStats.getRemainingHours(), "Msg")); } break; case PERCENT_COMPLETE: if (statsByWords) { - double wordPercent = stats.getStats( - localeId.getId(), StatUnit.WORD).getPercentTranslated() / 100; - label.setText(percentFormat.format(wordPercent)); + double wordTranslatedProportion = stats + .getStats(localeId.getId(), StatUnit.WORD) + .getPercentTranslated() / 100; + label.setText(percentFormat.format(wordTranslatedProportion)); } else { - double messagePercent = stats.getStats( - localeId.getId(), StatUnit.MESSAGE).getPercentTranslated() / 100; - label.setText(percentFormat.format(messagePercent)); + double messageTranslatedProportion = stats + .getStats(localeId.getId(), StatUnit.MESSAGE) + .getPercentTranslated() / 100; + label.setText(percentFormat.format(messageTranslatedProportion)); } break; default: