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

[i18n] Fixing several issues in project strings

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2011-11-11 08:53:32 +01:00
parent 1f03516f5a
commit c8251e894c
21 changed files with 58 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libreplan-webapp/src/main/java/org/libreplan/web/materials/UnitTypeModel.java
View file

@ -20,8 +20,6 @@
*/
package org.libreplan.web.materials;
import static org.libreplan.web.I18nHelper._;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@ -96,8 +94,8 @@ public class UnitTypeModel extends IntegrationEntityModel implements
try {
return unitTypeDAO.find(unitType.getId());
} catch (InstanceNotFoundException e) {
LOG.error(_("It was not possible load entity. Not found. Id: " +
unitType.getId()), e);
LOG.error("It was not possible load entity. Not found. Id: "
+ unitType.getId(), e);
throw new RuntimeException(e);
}
}

2
libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java
View file

@ -341,7 +341,7 @@ public class ManageOrderElementAdvancesController extends
return _("Progress measurements");
}
return _("Progress measurements: ") + infoAdvanceAssignment;
return _("Progress measurements") + ": " + infoAdvanceAssignment;
}
public boolean isReadOnlyAdvanceMeasurements() {

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java
View file

@ -417,7 +417,7 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
vbox.setPack("center");
Hbox dateHbox = new Hbox();
dateHbox.appendChild(new Label(_("Select date:")));
dateHbox.appendChild(new Label(_("Select date")));
LocalDate initialDate = earnedValueChartFiller
.initialDateForIndicatorValues();

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationController.java
View file

@ -107,7 +107,7 @@ public class AdvanceConsolidationController extends GenericForwardComposer {
return _("Progress measurements");
}
return _("Progress measurements: ") + infoAdvanceAssignment;
return _("Progress measurements") + ": " + infoAdvanceAssignment;
}
public List<AdvanceConsolidationDTO> getAdvances() {

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java
View file

@ -495,7 +495,7 @@ public class OrderPlanningModel implements IOrderPlanningModel {
vbox.setPack("center");
Hbox dateHbox = new Hbox();
dateHbox.appendChild(new Label(_("Select date:")));
dateHbox.appendChild(new Label(_("Select date")));
LocalDate initialDateForIndicatorValues = earnedValueChartFiller.initialDateForIndicatorValues();
Datebox datebox = new Datebox(initialDateForIndicatorValues

8
libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionAdminController.java
View file

@ -211,9 +211,7 @@ public class CriterionAdminController extends BaseCRUDController<CriterionType>
try {
setupCriterionTreeController(editWindow);
} catch (Exception e) {
LOG.error(
_("Error setting up creationg form for Criterion Type with id}"),
e);
LOG.error("Error setting up creationg form for Criterion Type", e);
}
setResourceComboboxValue((Combobox) editWindow
.getFellowIfAny("resourceCombobox"));
@ -226,8 +224,8 @@ public class CriterionAdminController extends BaseCRUDController<CriterionType>
setupCriterionTreeController(editWindow);
} catch (Exception e) {
LOG.error(
_("Error setting up edition form for Criterion Type with id: {0}",
criterionType.getId()), e);
"Error setting up edition form for Criterion Type with id: "
+ criterionType.getId(), e);
}
setResourceComboboxValue((Combobox) editWindow
.getFellowIfAny("resourceCombobox"));

26
libreplan-webapp/src/main/webapp/common/configuration.zul
View file

@ -192,7 +192,7 @@
<panelchildren id="panelEntitySequence">
<vbox>
<hbox pack="center">
<label value="${i18n:_('Select entity:')}" />
<label value="${i18n:_('Select entity')}" />
<combobox id="entityCombo"
model="@{configurationController.entityNames}">
<comboitem
@ -201,10 +201,10 @@
value="@{entityName}" />
</combobox>
<label value="${i18n:_('Prefix:')}" />
<label value="${i18n:_('Prefix')}" />
<textbox id="prefixBox" />
<label
value="${i18n:_('Number of digits:')}" />
value="${i18n:_('Number of digits')}" />
<intbox id="numDigitBox" value="5" />
<button label="${i18n:_('add')}"
onClick="configurationController.addNewEntitySequence()" />
@ -253,35 +253,35 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Host:')}" />
<label value="${i18n:_('Host')}" />
<hbox>
<textbox id="ldapHost" value="@{configurationController.ldapConfiguration.ldapHost}" width="300px"/>
<label value="${i18n:__('Example: {0}', 'ldap://localhost')}" />
</hbox>
</row>
<row>
<label value="${i18n:_('Port:')}" />
<label value="${i18n:_('Port')}" />
<hbox>
<textbox id="ldapPort" value="@{configurationController.ldapConfiguration.ldapPort}" width="300px"/>
<label value="${i18n:__('Example: {0}', '389')}" />
</hbox>
</row>
<row>
<label value="${i18n:_('Base:')}" />
<label value="${i18n:_('Base')}" />
<hbox>
<textbox id="ldapBase" value="@{configurationController.ldapConfiguration.ldapBase}" width="300px"/>
<label value="${i18n:__('Example: {0}', 'dc=example,dc=org')}" />
</hbox>
</row>
<row>
<label value="${i18n:_('UserDn:')}" />
<label value="${i18n:_('UserDn')}" />
<hbox>
<textbox id="ldapUserDn" value="@{configurationController.ldapConfiguration.ldapUserDn}" width="300px"/>
<label value="${i18n:__('Example: {0}', 'cn=admin,dc=example,dc=org')}" />
</hbox>
</row>
<row>
<label value="${i18n:_('Password:')}" />
<label value="${i18n:_('Password')}" />
<textbox id="ldapPassword" value="@{configurationController.ldapConfiguration.ldapPassword}" type="password" width="300px"/>
</row>
</rows>
@ -302,7 +302,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('UserId:')}" />
<label value="${i18n:_('UserId')}" />
<hbox>
<textbox id="ldapUserId" value="@{configurationController.ldapConfiguration.ldapUserId}" width="300px"/>
<label value="${i18n:__('Example: {0}', 'uid')}" />
@ -333,21 +333,21 @@
<checkbox id="ldapSaveRolesDB" checked="@{configurationController.ldapConfiguration.ldapSaveRolesDB}" onCheck="configurationController.showLdapRoles()"/>
</row>
<row>
<label value="${i18n:_('Group path:')}" />
<label value="${i18n:_('Group path')}" />
<hbox>
<textbox id="ldapGroupPath" value="@{configurationController.ldapConfiguration.ldapGroupPath}" width="300px"/>
<label value="${i18n:__('Example: {0}', 'ou=groups (If it is empty, a node strategy is used.)')}" />
<label value="${i18n:__('Example: {0}', 'ou=groups')}" /><label value="${i18n:_('(If it is empty, a node strategy is used)')}" />
</hbox>
</row>
<row>
<label value="${i18n:_('Role property:')}" />
<label value="${i18n:_('Role property')}" />
<hbox>
<textbox id="ldapRoleProperty" value="@{configurationController.ldapConfiguration.ldapRoleProperty}" width="300px"/>
<label value="${i18n:__('Example: {0}', 'member')}" />
</hbox>
</row>
<row>
<label value="${i18n:_('Role search query:')}" />
<label value="${i18n:_('Role search query')}" />
<hbox>
<textbox id="ldapSearchQuery" value="@{configurationController.ldapConfiguration.ldapSearchQuery}" width="300px"/>
<label value="${i18n:__('Example: {0}', 'uid=[USER_ID],ou=people,dc=example,dc=org')}" />

6
libreplan-webapp/src/main/webapp/common/error.zul
View file

@ -37,15 +37,15 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Exception type:')}" />
<label value="${i18n:_('Exception type')}" />
<label value="${requestScope['javax.servlet.error.exception_type']}" />
</row>
<row>
<label value="${i18n:_('Status code:')}" />
<label value="${i18n:_('Status code')}" />
<label value="${requestScope['javax.servlet.error.status_code']}" />
</row>
<row>
<label value="${i18n:_('Stacktrace:')}" />
<label value="${i18n:_('Stacktrace')}" />
<textbox id="stacktrace" rows="20" width="600px" readonly="true" />
</row>
</rows>

6
libreplan-webapp/src/main/webapp/common/event_error.zul
View file

@ -32,15 +32,15 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Exception type:')}" />
<label value="${i18n:_('Exception type')}" />
<label value="${requestScope['javax.servlet.error.exception_type']}" />
</row>
<row>
<label value="${i18n:_('Status code:')}" />
<label value="${i18n:_('Status code')}" />
<label value="${requestScope['javax.servlet.error.status_code']}" />
</row>
<row>
<label value="${i18n:_('Stacktrace:')}" />
<label value="${i18n:_('Stacktrace')}" />
<textbox id="stacktrace" rows="20" width="600px" readonly="true" />
</row>
</rows>

6
libreplan-webapp/src/main/webapp/orders/components/_orderElementTree.zul
View file

@ -30,10 +30,10 @@
<hbox pack="center">
<templateFinderPopup id="templateFinderPopupAtTree" acceptButtonLabel="${i18n:_('Create Task')}" caption="${i18n:_('Choosing Template')}" />
<label value="${i18n:_('New task:')}" />
<label value="${i18n:_('New task')}" />
<textbox value="" id="newOrderElementName" width="150px"
onOK="treeController.addElement(self.parent);" disabled="true" />
<label value="${i18n:_('Hours:')}" />
<label value="${i18n:_('Hours')}" />
<intbox value="0" id="newOrderElementHours" width="40px"
onOK="treeController.addElement(self.parent);"
constraint="no negative" disabled="true" />
@ -45,7 +45,7 @@
</hbox>
<hbox width="100%" style="float:right" hflex="1" align="right" pack="right">
<label value="${i18n:_('Selected node:')}" />
<label value="${i18n:_('Selected node')}:" />
<button id="editOrderElementButton" sclass="icono" image="/common/img/ico_editar1.png"
tooltiptext="${i18n:_('Edit selected task')}"
onClick="treeController.editSelectedElement();" />

6
libreplan-webapp/src/main/webapp/planner/taskpanels/_allocationConfiguration.zul
View file

@ -28,17 +28,17 @@
<hbox>
<!-- Planned Task Start -->
<label style="font-weight: bold" value="${i18n:_('Planned start :')}" />
<label style="font-weight: bold" value="${i18n:_('Planned start')}:" />
<label id="lbTaskStart" />
<!-- Planned Task End -->
<label style="font-weight: bold" value="${i18n:_('Planned end :')}" />
<label style="font-weight: bold" value="${i18n:_('Planned end')}:" />
<label id="lbTaskEnd" />
</hbox>
<hbox>
<!-- Planned Workable Days -->
<label style="font-weight: bold" value="${i18n:_('Planned workable days :')}" />
<label style="font-weight: bold" value="${i18n:_('Planned workable days')}:" />
<intbox id="taskWorkableDays" width="90px" />
</hbox>

2
libreplan-webapp/src/main/webapp/qualityforms/_listQualityForm.zul
View file

@ -23,7 +23,7 @@
<div align="right">
<hbox align="end">
<!-- Filter by name -->
<label value="${i18n:_('Filter quality forms by :')}"/>
<label value="${i18n:_('Filter quality forms by')}:"/>
<label value="${i18n:_('name')}"/>
<textbox value="" id="txtFilter"/>
<button label="${i18n:_('Filter')}" onClick="controller.onApplyFilter(event)"/>

4
libreplan-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul
View file

@ -48,7 +48,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Reference date:')}" />
<label value="${i18n:_('Reference date')}" />
<datebox id="referenceDate" />
</row>
</rows>
@ -164,7 +164,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Output format:')}" />
<label value="${i18n:_('Output format')}" />
<combobox_output_format id="outputFormat" />
</row>
</rows>

2
libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerInAMonthReport.zul
View file

@ -71,7 +71,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Output format:')}" />
<label value="${i18n:_('Output format')}" />
<combobox_output_format id="outputFormat" />
</row>
</rows>

10
libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul
View file

@ -48,11 +48,11 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Start date:')}" />
<label value="${i18n:_('Start date')}" />
<datebox id="startingDate" />
</row>
<row>
<label value="${i18n:_('End date:')}" />
<label value="${i18n:_('End date')}" />
<datebox id="endingDate" />
</row>
</rows>
@ -108,9 +108,9 @@
</hbox>
<hbox>
<radiogroup>
<label value="${i18n:_('Apply filter to: ') }"/>
<label value="${i18n:_('Apply filter to')}:"/>
<radio id="filterByWorkReports" label="${i18n:_('Work reports')}" />
<radio id="filterByOrderElements" label="${i18n:_('Order elements')}" />
<radio id="filterByOrderElements" label="${i18n:_('Tasks')}" />
<radio id="filterByBoth" label="${i18n:_('Both')}" checked="true" />
</radiogroup>
</hbox>
@ -194,7 +194,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Output format:')}" />
<label value="${i18n:_('Output format')}" />
<combobox_output_format id="outputFormat" />
</row>
</rows>

6
libreplan-webapp/src/main/webapp/reports/orderCostsPerResource.zul
View file

@ -55,11 +55,11 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Work done from starting date:')}" />
<label value="${i18n:_('Work done from starting date')}" />
<datebox id="startingDate" width="200px" constraint = "@{controller.checkConstraintStartingDate}"/>
</row>
<row>
<label value="${i18n:_('Work done until ending date:')}" />
<label value="${i18n:_('Work done until ending date')}" />
<datebox id="endingDate" width="200px" constraint = "@{controller.checkConstraintEndingDate}"/>
</row>
</rows>
@ -201,7 +201,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Output format:')}" />
<label value="${i18n:_('Output format')}" />
<combobox_output_format id="outputFormat" />
</row>
</rows>

4
libreplan-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul
View file

@ -70,7 +70,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Show dependencies:')}" />
<label value="${i18n:_('Show dependencies')}" />
<checkbox id="cbShowDependencies" />
</row>
</rows>
@ -171,7 +171,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Output format:')}" />
<label value="${i18n:_('Output format')}" />
<combobox_output_format id="outputFormat" />
</row>
</rows>

4
libreplan-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
View file

@ -48,7 +48,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Reference date:')}" />
<label value="${i18n:_('Reference date')}" />
<datebox id="referenceDate" onCreate="self.value = new Date()"/>
</row>
</rows>
@ -163,7 +163,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Output format:')}" />
<label value="${i18n:_('Output format')}" />
<combobox_output_format id="outputFormat" />
</row>
</rows>

4
libreplan-webapp/src/main/webapp/users/_listUsers.zul
View file

@ -25,8 +25,8 @@
<columns sizable="true">
<newdatasortablecolumn label="${i18n:_('User login name')}" sort="auto(loginName)" />
<newdatasortablecolumn label="${i18n:_('Disabled')}" />
<newdatasortablecolumn label="${i18n:_('Is administrator')}" />
<newdatasortablecolumn label="${i18n:_('Is a libreplan user')}" />
<newdatasortablecolumn label="${i18n:_('Administrator')}" />
<newdatasortablecolumn label="${i18n:_('LibrePlan user')}" />
<newdatasortablecolumn label="${i18n:_('Actions')}" />
</columns>
<rows>

4
libreplan-webapp/src/main/webapp/workreports/workReport.zul
View file

@ -38,7 +38,7 @@
<vbox align="right">
<hbox id="hboxFilter" align="center">
<!-- Filter by type, start date and finish date -->
<label value="${i18n:_('Filter work report by :')}"/>
<label value="${i18n:_('Filter work report by')}:"/>
<label value="${i18n:_('Type')}"/>
<listbox id="listType" mold="select" rows="1"
model="@{controller.filterWorkReportTypes}" width="150px">
@ -92,7 +92,7 @@
<div align="left">
<hbox align="center">
<!-- Create new Work Report -->
<label value="${i18n:_('Select type :')}"/>
<label value="${i18n:_('Select type')}:"/>
<listbox id="listTypeToAssign" mold="select" rows="1"
model="@{controller.workReportTypes}" width="150px"
selectedItem="@{controller.firstType}">

8
libreplan-webapp/src/main/webapp/workreports/workReportQuery.zul
View file

@ -31,24 +31,24 @@
<vbox id="messagesContainer"></vbox>
<window id="listQueryWindow" title="${i18n:_('Work Report Lines List')}">
<panel title="${i18n:_('Filter work report by :')}" border="normal"
<panel title="${i18n:_('Filter work report by')}" border="normal"
style="overflow:auto">
<panelchildren>
<separator bar="false" spacing="5px" orient="horizontal"/>
<div align="center">
<hbox id="hboxFilter" align="end">
<!-- Filter work report lines -->
<label value="${i18n:_('Resource :')}"/>
<label value="${i18n:_('Resource')}"/>
<autocomplete id="filterResource" buttonVisible="true"
finder="ResourceFinder"/>
<label value="${i18n:_('task :')}"/>
<label value="${i18n:_('task')}"/>
<bandboxSearch id="bandboxFilterOrderElement" widthBandbox="285px" widthListbox="700px"
finder="OrderElementBandboxFinder" model="@{controller.orderElements}"/>
<label value="${i18n:_('from')}"/>
<datebox id="filterStartDateLine" constraint = "@{controller.checkConstraintStartDateLine}"/>
<label value="${i18n:_('to')}"/>
<datebox id="filterFinishDateLine" constraint = "@{controller.checkConstraintFinishDateLine}"/>
<label value="${i18n:_('hours type :')}"/>
<label value="${i18n:_('hours type')}"/>
<autocomplete id="filterHoursType" buttonVisible="true"
finder="TypeOfWorkHoursFinder" width="100px"/>
<button label="${i18n:_('Filter')}" style="margin-top: -4px"