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

ItEr58S05DocumentacionFormacionItEr57S05: Corrected some typos and added i18n to some strings directly on the source code.

Browse source
This commit is contained in:
Jacobo Aragunde Pérez 2010-05-17 13:55:37 +02:00 • committed by Javier Moran Rua
parent 5fa194ebb6
commit 1a83d1cf1a
11 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
View file

@ -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;

10
ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul
View file

@ -17,12 +17,16 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?xel-method prefix="i18n" name="_" class="org.zkoss.ganttz.i18n.I18nHelper"
signature="java.lang.String _(java.lang.String name)" ?>
<div>
<tree id="tasksTree" fixedLayout="true" sclass="taskTreeCols">
<treecols sizable="false" >
<treecol label="Name" sclass="tree-text" height="32px" />
<treecol label="Start" width="76px" />
<treecol label="End" width="76px" />
<treecol label="${i18n:_('Name')}" sclass="tree-text" height="32px" />
<treecol label="${i18n:_('Start')}" width="76px" />
<treecol label="${i18n:_('End')}" width="76px" />
</treecols>
</tree>
</div>

6
ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
View file

@ -40,7 +40,7 @@ resourcesLoadPanel = self;
<separator/>
<hbox id="additionalFilterInsertionPoint1" />
<separator/>
Filter:
${i18n:_('Filter')}:
<listbox id="listFilters" mold="select" rows="1" width="100px"
model="${resourcesLoadPanel.filters}"
onSelect="resourcesLoadPanel.setFilter(self.selectedItem.value);">
@ -64,7 +64,7 @@ resourcesLoadPanel = self;
<vbox pack="top" align="center">
<tree fixedLayout="true">
<treecols>
<treecol label="Name" height="29px"/>
<treecol label="${i18n:_('Name')}" height="29px"/>
</treecols>
</tree>
@ -87,7 +87,7 @@ resourcesLoadPanel = self;
</center>
</borderlayout>
</center>
<south height="200px" collapsible="true" title="Graphics"
<south height="200px" collapsible="true" title="${i18n:_('Graphics')}"
sclass="scheduling-graphics" id="graphics"
onOpen="resourcesLoadPanel.changeChartVisibility(event.open);">
<div id="insertionPointChart" />

2
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
View file

@ -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);

6
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
View file

@ -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<CriterionSatisfaction> satisfactions) {
if (satisfactions.isEmpty()) {
return _("");
return "";
}
List<Criterion> criterions = new ArrayList<Criterion>();
for (CriterionSatisfaction satisfaction : satisfactions) {
@ -490,7 +490,7 @@ public class ResourceLoadModel implements IResourceLoadModel {
}
TimeLineRole<BaseEntity> role = getCurrentTimeLineRole(null);
LoadTimeLine group = new LoadTimeLine(buildTimeLine(resource,
_("Others ordes"), resourceAllocations, "resource", role),
_("Other orders"), resourceAllocations, "resource", role),
buildTimeLinesGroupForOrder(resource, byOrder));
return group;
}

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/impl/ResourceConverter.java
View file

@ -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));
}
}

6
navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java
View file

@ -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"));
}
}

2
navalplanner-webapp/src/main/webapp/calendars/calendars.zul
View file

@ -49,7 +49,7 @@
position="center">
<vbox align = "center">
<hbox align = "center">
<i18n value="Do you want to delete &quot;{0}&quot;?"
<i18n value="Do you want to delete '{0}'?"
arg0="@{calendarController.baseCalendar.name}"/>
</hbox>
<hbox align = "center">

2
navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
View file

@ -29,7 +29,7 @@
</caption-->
<vbox apply="org.navalplanner.web.common.concurrentdetection.ConcurrentModificationController"
sclass="errorbox">
<label value="${i18n:_('Another user has modified the same data, so the operation can\'t be safely completed.')}" />
<label value="${i18n:_('Another user has modified the same data, so the operation can&#39;t be safely completed.')}" />
<label value="${i18n:_('Please try it again.')}" />
<hbox style="margin-left:auto; margin-right:auto">
<button id="continue" label="${i18n:_('Continue')}" />

2
navalplanner-webapp/src/main/webapp/common/layout/timeout.zul
View file

@ -23,7 +23,7 @@
<zk>
<window self="@{define(content)}" >
<vbox apply="org.navalplanner.web.error.PageForErrorOnEvent" sclass="warningbox">
<i18n id="message" value="${i18n:_('Your session has expired after inactivity period. Please log in again.')}" />
<i18n id="message" value="Your session has expired after inactivity period. Please log in again." />
<hbox style="margin-left:auto; margin-right:auto">
<button id="quitSession" label="${i18n:_('Back to log in')}"></button>
</hbox>

2
navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
View file

@ -61,7 +61,7 @@
constraint="no empty:${i18n:_('Description cannot be null or empty')}" />
</row>
<row>
<label value="${i18n:_('Limted resource')}" />
<label value="${i18n:_('Limited resource')}" />
<listbox mold="select" width="200px"
model="@{controller.limitingResourceOptionList}"
selectedItem="@{controller.limitingResource}"