diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java index be4aeab05..b36bb94d5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java @@ -43,7 +43,14 @@ public class BaseCalendarBandboxFinder extends BandboxFinder implements IBandbox @Autowired private IBaseCalendarDAO baseCalendarDAO; - private final String headers[] = { "Name" }; + private final String headers[] = { _("Name") }; + + /** + * Forces to mark the string as needing translation + */ + private static String _(String string) { + return string; + } @Override @Transactional(readOnly = true) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java index be74d8416..5df87357e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java @@ -41,7 +41,14 @@ public class CriterionBandboxFinder extends BandboxFinder implements IBandboxFin @Autowired private ICriterionDAO criterionDAO; - private final String headers[] = { "Type", "Criterion Name" }; + private final String headers[] = { _("Type"), _("Criterion Name") }; + + /** + * Forces to mark the string as needing translation + */ + private static String _(String string) { + return string; + } @Override @Transactional(readOnly = true) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionMultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionMultipleFiltersFinder.java index 6309b4b56..2a9efab02 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionMultipleFiltersFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionMultipleFiltersFinder.java @@ -41,6 +41,13 @@ public class CriterionMultipleFiltersFinder extends MultipleFiltersFinder { } }; + /** + * Forces to mark the string as needing translation + */ + private static String _(String string) { + return string; + } + @Override public List getFirstTenFilters() { getListMatching().clear(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java index 214b87e46..8d0bb8878 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java @@ -48,7 +48,14 @@ public class ExternalCompanyBandboxFinder extends BandboxFinder implements @Autowired private IExternalCompanyDAO externalCompanyDAO; - private final String headers[] = { "ID", "Name" }; + private final String headers[] = { _("ID"), _("Name") }; + + /** + * Forces to mark the string as needing translation + */ + private static String _(String string) { + return string; + } @Override @Transactional(readOnly = true) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java index c270fec1f..6ed342c77 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java @@ -49,7 +49,14 @@ public class LabelBandboxFinder extends BandboxFinder implements IBandboxFinder @Autowired private ILabelDAO labelDAO; - private final String headers[] = { "Type", "Name" }; + private final String headers[] = { _("Type"), _("Name") }; + + /** + * Forces to mark the string as needing translation + */ + private static String _(String string) { + return string; + } @Override @Transactional(readOnly = true) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java index 2b083b07b..0f8758132 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java @@ -41,7 +41,14 @@ public class OrderBandboxFinder extends BandboxFinder implements IBandboxFinder @Autowired private IOrderDAO orderDAO; - private final String headers[] = { "Project", "Project code" }; + private final String headers[] = { _("Project"), _("Project code") }; + + /** + * Forces to mark the string as needing translation + */ + private static String _(String string) { + return string; + } @Override @Transactional(readOnly = true) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java index d456dcd5b..355a401a8 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java @@ -48,8 +48,15 @@ public class OrderElementBandboxFinder extends BandboxFinder implements IBandbox @Autowired private IOrderDAO orderDAO; - private final String headers[] = { "Project", "Project code", "Task", - "Task code" }; + private final String headers[] = { _("Project"), _("Project code"), + _("Task"), _("Task code") }; + + /** + * Forces to mark the string as needing translation + */ + private static String _(String string) { + return string; + } @Override @Transactional(readOnly = true) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java index 5f5085c10..3339f7617 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java @@ -33,7 +33,7 @@ import org.navalplanner.business.orders.entities.OrderElement; */ public enum OrderElementFilterEnum implements IFilterEnum { - Criterion("Criterion"), Label("Label"); + Criterion(_("Criterion")), Label(_("Label")); /** * Forces to mark the string as needing translation diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java index 390167783..664430e10 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java @@ -27,8 +27,9 @@ package org.navalplanner.web.common.components.finders; public enum OrderFilterEnum implements IFilterEnum { - Criterion("Criterion"), Label("Label"), ExternalCompany("Customer"), State( - "State"), Code("Code"), CustomerReference("Customer Reference"); + Criterion(_("Criterion")), Label(_("Label")), ExternalCompany(_("Customer")), State( + _("State")), Code(_("Code")), CustomerReference( + _("Customer Reference")); /** * Forces to mark the string as needing translation */ diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java index 635d629c2..8475f08ca 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java @@ -48,7 +48,14 @@ public class QualityFormBandboxFinder extends BandboxFinder implements @Autowired private IQualityFormDAO qualityFormDAO; - private final String headers[] = { "Name", "Type" }; + private final String headers[] = { _("Name"), _("Type") }; + + /** + * Forces to mark the string as needing translation + */ + private static String _(String string) { + return string; + } @Override @Transactional(readOnly = true) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java index 867280052..d4ae4423e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java @@ -26,7 +26,7 @@ package org.navalplanner.web.common.components.finders; public enum ResourceAllocationFilterEnum implements IFilterEnum { - Criterion("Criterion"), Resource("Resource"); + Criterion(_("Criterion")), Resource(_("Resource")); /** * Forces to mark the string as needing translation diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java index aabc38576..245aa0aa0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java @@ -26,7 +26,7 @@ package org.navalplanner.web.common.components.finders; public enum ResourceFilterEnum implements IFilterEnum { - Criterion("Criterion"), CostCategory("Cost category"); + Criterion(_("Criterion")), CostCategory(_("Cost category")); /** * Forces to mark the string as needing translation diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java index ad10ad1fc..a5a40f2a7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java @@ -43,7 +43,14 @@ public class ScenarioBandboxFinder extends BandboxFinder implements IBandboxFind @Autowired private IScenarioDAO scenarioDAO; - private final String headers[] = { "Name" }; + private final String headers[] = { _("Name") }; + + /** + * Forces to mark the string as needing translation + */ + private static String _(String string) { + return string; + } @Override @Transactional(readOnly = true) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java index 74d5cd950..610445915 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java @@ -41,6 +41,13 @@ public class WorkerMultipleFiltersFinder extends MultipleFiltersFinder { } }; + /** + * Forces to mark the string as needing translation + */ + private static String _(String string) { + return string; + } + @Override public List getFirstTenFilters() { getListMatching().clear();