From 1a83d1cf1a4ffcdee37f4da2519661738aa7b352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Mon, 17 May 2010 13:55:37 +0200 Subject: [PATCH] ItEr58S05DocumentacionFormacionItEr57S05: Corrected some typos and added i18n to some strings directly on the source code. --- .../zkoss/ganttz/resourceload/ResourcesLoadPanel.java | 6 +++--- .../main/resources/web/ganttz/zul/leftTasksTree.zul | 10 +++++++--- .../resources/web/ganttz/zul/resourcesLoadLayout.zul | 6 +++--- .../web/limitingresources/LimitingResourcesPanel.java | 2 +- .../web/resourceload/ResourceLoadModel.java | 6 +++--- .../ws/resources/impl/ResourceConverter.java | 2 +- .../ws/workreports/impl/WorkReportConverter.java | 6 +++--- .../src/main/webapp/calendars/calendars.zul | 2 +- .../src/main/webapp/common/concurrent_modification.zul | 2 +- .../src/main/webapp/common/layout/timeout.zul | 2 +- .../src/main/webapp/resources/machine/_editMachine.zul | 2 +- 11 files changed, 25 insertions(+), 21 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java index 9f8d7db24..d4ad76b6e 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java @@ -82,7 +82,7 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { private Listbox listZoomLevels; private static final String filterResources = _("by resources"); - private static final String filterCriterions = _("by criterions"); + private static final String filterCriteria = _("by criteria"); private String feedBackMessage; private Boolean filterbyResources; @@ -122,7 +122,7 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { } public ListModel getFilters() { - String[] filters = new String[] { filterResources, filterCriterions }; + String[] filters = new String[] { filterResources, filterCriteria }; return new SimpleListModel(filters); } @@ -132,7 +132,7 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { this.feedBackMessage = _("showing resources"); } else { this.filterbyResources = false; - this.feedBackMessage = _("showing criterions"); + this.feedBackMessage = _("showing criteria"); } refreshNameFilter = true; filterByNamePosition = 0; diff --git a/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul b/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul index 2d7b955ae..b059827cf 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul @@ -17,12 +17,16 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> + + +
- - - + + +
\ No newline at end of file diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul index 9aa535a8e..b31211410 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul @@ -40,7 +40,7 @@ resourcesLoadPanel = self; - Filter: + ${i18n:_('Filter')}: @@ -64,7 +64,7 @@ resourcesLoadPanel = self; - + @@ -87,7 +87,7 @@ resourcesLoadPanel = self; -
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java index 5c8f6e79b..0cfd8ca75 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java @@ -78,7 +78,7 @@ public class LimitingResourcesPanel extends HtmlMacroComponent { IResourceDAO resourcesDAO; private static final String filterResources = _("Filter by resources"); - private static final String filterCriterions = _("Filter by criterions"); + private static final String filterCriterions = _("Filter by criteria"); private boolean filterbyResources = true; private LimitingDependencyList dependencyList = new LimitingDependencyList(this); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java index 9c1e5e8ce..9a7bc98b7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java @@ -327,7 +327,7 @@ public class ResourceLoadModel implements IResourceLoadModel { } LoadTimeLine group = new LoadTimeLine(buildTimeLine(criterion, - "Others ordes", "global-generic", allocations, + "Other orders", "global-generic", allocations, getCurrentTimeLineRole(null)), buildTimeLinesGroupForOrder( criterion, byOrder)); @@ -408,7 +408,7 @@ public class ResourceLoadModel implements IResourceLoadModel { private String getCriterionSatisfactionDescription( Set satisfactions) { if (satisfactions.isEmpty()) { - return _(""); + return ""; } List criterions = new ArrayList(); for (CriterionSatisfaction satisfaction : satisfactions) { @@ -490,7 +490,7 @@ public class ResourceLoadModel implements IResourceLoadModel { } TimeLineRole role = getCurrentTimeLineRole(null); LoadTimeLine group = new LoadTimeLine(buildTimeLine(resource, - _("Others ordes"), resourceAllocations, "resource", role), + _("Other orders"), resourceAllocations, "resource", role), buildTimeLinesGroupForOrder(resource, byOrder)); return group; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java index 451a8b520..d200f7558 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java @@ -202,7 +202,7 @@ public class ResourceConverter { RESOURCE_CALENDAR_ENTITY_TYPE, e.getKey().toString()); } catch (MultipleInstancesException e) { throw new ValidationException(_( - "there exist multiple resource calendars with name {0}", + "there exist multiple resource calendars with name {0}", calendarCode)); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java index 96f3e8270..69119e44c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java @@ -369,7 +369,7 @@ public final class WorkReportConverter { updateLabel(labelDTO, labels); } catch (InstanceNotFoundException e) { throw new ValidationException( - _("work report have not this label type assigned")); + _("work report has not this label type assigned")); } } @@ -390,7 +390,7 @@ public final class WorkReportConverter { value.setValue(StringUtils.trim(valueDTO.value)); } catch (InstanceNotFoundException e) { throw new ValidationException( - _("work report have not any description value with this field name")); + _("work report has not any description value with this field name")); } } @@ -448,7 +448,7 @@ public final class WorkReportConverter { updateLabel(labelDTO, labels); } catch (InstanceNotFoundException e) { throw new ValidationException( - _("work report line have not this label type assigned")); + _("a work report line has not this label type assigned")); } } diff --git a/navalplanner-webapp/src/main/webapp/calendars/calendars.zul b/navalplanner-webapp/src/main/webapp/calendars/calendars.zul index dc54dc9c7..3ed1c154d 100644 --- a/navalplanner-webapp/src/main/webapp/calendars/calendars.zul +++ b/navalplanner-webapp/src/main/webapp/calendars/calendars.zul @@ -49,7 +49,7 @@ position="center"> - diff --git a/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul b/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul index 7613d4752..af4172735 100644 --- a/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul +++ b/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul @@ -29,7 +29,7 @@ -