RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use parameters instead of concatenating

Browse source 
The structure of the tooltip can change depending on the language.
Concatenating strings hardwires it to the English language. Using
parameters instead.
This commit is contained in:
Oscar Gonzalez Fernandez 2014-03-17 22:44:44 +01:00
parent 8cafdd2d62
commit c93a1399f3
1 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
View file

@ -22,6 +22,7 @@
package org.libreplan.web.planner; package org.libreplan.web.planner;
import static org.libreplan.web.I18nHelper._; import static org.libreplan.web.I18nHelper._;
import static org.libreplan.web.common.Util.addCurrencySymbol;
import static org.zkoss.ganttz.data.constraint.ConstraintOnComparableValues.biggerOrEqualThan; import static org.zkoss.ganttz.data.constraint.ConstraintOnComparableValues.biggerOrEqualThan;
import static org.zkoss.ganttz.data.constraint.ConstraintOnComparableValues.equalTo; import static org.zkoss.ganttz.data.constraint.ConstraintOnComparableValues.equalTo;
import static org.zkoss.ganttz.data.constraint.ConstraintOnComparableValues.lessOrEqualThan; import static org.zkoss.ganttz.data.constraint.ConstraintOnComparableValues.lessOrEqualThan;
@ -84,7 +85,6 @@ import org.libreplan.business.scenarios.entities.Scenario;
import org.libreplan.business.workingday.EffortDuration; import org.libreplan.business.workingday.EffortDuration;
import org.libreplan.business.workingday.IntraDayDate; import org.libreplan.business.workingday.IntraDayDate;
import org.libreplan.business.workingday.IntraDayDate.PartialDay; import org.libreplan.business.workingday.IntraDayDate.PartialDay;
import org.libreplan.web.common.Util;
import org.libreplan.web.planner.order.PlanningStateCreator.PlanningState; import org.libreplan.web.planner.order.PlanningStateCreator.PlanningState;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
@ -922,12 +922,11 @@ public class TaskElementAdapter {
if (taskElement.getOrderElement() instanceof Order) { if (taskElement.getOrderElement() instanceof Order) {
result.append(_("State") + ": ").append(getOrderState()); result.append(_("State") + ": ").append(getOrderState());
} else { } else {
String budget = Util String budget = addCurrencySymbol(getTotalCalculatedBudget());
.addCurrencySymbol(getTotalCalculatedBudget()); String moneyCost = addCurrencySymbol(getMoneyCost());
String moneyCost = Util.addCurrencySymbol(getMoneyCost());
String costHours = Util.addCurrencySymbol(getHoursMoneyCost()); String costHours = addCurrencySymbol(getHoursMoneyCost());
String costExpenses = Util.addCurrencySymbol(getExpensesMoneyCost()); String costExpenses = addCurrencySymbol(getExpensesMoneyCost());
result.append( result.append(
_("Budget: {0}, Consumed: {1} ({2}%)", budget, moneyCost, _("Budget: {0}, Consumed: {1} ({2}%)", budget, moneyCost,
getMoneyCostBarPercentage().multiply(new BigDecimal(100)))) getMoneyCostBarPercentage().multiply(new BigDecimal(100))))
@ -1313,16 +1312,13 @@ _(
.getOrder().getHoursMargin() : 0; .getOrder().getHoursMargin() : 0;
result.append(_("Hours-status") + "\n"); result.append(_("Hours-status") + "\n");
result.append(_("Project margin: ")).append(margin) result.append(_("Project margin: {0}% ({1} hours)={2} hours",
.append("% (").append(orderElement.getWorkHours()) margin, orderElement.getWorkHours(),
.append(" hours)="); orderElement.getWithMarginCalculatedHours()));
result.append(orderElement.getWithMarginCalculatedHours())
.append(" hours");
String totalEffortHours = orderElement.getEffortAsString(); String totalEffortHours = orderElement.getEffortAsString();
result.append(_(". Already registered: ")) result.append(_(". Already registered: {0} hours", totalEffortHours));
.append(totalEffortHours).append(" hours");
return result.toString(); return result.toString();
} }
@ -1331,18 +1327,15 @@ _(
Integer margin = orderElement.getOrder().getBudgetMargin() != null ? orderElement Integer margin = orderElement.getOrder().getBudgetMargin() != null ? orderElement
.getOrder().getBudgetMargin() : 0; .getOrder().getBudgetMargin() : 0;
result.append(_("Budget-status") + "\n"); result.append(_("Budget-status") + "\n");
result.append(_("Project margin: ")) result.append(_("Project margin: {0}% ({1})={2}", margin,
.append(margin) addCurrencySymbol(orderElement.getBudget()),
.append("% (") addCurrencySymbol(orderElement
.append(Util.addCurrencySymbol(orderElement.getBudget())) .getWithMarginCalculatedBudget())));
.append(")=");
result.append(Util.addCurrencySymbol(orderElement
.getWithMarginCalculatedBudget()));
BigDecimal totalExpense = getTotalExpense(orderElement); BigDecimal totalExpense = getTotalExpense(orderElement);
result.append(_(". Already spent: ")).append( result.append(_(". Already spent: {0}",
Util.addCurrencySymbol(totalExpense)); addCurrencySymbol(totalExpense)));
return result.toString(); return result.toString();
} }