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

i18n: Text string review

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Javier Moran Rua 2012-07-02 17:25:34 +02:00
parent d59577a568
commit ea5a77a7ff
32 changed files with 45 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-business/src/main/java/org/libreplan/business/common/entities/EntitySequence.java
View file

@ -199,7 +199,7 @@ public class EntitySequence extends BaseEntity {
this.entityName = entityName;
}
@AssertTrue(message = "Only one sequence for each entity can be active at the same time.")
@AssertTrue(message = "Only one sequence per entity can be active at the same time.")
public boolean checkConstraintOnlyOneSequenceForEachEntityIsActive() {
if (!isActive()) {
return true;

4
libreplan-business/src/main/java/org/libreplan/business/externalcompanies/entities/ExternalCompany.java
View file

@ -163,7 +163,7 @@ public class ExternalCompany extends BaseEntity implements IHumanIdentifiable,
}
}
@AssertTrue(message="Company ID already used. It has to be be unique")
@AssertTrue(message="Company ID already used. It must be unique")
public boolean checkConstraintUniqueNif() {
IExternalCompanyDAO dao = Registry.getExternalCompanyDAO();
@ -201,4 +201,4 @@ public class ExternalCompany extends BaseEntity implements IHumanIdentifiable,
return this.getName().compareToIgnoreCase(company.getName());
}
}
}

2
libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java
View file

@ -353,7 +353,7 @@ public class Order extends OrderLineGroup implements Comparable {
}
@SuppressWarnings("unused")
@AssertTrue(message = "the order must have a deadline")
@AssertTrue(message = "the project must have a deadline")
private boolean ifSchedulingModeIsBackwardsOrderMustHaveDeadline() {
return getSchedulingMode() != SchedulingMode.BACKWARDS
|| getDeadline() != null;

4
libreplan-business/src/main/java/org/libreplan/business/planner/entities/StretchesFunction.java
View file

@ -347,8 +347,8 @@ public class StretchesFunction extends AssignmentFunction {
.sortByLengthPercentage(result));
}
@AssertTrue(message = "Last stretch should have one hundred percent for "
+ "length and amount of work percentage")
@AssertTrue(message = "Last stretch should have one hundred percent "
+ "length and one hundred percent of work percentage")
public boolean checkOneHundredPercent() {
List<Stretch> stretches = getStretchesPlusConsolidated();
if (stretches.isEmpty()) {

2
libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/QualityForm.java
View file

@ -213,7 +213,7 @@ public class QualityForm extends BaseEntity implements IHumanIdentifiable{
}
@SuppressWarnings("unused")
@AssertTrue(message = "The quality item positions must be unique and consecutive.")
@AssertTrue(message = "The quality form item positions must be unique and consecutive.")
public boolean checkConstraintConsecutivesAndUniquesQualityFormItemPositions() {
List<QualityFormItem> result = getListToNull(qualityFormItems);
for (QualityFormItem qualityFormItem : qualityFormItems) {

2
libreplan-business/src/main/java/org/libreplan/business/qualityforms/entities/TaskQualityForm.java
View file

@ -111,7 +111,7 @@ public class TaskQualityForm extends BaseEntity {
}
@SuppressWarnings("unused")
@AssertTrue(message = "the items can not passes until the previous items are passed.")
@AssertTrue(message = "items cannot be checked until the previous items are checked before.")
public boolean checkConstraintConsecutivePassedItems() {
if (!isByItems()) {
for (TaskQualityFormItem item : taskQualityFormItems) {

1
libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionSatisfaction.java
View file

@ -212,6 +212,7 @@ public class CriterionSatisfaction extends IntegrationEntity {
this.criterion = criterion;
}
@NotNull(message="resource not specified")
public Resource getResource() {
return resource;

8
libreplan-business/src/main/java/org/libreplan/business/resources/entities/CriterionType.java
View file

@ -417,13 +417,13 @@ public class CriterionType extends IntegrationEntity implements
}
@AssertTrue(message="criterion codes must be unique inside a criterion " +
"type")
" type")
public boolean checkConstraintNonRepeatedCriterionCodes() {
return getFirstRepeatedCode(criterions) == null;
}
@AssertTrue(message="criterion names must be unique inside a criterion " +
"type")
" type")
public boolean checkConstraintNonRepeatedCriterionNames() {
Set<String> criterionNames = new HashSet<String>();
@ -468,7 +468,7 @@ public class CriterionType extends IntegrationEntity implements
}
@AssertTrue(message="criterion type does not allow resource hierarchy")
@AssertTrue(message="criterion type does not allow hierarchy")
public boolean checkConstraintAllowHierarchy() {
if (!allowHierarchy) {
@ -513,7 +513,7 @@ public class CriterionType extends IntegrationEntity implements
* {@link CriterionType} has been assigned to any {@link Resource}
* @throws ChangeTypeCriterionTypeException
*/
@AssertTrue(message = "Criteria of this criterion type has been assigned to some resource.")
@AssertTrue(message = "Criteria of this criterion type have been assigned to some resource.")
protected boolean checkConstraintChangeType() {
/* Check the constraint. */
ICriterionTypeDAO criterionTypeDAO = Registry.getCriterionTypeDAO();

2
libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReport.java
View file

@ -281,7 +281,7 @@ public class WorkReport extends IntegrationEntity implements
}
@SuppressWarnings("unused")
@AssertTrue(message = "description value:the timesheet have not assigned the description field")
@AssertTrue(message = "description value: the timesheet has some description field missing")
public boolean checkConstraintAssignedDescriptionValues() {
if (this.workReportType == null) {
return true;

4
libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarModel.java
View file

@ -486,7 +486,7 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
if (version.equals(getBaseCalendar().getFirstCalendarData())) {
return;
} else {
throw new ValidationException(_("This date can not be empty"));
throw new ValidationException(_("This date cannot be empty"));
}
}
@ -518,7 +518,7 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
if (version.equals(getBaseCalendar().getLastCalendarData())) {
return;
} else {
throw new ValidationException(_("This date can not be empty"));
throw new ValidationException(_("This date cannot be empty"));
}
}

2
libreplan-webapp/src/main/java/org/libreplan/web/common/TemplateController.java
View file

@ -117,7 +117,7 @@ public class TemplateController extends GenericForwardComposer {
LOG.error("error doing reassignation",
exceptionHappened);
windowMessages.showMessage(Level.ERROR, _(
"error doing reassignation: {0}",
"error doing reassignment: {0}",
exceptionHappened));
}
});

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

@ -263,7 +263,7 @@ public class AssignedTaskQualityFormsToOrderElementModel implements
if ((!taskQualityForm.isByItems())
&& (!taskQualityForm.isCorrectConsecutivePassed(item))) {
throw new ValidationException(new InvalidValue(
_("can not pass until the previous item is passed"),
_("cannot be checked until the previous item is checked before"),
TaskQualityForm.class,
"passed", item.getName(), taskQualityForm));

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

@ -126,7 +126,7 @@ public class ManageOrderElementAdvancesController extends
throw new InvalidValueException(_("values are not valid, the values must not be null"));
}
if (!validateReportGlobalAdvance()) {
throw new InvalidValueException(_("spread values are not valid, at least one value should be true"));
throw new InvalidValueException(_("spread values are not valid, one progress must be checked as spread"));
}
}
@ -139,7 +139,7 @@ public class ManageOrderElementAdvancesController extends
messagesForUser.showMessage(Level.ERROR, _("Cannot create another progress of the same type"));
} catch (DuplicateValueTrueReportGlobalAdvanceException e) {
messagesForUser.showMessage(
Level.ERROR, _("spread values are not valid, at least one value should be true"));
Level.ERROR, _("spread values are not valid, one progress must be checked as spread"));
} catch (InvalidValueException e) {
messagesForUser.showMessage(Level.ERROR, e.getMessage());
} catch (InstanceNotFoundException e) {
@ -755,7 +755,7 @@ public class ManageOrderElementAdvancesController extends
} else if (manageOrderElementAdvancesModel.hasReportedProgress(advance)) {
removeButton.setDisabled(true);
removeButton
.setTooltiptext(_("Advance assignment can not be removed because, it has advance measures that have already been reported to customer."));
.setTooltiptext(_("Progress assignment can not be removed because it has advance measurements already sent to customer."));
}
hbox.appendChild(removeButton);
@ -1218,7 +1218,7 @@ public class ManageOrderElementAdvancesController extends
&& (advance.getAdvanceType().isQualityForm())) {
removeButton.setDisabled(true);
removeButton
.setTooltiptext(_("Progress measurements that are reported by quality forms can not be removed"));
.setTooltiptext(_("Progress measurements that are reported by quality forms cannot be removed"));
} else if (advance.isFake()) {
removeButton.setDisabled(true);
removeButton

4
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
View file

@ -862,7 +862,7 @@ public class OrderCRUDController extends GenericForwardComposer {
.showMessage(
Level.ERROR,
_(
"You can not remove the project \"{0}\" because it has work reported on it or any of its tasks",
"You can not remove the project \"{0}\" because it has time tracked at some of its tasks",
order.getName()));
} else {
if (!StringUtils.isBlank(order.getExternalCode())) {
@ -1586,7 +1586,7 @@ public class OrderCRUDController extends GenericForwardComposer {
messagesForUser
.showMessage(
Level.ERROR,
_("It will only be possible to add a end date if all the exiting ones in the table have already been sent to customer.."));
_("It will only be possible to add an end date if all the exiting ones in the table have already been sent to the customer."));
return;
}
if (orderModel.alreadyExistsRepeatedEndDate(newEndDate.getValue())) {

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/reassign/ReassignCommand.java
View file

@ -146,7 +146,7 @@ public class ReassignCommand implements IReassignCommand {
@Override
public String call() {
return _("It couldn't complete all the reassignations");
return _("Assignments could not be completed");
}
})));
}

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/EditTaskController.java
View file

@ -361,7 +361,7 @@ public class EditTaskController extends GenericForwardComposer {
}
public void showNonPermitChangeResourceAllocationType() {
String message = _("The task has got progress consolidations. It must delete all consolidations to change the resource allocation type ");
String message = _("The task has got progress consolidations. To change resource allocation type all consolidations must be removed before");
try {
Messagebox.show(message, _("Information"), Messagebox.OK,
Messagebox.INFORMATION);

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java
View file

@ -434,7 +434,7 @@ public class TaskPropertiesController extends GenericForwardComposer {
*
*/
public enum ResourceAllocationTypeEnum {
NON_LIMITING_RESOURCES(_("Non limiting resource assignation")),
NON_LIMITING_RESOURCES(_("Non limiting resource assignment")),
LIMITING_RESOURCES(_("Limiting resource assignation")),
SUBCONTRACT(_("Subcontract"));

2
libreplan-webapp/src/main/java/org/libreplan/web/qualityforms/QualityFormCRUDController.java
View file

@ -256,7 +256,7 @@ public class QualityFormCRUDController extends BaseCRUDController<QualityForm> {
.checkConstraintUniqueQualityFormItemPercentage()) {
item.setPercentage(null);
throw new WrongValueException(comp,
_("percentage cannot be duplicated"));
_("percentage must be unique"));
}
}
};

2
libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineConfigurationController.java
View file

@ -219,7 +219,7 @@ public class MachineConfigurationController extends GenericForwardComposer {
if (startDateBox.getValue().compareTo((Date) value) > 0) {
throw new WrongValueException(
comp,
_("End date is not valid, the new end date after the start date"));
_("End date is not valid, the new end date must be after start date"));
}
}
}

4
libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsController.java
View file

@ -183,7 +183,7 @@ public class CriterionsController extends GenericForwardComposer {
}
if(assignedCriterionsModel.checkNotAllowSimultaneousCriterionsPerResource(satisfaction)){
throw new WrongValueException(comp,
_("This type of criteria cannot have multiple values in the same period"));
_("This criterion type cannot have multiple values in the same period"));
}
}
@ -236,7 +236,7 @@ public class CriterionsController extends GenericForwardComposer {
(CriterionSatisfactionDTO)((Row) comp.getParent()).getValue();
if(!criterionSatisfactionDTO.isGreaterStartDate((Date) value)){
throw new WrongValueException(comp,
_("End date is not valid, the new end date after the start date"));
_("End date is not valid, the new end date must be after start date"));
}else if(!criterionSatisfactionDTO.isPostEndDate((Date) value)){
throw new WrongValueException(comp,
_("End date is not valid, the new end date must be after the current end date"));

2
libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/CriterionsMachineController.java
View file

@ -184,7 +184,7 @@ public class CriterionsMachineController extends GenericForwardComposer {
if (assignedMachineCriterionsModel
.checkNotAllowSimultaneousCriterionsPerResource(satisfaction)) {
throw new WrongValueException(comp,
_("This type of criteria cannot have multiple values in the same period"));
_("This criterion type cannot have multiple values in the same period"));
}
}

4
libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioCRUDController.java
View file

@ -222,7 +222,7 @@ public class ScenarioCRUDController extends BaseCRUDController<Scenario> {
private void errorHappenedDoingReassignation(Exception exceptionHappened) {
LOG.error("error happened doing reassignation", exceptionHappened);
messagesForUser.showMessage(Level.ERROR, _(
"error doing reassignation: {0}", exceptionHappened));
"error doing reassignment: {0}", exceptionHappened));
}
public Set<Order> getOrders() {
@ -258,4 +258,4 @@ public class ScenarioCRUDController extends BaseCRUDController<Scenario> {
scenarioModel.remove(scenario);
}
}
}

2
libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeComponent.java
View file

@ -115,7 +115,7 @@ public abstract class TreeComponent extends HtmlMacroComponent {
protected final Column schedulingStateColumn = new Column(
_("Scheduling state"),
"scheduling_state",
_("Complete, Partially or Not Scheduled. (Drag and drop to move tasks)")) {
_("Fully, Partially or Unscheduled. (Drag and drop to move tasks)")) {
@Override
public <T extends ITreeNode<T>> void doCell(

2
libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportTypeCRUDController.java
View file

@ -665,7 +665,7 @@ public class WorkReportTypeCRUDController extends BaseCRUDController<WorkReportT
descriptionField.setFieldName(null);
throw new WrongValueException(
comp,
_("A description field of the same name already exists."));
_("A description field with the same name already exists."));
}
}
};

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

@ -116,7 +116,7 @@
tooltiptext="${i18n:_('Enable/Disable warning about new LibrePlan versions available')}"
checked="@{configurationController.checkNewVersionEnabled}" />
<checkbox
label="${i18n:_('Help project developers to collect information about which LibrePlan version you are using')}"
label="${i18n:_('Help the project developers to collect information about which LibrePlan version you are using')}"
tooltiptext="${i18n:_('Check this option to send this information to LibrePlan developers in order to generate usage statistics')}"
checked="@{configurationController.allowToGatherUsageStatsEnabled}" />
</vbox>

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

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

2
libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul
View file

@ -122,7 +122,7 @@
</groupbox>
<separator bar="false" spacing="5px" orient="horizontal"/>
<groupbox closable="false">
<caption label="${i18n:_('Expenses lines')}" />
<caption label="${i18n:_('Expense lines')}" />
<hbox>
<label value="${i18n:_('Task')}"/>
<bandboxSearch id="bandboxTasks"

2
libreplan-webapp/src/main/webapp/planner/stretches_function.zul
View file

@ -47,7 +47,7 @@
<listhead>
<listheader label="${i18n:_('Date')}" tooltiptext="${i18n:_('Measurement date')}" />
<listheader label="${i18n:_('Length')}" tooltiptext="${i18n:_('Length percentage')}" />
<listheader label="${i18n:_('Amount work')}" tooltiptext="${i18n:_('Amount work percentage')}" />
<listheader label="${i18n:_('Work amount')}" tooltiptext="${i18n:_('Amount work percentage')}" />
<listheader label="${i18n:_('Op.')}" tooltiptext="${i18n:_('Operations')}" width="50px"/>
</listhead>
</listbox>

2
libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul
View file

@ -63,7 +63,7 @@
readonly="@{subController.sent}" format="@{subController.moneyFormat}"/>
</row>
<row>
<label value="${i18n:_('Subcontracted code')}" />
<label value="${i18n:_('Subcontracting code')}" />
<textbox value="@{subController.subcontractedTaskData.subcontractedCode}"
readonly="@{subController.sent}"/>
</row>

2
libreplan-webapp/src/main/webapp/resources/worker/virtualWorkers.zul
View file

@ -19,7 +19,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<?page title="${i18n:_('LibrePlan: Virtual Workers Groups')}"?>
<?page title="${i18n:_('LibrePlan: Virtual Worker Groups')}"?>
<?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
<?page id="Create"?>
<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>

2
libreplan-webapp/src/main/webapp/subcontract/subcontractedTasks.zul
View file

@ -49,7 +49,7 @@
<column label="${i18n:_('Company')}" tooltiptext="${i18n:_('External company')}" sort="auto(externalCompany)" width="100px"/>
<column label="${i18n:_('Project code')}" tooltiptext="${i18n:_('Project code')}" />
<column label="${i18n:_('Project name')}" tooltiptext="${i18n:_('Project name')}" />
<column label="${i18n:_('Subcontracted code')}" tooltiptext="${i18n:_('Subcontracted code')}" width="130px"/>
<column label="${i18n:_('Subcontracting code')}" tooltiptext="${i18n:_('Subcontracting code')}" width="130px"/>
<column label="${i18n:_('Task name')}" tooltiptext="${i18n:_('Task name')}" />
<column label="${i18n:_('Description')}" tooltiptext="${i18n:_('Work description')}" />
<column label="${i18n:_('Budget')}" tooltiptext="${i18n:_('Budget')}" />

4
libreplan-webapp/src/main/webapp/templates/_historicalStatistics.zul
View file

@ -44,7 +44,7 @@
<label value="@{historicalStatistics.finishApplications}"/>
</row>
<row>
<label value="${i18n:_('Average of estimated hours')}"/>
<label value="${i18n:_('Estimated hours average')}"/>
<label value="@{historicalStatistics.averageEstimatedHours}"/>
</row>
<row>
@ -73,4 +73,4 @@
</panel>
</vbox>
</vbox>
</zk>
</zk>