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

i18n: Fixing strings

Browse source 
* Correct some wrong strings
* Remove unneeded strings marked to be translated

FEA: ItEr76S04BugFixing
This commit is contained in:
Lorenzo Tilve Álvaro 2012-07-03 12:07:35 +02:00
parent 2d5891c64c
commit 4daabb9d71
20 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/HourCost.java
View file

@ -93,7 +93,7 @@ public class HourCost extends IntegrationEntity {
this.priceCost = priceCost;
}
@NotNull(message = "init date not specified")
@NotNull(message = "start date not specified")
public LocalDate getInitDate() {
return initDate;
}

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

@ -1429,7 +1429,7 @@ public abstract class OrderElement extends IntegrationEntity implements
return getOrder() != null ? getOrder().isCodeAutogenerated() : false;
}
@AssertTrue(message = "a quality form can not be assigned twice to the same order element")
@AssertTrue(message = "a quality form cannot be assigned twice to the same order element")
public boolean checkConstraintUniqueQualityForm() {
Set<QualityForm> qualityForms = new HashSet<QualityForm>();
for (TaskQualityForm each : taskQualityForms) {

2
libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java
View file

@ -168,7 +168,7 @@ public class Task extends TaskElement implements ITaskPositionConstrained {
}
@SuppressWarnings("unused")
@AssertTrue(message = "order element associated to a task must be not null")
@AssertTrue(message = "order element associated to a task must be not empty")
private boolean theOrderElementMustBeNotNull() {
return getOrderElement() != null;
}

6
libreplan-business/src/main/java/org/libreplan/business/workreports/entities/WorkReportType.java
View file

@ -164,7 +164,7 @@ public class WorkReportType extends IntegrationEntity implements IHumanIdentifia
}
@SuppressWarnings("unused")
@AssertTrue(message = "timeshet template name is already being used")
@AssertTrue(message = "timesheet template name is already being used")
public boolean checkConstraintUniqueWorkReportTypeName() {
IWorkReportTypeDAO workReportTypeDAO = Registry.getWorkReportTypeDAO();
if (isNewObject()) {
@ -418,13 +418,13 @@ public class WorkReportType extends IntegrationEntity implements IHumanIdentifia
}
@SuppressWarnings("unused")
@AssertTrue(message = "In Heading the index labels and fields must be unique and consecutive.")
@AssertTrue(message = "In the heading part, index labels and fields must be unique and consecutive")
public boolean checkConstraintTheIndexHeadingFieldsAndLabelMustBeUniqueAndConsecutive() {
return validateTheIndexFieldsAndLabels(getHeadingFieldsAndLabels());
}
@SuppressWarnings("unused")
@AssertTrue(message = "In Lines the index labels and fields must be unique and consecutive.")
@AssertTrue(message = "In the lines part, index labels and fields must be unique and consecutive")
public boolean checkConstraintTheIndexLineFieldsAndLabelMustBeUniqueAndConsecutive() {
return validateTheIndexFieldsAndLabels(getLineFieldsAndLabels());
}

2
libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java
View file

@ -1519,7 +1519,7 @@ public abstract class BaseCalendarEditionController extends
if (code != null && !code.isDisabled()
&& code.getValue().isEmpty()) {
throw new WrongValueException(code,
_("It can not be empty"));
_("It cannot be empty"));
}
}
}

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

@ -183,7 +183,7 @@ public class ConfigurationModel implements IConfigurationModel {
}
if (!checkConstraintPrefixNotRepeated(sequences)) {
throw new ValidationException(_(
"The {0} sequence prefixes can not be repeated",
"The {0} sequence prefixes cannot be repeated",
entityName.getDescription()));
}
}

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

@ -385,7 +385,7 @@ public class AssignedTaskQualityFormsToOrderElementController extends
columns.appendChild(columnPercentage);
Column columnPassed = new Column();
columnPassed.setLabel(_("Passed"));
columnPassed.setLabel(_("Checked"));
columns.appendChild(columnPassed);
Column columnDate = new Column();

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

@ -339,7 +339,7 @@ public class AssignedTaskQualityFormsToOrderElementModel implements
private void showMessageDeleteSpread() throws ValidationException {
throw new ValidationException(
_("The operation does not perform because the task has progress reports that is spread associated with this quality form"));
_("Quality form cannot be removed as it is spreading progress"));
}
@Override

18
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, one progress must be checked as spread"));
throw new InvalidValueException(_("spread values are not valid, at least one value should be true"));
}
}
@ -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, one progress must be checked as spread"));
Level.ERROR, _("spread values are not valid, at least one value should be true"));
} catch (InvalidValueException e) {
messagesForUser.showMessage(Level.ERROR, e.getMessage());
} catch (InstanceNotFoundException e) {
@ -738,11 +738,11 @@ public class ManageOrderElementAdvancesController extends
&& (advance.getAdvanceType().isQualityForm())) {
removeButton.setDisabled(true);
removeButton
.setTooltiptext(_("Progress that are reported by quality forms can not be modified"));
.setTooltiptext(_("Progress that are reported by quality forms cannot be modified"));
} else if (advance instanceof IndirectAdvanceAssignment) {
removeButton.setDisabled(true);
removeButton
.setTooltiptext(_("Calculated progress can not be removed"));
.setTooltiptext(_("Calculated progress cannot be removed"));
} else if (manageOrderElementAdvancesModel
.hasConsolidatedAdvances(advance)) {
removeButton.setDisabled(true);
@ -751,11 +751,11 @@ public class ManageOrderElementAdvancesController extends
} else if (readOnly) {
removeButton.setDisabled(true);
removeButton
.setTooltiptext(_("Subcontractor values are read only because they were reported by the subcontractor company."));
.setTooltiptext(_("Subcontractor values are read only because they were reported by the subcontractor company"));
} else if (manageOrderElementAdvancesModel.hasReportedProgress(advance)) {
removeButton.setDisabled(true);
removeButton
.setTooltiptext(_("Progress assignment can not be removed because it has advance measurements already sent to customer."));
.setTooltiptext(_("Advance assignment cannot be removed as it has advance measures that have already been reported to the customer"));
}
hbox.appendChild(removeButton);
@ -1316,7 +1316,7 @@ public class ManageOrderElementAdvancesController extends
private String validateValueAdvanceMeasurement(
AdvanceMeasurement measurement) {
if (manageOrderElementAdvancesModel.greatThanMaxValue(measurement)) {
return _("Value is not valid, the current value must be less than max value");
return _("Value is not valid. It must be smaller than max value");
}
if (!manageOrderElementAdvancesModel.isPrecisionValid(measurement)) {
return _(
@ -1357,11 +1357,11 @@ public class ManageOrderElementAdvancesController extends
.getAdvanceAssignment());
if (consolidatedUntil != null) {
if (consolidatedUntil.compareTo(measurement.getDate()) >= 0) {
return _("Date is not valid, it must be greater than the last progress consolidation");
return _("Date is not valid, it must be later than the last progress consolidation");
}
}
if (manageOrderElementAdvancesModel.isAlreadyReportedProgressWith(value)) {
return _("Date is not valid, it must be greater than the last progress reported to the customer");
return _("Date is not valid, it must be later than the last progress reported to the customer");
}
}

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

@ -715,7 +715,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
messagesForUser
.showMessage(
Level.ERROR,
_("You can not remove the task \"{0}\" because it has work reported on it or any of its children",
_("You cannot remove the task \"{0}\" because it has work reported on it or any of its children",
element.getName()));
} else {
super.remove(element);

3
libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/FormBinder.java
View file

@ -337,8 +337,7 @@ public class FormBinder {
.equals(specifiedWorkableDays)) {
Clients.response(new AuWrongValue(
taskWorkableDays,
_("The original workable days value {0}, "
+ "is prevented because consolidated values cannot be modified",
_("The original workable days value {0} cannot be modified as it has consolidations",
specifiedWorkableDays)));
taskWorkableDays
.setValue(effectiveWorkableDays);

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

@ -158,7 +158,7 @@ public class QualityFormCRUDController extends BaseCRUDController<QualityForm> {
try {
if (Messagebox
.show(
_("Deleting this item, it will disable the report progress option. Are you sure?"),
_("Deleting this item will disable the report progress option. Are you sure?"),
_("Confirm"),
Messagebox.OK | Messagebox.CANCEL,
Messagebox.QUESTION) == Messagebox.OK) {

4
libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java
View file

@ -213,8 +213,8 @@ public class CriterionsModel extends IntegrationEntityModel implements ICriterio
private <T extends Resource> List<T> getResourcesSatisfying(
Class<T> resourceType, Criterion criterion) {
Validate.notNull(resourceType, _("ResourceType must be not-null"));
Validate.notNull(criterion, _("Criterion must be not-null"));
Validate.notNull(resourceType, _("Resource type cannot be empty"));
Validate.notNull(criterion, _("Criterion cannot be empty"));
List<T> result = new ArrayList<T>();
for (T r : resourceDAO.list(resourceType)) {
if (criterion.isSatisfiedBy(r)) {

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

@ -415,7 +415,7 @@ public class AssignedMachineCriterionsModel extends IntegrationEntityModel
throw new IllegalStateException(_("The {0} can not be assigned to this resource. Its interval overlaps with other criterion", criterion.getName()));
}
if (checkNotAllowSimultaneousCriterionsPerResource(satisfactionDTO)) {
throw new IllegalStateException(_("The {0} is not valid, criterionType overlaps with other criterionSatisfaction from the same criterionType", criterion.getName()));
throw new IllegalStateException(_("The {0} is not valid. Other value exists from the same criterion type", criterion.getName()));
}
}
}

6
libreplan-webapp/src/main/java/org/libreplan/web/scenarios/ScenarioModel.java
View file

@ -115,7 +115,7 @@ public class ScenarioModel implements IScenarioModel {
boolean isMainScenario = PredefinedScenarios.MASTER.getScenario().getId().equals(scenario.getId());
if (isMainScenario) {
throw new IllegalArgumentException(
_("You can not remove the default scenario \"{0}\"", PredefinedScenarios.MASTER.getName()));
_("You cannot remove the default scenario \"{0}\"", PredefinedScenarios.MASTER.getName()));
}
Scenario currentScenario = scenarioManager.getCurrent();
@ -123,13 +123,13 @@ public class ScenarioModel implements IScenarioModel {
scenario.getId());
if (isCurrentScenario) {
throw new IllegalArgumentException(
_("You can not remove the current scenario"));
_("You cannot remove the current scenario"));
}
List<Scenario> derivedScenarios = getDerivedScenarios(scenario);
if (!derivedScenarios.isEmpty()) {
throw new IllegalArgumentException(
_("You can not remove a scenario with derived scenarios"));
_("You cannot remove a scenario with derived scenarios"));
}
List<User> users = userDAO.findByLastConnectedScenario(scenario);

4
libreplan-webapp/src/main/java/org/libreplan/web/workreports/WorkReportCRUDController.java
View file

@ -797,11 +797,11 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
if (!getWorkReport().getWorkReportType().getHoursManagement()
.equals(HoursManagementEnum.NUMBER_OF_HOURS)) {
NewDataSortableColumn columnHourStart = new NewDataSortableColumn();
columnHourStart.setLabel(_("Hour start"));
columnHourStart.setLabel(_("Start hour"));
columnHourStart.setSclass("column-hour-start");
columns.appendChild(columnHourStart);
NewDataSortableColumn columnHourFinish = new NewDataSortableColumn();
columnHourFinish.setLabel(_("Hour finish"));
columnHourFinish.setLabel(_("Finish Hour"));
columnHourStart.setSclass("column-hour-finish");
columns.appendChild(columnHourFinish);
}

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

@ -168,7 +168,7 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
id="warningDefaultPasswdReports"
style="display:${templateCtrl.defaultPasswdReportsVisible}">[reports]</n:a>
<n:span class="footer-messages-area">
${i18n:_('default password were not changed')}.
${i18n:_('default password was not changed')}.
</n:span>
</div>
</n:div>

4
libreplan-webapp/src/main/webapp/orders/_listOrderElementHours.zul
View file

@ -226,14 +226,14 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Cost of hours')}:" />
<label value="${i18n:_('Hours cost')}:" />
<hbox>
<label value="@{assignedHoursToOrderElementController.costOfHours}" />
<label value="@{assignedHoursToOrderElementController.currencySymbol}" />
</hbox>
</row>
<row>
<label value="${i18n:_('Cost of expenses')}:" />
<label value="${i18n:_('Expenses cost')}:" />
<hbox>
<label value="@{assignedHoursToOrderElementController.costOfExpenses}" />
<label value="@{assignedHoursToOrderElementController.currencySymbol}" />

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

@ -92,7 +92,7 @@
<separator spacing="10px"/>
<hbox align="bottom" sclass="add-resources-or-criteria">
<label value="${i18n:_('New deliver date')}" />
<label value="${i18n:_('New delivery date')}" />
<datebox id="newDeliverDate" value="@{subController.endDate}" />
<button label="${i18n:_('Add')}" onClick="subController.addDeliverDate(newDeliverDate)"/>
</hbox>

2
libreplan-webapp/src/main/webapp/typeofworkhours/_editTypeOfWorkHours.zul
View file

@ -24,7 +24,7 @@
<caption id="caption" sclass="caption-title" />
<tabbox>
<tabs>
<tab label="${i18n:_('Type data')}"></tab>
<tab label="${i18n:_('Work hour type data')}"></tab>
</tabs>
<tabpanels>
<tabpanel width="100%">