From 75f86d3050314d0a4130cba8fcc445ebb9f958cc Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 26 Apr 2012 17:16:55 +0200 Subject: [PATCH] Use currency symbol instead of euro symbol in tasks tooltip FEA: ItEr76S25CurrencyManagement --- .../web/planner/TaskElementAdapter.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java index 3c3019693..ab9c7a656 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java @@ -60,7 +60,6 @@ import org.libreplan.business.common.entities.ProgressType; import org.libreplan.business.externalcompanies.daos.IExternalCompanyDAO; import org.libreplan.business.labels.entities.Label; import org.libreplan.business.orders.daos.IOrderElementDAO; -import org.libreplan.business.orders.daos.OrderElementDAO; import org.libreplan.business.orders.entities.Order; import org.libreplan.business.orders.entities.OrderElement; import org.libreplan.business.orders.entities.OrderStatusEnum; @@ -1034,13 +1033,19 @@ public class TaskElementAdapter { if (taskElement.getOrderElement() instanceof Order) { result.append(_("State") + ": ").append(getOrderState()); } else { + String budget = getBudget() + + " " + + configurationDAO.getConfiguration() + .getCurrencySymbol(); + String moneyCost = getMoneyCost() + + " " + + configurationDAO.getConfiguration() + .getCurrencySymbol(); result.append( - _("Budget: {0}€, Consumed: {1}€ ({2}%)", - getBudget(), - getMoneyCost(), - getMoneyCostBarPercentage().multiply( - new BigDecimal(100)))).append( - "
"); + _("Budget: {0}, Consumed: {1} ({2}%)", budget, + moneyCost, getMoneyCostBarPercentage() + .multiply(new BigDecimal(100)))) + .append("
"); } String labels = buildLabelsText();