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

i18n: Review and fix several strings to be translated

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-07-02 19:37:31 +02:00
parent f766ba52fd
commit d59577a568
53 changed files with 79 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-business/src/main/java/org/libreplan/business/calendars/entities/BaseCalendar.java
View file

@ -1091,7 +1091,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar,
}
@SuppressWarnings("unused")
@AssertTrue(message = "the work week: the dates should be corrects and sorted and could not overlap ")
@AssertTrue(message = "dates must be sorted and cannot overlap")
public boolean checkConstraintDateCouldNotOverlap() {
if (calendarDataVersions == null || calendarDataVersions.isEmpty()) {

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

@ -53,7 +53,7 @@ public class ConfigurationRolesLDAP {
return roleLdap;
}
@NotEmpty(message = "role libreplan not specified")
@NotEmpty(message = "LibrePlan role not specified")
public String getRoleLibreplan() {
return roleLibreplan;
}

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

@ -85,9 +85,7 @@ public class EntitySequence extends BaseEntity {
public void setPrefix(String prefix) throws IllegalArgumentException {
if (isAlreadyInUse()) {
throw new IllegalArgumentException(
I18nHelper
._("You can not modifiy this entity sequence, it is already in use"));
throw new IllegalArgumentException("You cannot modifiy this entity sequence, it is already in use");
}
this.prefix = prefix;
@ -126,9 +124,7 @@ public class EntitySequence extends BaseEntity {
public void setNumberOfDigits(Integer numberOfDigits)
throws IllegalArgumentException {
if (isAlreadyInUse()) {
throw new IllegalArgumentException(
I18nHelper
._("You can not modifiy this entity sequence, it is already in use"));
throw new IllegalArgumentException("You cannot modifiy this entity sequence, it is already in use");
}
if ((numberOfDigits != null)

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

@ -319,7 +319,7 @@ public class CostCategory extends IntegrationEntity implements IHumanIdentifiabl
return name;
}
@AssertTrue(message = "the cost category name has to be unique. It is already used")
@AssertTrue(message = "the cost category name has to be unique and it is already in use")
public boolean checkConstraintUniqueName() {
if (StringUtils.isBlank(name)) {
return true;

2
libreplan-business/src/main/java/org/libreplan/business/labels/entities/LabelType.java
View file

@ -124,7 +124,7 @@ public class LabelType extends IntegrationEntity implements Comparable,
return true;
}
@AssertTrue(message = "label type name is already being used")
@AssertTrue(message = "label type name is already in use")
public boolean checkConstraintUniqueLabelTypeName() {
if (!firstLevelValidationsPassed()) {
return true;

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

@ -536,7 +536,7 @@ public abstract class CriterionRequirementHandler<T, S, R> {
newRequirement);
} else {
throw new IllegalStateException(
_("The criterion already exist into other task"));
_("The criterion already exists into another task"));
}
}

7
libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroup.java
View file

@ -176,8 +176,7 @@ public class HoursGroup extends IntegrationEntity implements Cloneable,
public void setWorkingHours(Integer workingHours)
throws IllegalArgumentException {
if ((workingHours != null) && (workingHours < 0)) {
throw new IllegalArgumentException(
_("Working hours shouldn't be negative"));
throw new IllegalArgumentException("Working hours should not be negative");
}
if (workingHours == null) {
workingHours = 0;
@ -254,11 +253,11 @@ public class HoursGroup extends IntegrationEntity implements Cloneable,
public void addCriterionRequirement(CriterionRequirement requirement) {
if (!isValidResourceType(requirement)) {
throw new IllegalStateException(
_("The criterion can not be assigned to this hoursGroup because its resource type is diferent"));
"The criterion can not be assigned to this hoursGroup because its resource type is diferent");
}
if (existSameCriterionRequirement(requirement)) {
throw new IllegalStateException(
_("The criterion can not be assigned to this hoursGroup because it already exist into the hoursGroup"));
"The criterion can not be assigned to this hoursGroup because it already exist into the hoursGroup");
}
requirement.setHoursGroup(this);

8
libreplan-business/src/main/java/org/libreplan/business/orders/entities/HoursGroupHandler.java
View file

@ -21,8 +21,6 @@
package org.libreplan.business.orders.entities;
import static org.libreplan.business.i18n.I18nHelper._;
import java.math.BigDecimal;
import java.util.HashSet;
import java.util.Set;
@ -257,7 +255,7 @@ public abstract class HoursGroupHandler<T> implements IHoursGroupHandler<T> {
if (workHours < 0) {
throw new IllegalArgumentException(
_("workHours should be greater or equals to 0"));
"workHours should be greater or equals to 0");
}
if (hoursGroupsIsEmpty(orderLine)) {
@ -269,8 +267,8 @@ public abstract class HoursGroupHandler<T> implements IHoursGroupHandler<T> {
if (!isTotalHoursValid(workHours, getHoursGroup(orderLine))) {
throw new IllegalArgumentException(
_("\"workHours\" value is not valid, taking into "
+ "account the current list of HoursGroup"));
"\"workHours\" value is not valid, taking into "
+ "account the current list of HoursGroup");
}
updateHoursGroups(orderLine, workHours);

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

@ -346,7 +346,7 @@ public class Order extends OrderLineGroup implements Comparable {
}
@SuppressWarnings("unused")
@AssertTrue(message = "the order must have a init date")
@AssertTrue(message = "the order must have a start date")
private boolean ifSchedulingModeIsForwardOrderMustHaveStartDate() {
return getSchedulingMode() != SchedulingMode.FORWARD
|| getInitDate() != null;

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

@ -659,8 +659,8 @@ public abstract class OrderElement extends IntegrationEntity implements
if (!checkAncestorsNoOtherLabelRepeated(label)) {
throw new IllegalArgumentException(
_("Some ancestor has the same label assigned, "
+ "so this element is already inheriting this label"));
"An ancestor has the same label assigned, "
+ "so this element is already inheriting this label");
}
removeLabelOnChildren(label);

9
libreplan-business/src/main/java/org/libreplan/business/orders/entities/SchedulingState.java
View file

@ -211,8 +211,7 @@ public class SchedulingState {
public void schedule() {
if (!canBeScheduled()) {
throw new IllegalStateException(
_("it's already somewhat scheduled"));
throw new IllegalStateException("It is already somewhat scheduled");
}
setType(Type.SCHEDULING_POINT);
for (SchedulingState schedulingState : getDescendants()) {
@ -226,7 +225,7 @@ public class SchedulingState {
public void unschedule() {
if (!canBeUnscheduled()) {
throw new IllegalStateException(_("it can't be unscheduled"));
throw new IllegalStateException("It cannot be unscheduled");
}
setType(Type.NO_SCHEDULED);
markDescendantsAsNoScheduled();
@ -364,7 +363,7 @@ public class SchedulingState {
public String getStateName() {
if (isCompletelyScheduled()) {
return _("Completely scheduled");
return _("Fully scheduled");
} else if (isPartiallyScheduled()) {
return _("Partially scheduled");
} else {
@ -374,7 +373,7 @@ public class SchedulingState {
public String getStateAbbreviation() {
if (isCompletelyScheduled()) {
return _("C");
return _("F");
} else if (isPartiallyScheduled()) {
return _("P");
} else {

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

@ -312,7 +312,7 @@ public class StretchesFunction extends AssignmentFunction {
return getStretchesPlusConsolidated().size() > 2;
}
@AssertTrue(message = "Some stretch has lower or equal values than the "
@AssertTrue(message = "A stretch has lower or equal values than the "
+ "previous stretch")
public boolean checkStretchesOrder() {
List<Stretch> stretchesPlusConsolidated = getStretchesPlusConsolidated();

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

@ -51,4 +51,4 @@ public enum SubcontractState {
return sendable;
}
}
}

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

@ -107,7 +107,7 @@ public class TaskGroup extends TaskElement {
}
@SuppressWarnings("unused")
@AssertTrue(message = "order element associated to a task group must be not null")
@AssertTrue(message = "order element associated to a task group have to be defined")
private boolean theOrderElementMustBeNotNull() {
return getOrderElement() != null;
}

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

@ -119,7 +119,7 @@ public class TaskMilestone extends TaskElement implements ITaskPositionConstrain
}
@SuppressWarnings("unused")
@AssertTrue(message = "order element associated to a milestone must be null")
@AssertTrue(message = "a milestone cannot have a task associated")
private boolean theOrderElementMustBeNull() {
return getOrderElement() == null;
}

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

@ -93,7 +93,7 @@ public abstract class ResourcesPerDayModification extends
@Override
public String getNoValidPeriodsMessage() {
String firstLine = _("There are no days available due to not satisfying the criteria.");
String secondLine = _("Another possibility is that the resources don't have days available due to their calendars.");
String secondLine = _("Another possibility is that the resources do not have days available due to their calendars.");
return firstLine + "\n" + secondLine;
}

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

@ -50,7 +50,7 @@ public class QueuePosition {
}
public void setHour(int hour) {
Validate.isTrue(hour >= 0 && hour <= 23, _("Hour should be a value between 0 and 23"));
Validate.isTrue(hour >= 0 && hour <= 23, _("Hour should be between 0 and 23"));
this.hour = hour;
}

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

@ -263,7 +263,7 @@ public class QualityForm extends BaseEntity implements IHumanIdentifiable{
}
@SuppressWarnings("unused")
@AssertTrue(message = "The quality form item porcentage must be unique if the quality form type is by percentage.")
@AssertTrue(message = "percentages in quality form items must be unique")
public boolean checkConstraintDuplicatesQualityFormItemPercentage() {
if ((qualityFormType != null)
&& (qualityFormType.equals(QualityFormType.BY_PERCENTAGE))

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

@ -190,7 +190,7 @@ public class CriterionSatisfaction extends IntegrationEntity {
return result;
}
@NotNull(message="criterion satisfaction's start date not specified")
@NotNull(message="start date not specified")
public LocalDate getStartDate() {
return startDate;
}
@ -203,7 +203,7 @@ public class CriterionSatisfaction extends IntegrationEntity {
return Interval.range(startDate, finishDate);
}
@NotNull(message="criterion satisfaction's criterion not specified")
@NotNull(message="criterion not specified")
public Criterion getCriterion() {
return criterion;
}
@ -212,7 +212,7 @@ public class CriterionSatisfaction extends IntegrationEntity {
this.criterion = criterion;
}
@NotNull(message="criterion satisfaction's resource not specified")
@NotNull(message="resource not specified")
public Resource getResource() {
return resource;
}

2
libreplan-business/src/main/java/org/libreplan/business/resources/entities/Resource.java
View file

@ -1146,7 +1146,7 @@ public abstract class Resource extends IntegrationEntity implements
return getFirstRepeatedCode(criterionSatisfactions) == null;
}
@AssertTrue(message="resources cost category assignment codes must be " +
@AssertTrue(message="resource cost category assignments codes must be " +
"unique inside a resource")
public boolean checkConstraintNonRepeatedResourcesCostCategoryAssignmentCodes() {
return getFirstRepeatedCode(resourcesCostCategoryAssignments) == null;

2
libreplan-business/src/main/java/org/libreplan/business/resources/entities/Worker.java
View file

@ -268,7 +268,7 @@ public class Worker extends Resource {
}
}
@AssertTrue(message = "Bound user has proper role")
@AssertTrue(message = "Bound user does not have the proper role")
public boolean checkConstraintBoundUserHaveProperRole() {
if (user == null) {
return true;

2
libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java
View file

@ -454,7 +454,7 @@ public abstract class OrderElementTemplate extends BaseEntity implements
return getParent() == null;
}
@AssertTrue(message = "template name is already being used")
@AssertTrue(message = "template name is already in use")
public boolean checkConstraintUniqueRootTemplateName() {
if (getParent() != null) {
return true;

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

@ -30,7 +30,7 @@ public enum HoursManagementEnum {
NUMBER_OF_HOURS(_("Number of assigned hours")),
HOURS_CALCULATED_BY_CLOCK(_("Number of hours calculated by clock")),
NUMBER_OF_HOURS_AND_CLOCK(_("Number of assigned hours and the time"));
NUMBER_OF_HOURS_AND_CLOCK(_("Number of assigned hours and time"));
private String description;

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

@ -220,7 +220,7 @@ public class WorkReport extends IntegrationEntity implements
}
@SuppressWarnings("unused")
@AssertTrue(message = "date:the date must be not null if is shared by lines")
@AssertTrue(message = "date cannot be empty if it is shared by lines")
public boolean checkConstraintDateMustBeNotNullIfIsSharedByLines() {
if (!firstLevelValidationsPassed()) {
return true;
@ -233,7 +233,7 @@ public class WorkReport extends IntegrationEntity implements
}
@SuppressWarnings("unused")
@AssertTrue(message = "resource:the resource must be not null if is shared by lines")
@AssertTrue(message = "resource cannot be empty if it is shared by lines")
public boolean checkConstraintResourceMustBeNotNullIfIsSharedByLines() {
if (!firstLevelValidationsPassed()) {
return true;
@ -246,7 +246,7 @@ public class WorkReport extends IntegrationEntity implements
}
@SuppressWarnings("unused")
@AssertTrue(message = "orderElement:the order element must be not null if is shared by lines")
@AssertTrue(message = "task cannot be empty if it is shared by lines")
public boolean checkConstraintOrderElementMustBeNotNullIfIsSharedByLines() {
if (!firstLevelValidationsPassed()) {
return true;

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

@ -258,7 +258,7 @@ public class WorkReportLine extends IntegrationEntity implements Comparable,
return true;
}
@AssertTrue(message = "clockFinish:the clockStart must be not null if number of hours is calcultate by clock")
@AssertTrue(message = "clock finish cannot be empty if number of hours is calcultate by clock")
public boolean checkConstraintClockFinishMustBeNotNullIfIsCalculatedByClock() {
if (!firstLevelValidationsPassed()) {
return true;

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

@ -426,7 +426,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
.showMessage(
Level.ERROR,
_("Default calendar cannot be removed. "
+ "Please, change the default calendar in the Configuration window before."));
+ "Please, change the default calendar in the Main Settings window before."));
return;
}
removeCalendar(calendar);

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

@ -603,7 +603,7 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
"{0} already exists", entity.getName()),
BaseCalendar.class, "name", entity.getName(), entity) };
throw new ValidationException(invalidValues2,
_("Could not save new calendar"));
_("Could not save the new calendar"));
}
}

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

@ -494,7 +494,7 @@ public class ConfigurationController extends GenericForwardComposer {
appendOperations(row, entitySequence);
if (entitySequence.isAlreadyInUse()) {
row.setTooltiptext(_("The code sequence is already in use and it can not be updated."));
row.setTooltiptext(_("Code sequence is already in use and cannot be updated"));
}
if ((row.getPreviousSibling() != null)

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

@ -231,7 +231,7 @@ public class ConfigurationModel implements IConfigurationModel {
entitySequenceDAO.remove(entitySequence);
} catch (InstanceNotFoundException e) {
throw new ValidationException(
_("Some sequences to be removed does not exist"));
_("Some sequences to be removed do not exist"));
} catch (IllegalArgumentException e) {
throw new ValidationException(e.getMessage());
}

4
libreplan-webapp/src/main/java/org/libreplan/web/montecarlo/MonteCarloController.java
View file

@ -160,8 +160,8 @@ public class MonteCarloController extends GenericForwardComposer {
}
if (iterations < 0 || iterations > MAX_NUMBER_ITERATIONS) {
throw new WrongValueException(ibIterations,
_("Number of iterations should be between 1 and "
+ MAX_NUMBER_ITERATIONS));
_("Number of iterations should be between 1 and {0}",
MAX_NUMBER_ITERATIONS));
}
return iterations;
}

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

@ -747,7 +747,7 @@ public class ManageOrderElementAdvancesController extends
.hasConsolidatedAdvances(advance)) {
removeButton.setDisabled(true);
removeButton
.setTooltiptext(_("Consolidated progress can not be removed"));
.setTooltiptext(_("Consolidated progress cannot be removed"));
} else if (readOnly) {
removeButton.setDisabled(true);
removeButton
@ -1222,7 +1222,7 @@ public class ManageOrderElementAdvancesController extends
} else if (advance.isFake()) {
removeButton.setDisabled(true);
removeButton
.setTooltiptext(_("Calculated progress measurement can not be removed"));
.setTooltiptext(_("Calculated progress measurements cannot be removed"));
} else if (manageOrderElementAdvancesModel
.hasConsolidatedAdvances(measure)) {
removeButton.setDisabled(true);
@ -1302,9 +1302,9 @@ public class ManageOrderElementAdvancesController extends
}
private void showMessagesConsolidation(LocalDate date) {
String message = _("This progress measurement can not be in "
+ date
+ ", because it is consolidated. it is necessary to select other date.");
String message = _(
"Progress measurement cannot be canged to {0}, because it is consolidated",
date);
showErrorMessage(message);
}

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

@ -456,7 +456,7 @@ public abstract class AssignedMaterialsController<T, A> extends GenericForwardCo
public void showSplitMaterialAssignmentDlg(A materialAssignment) {
MessageboxDlg dialogSplitAssignment;
final String message = _("Create new material assignment out of material assignment {0}. Are you sure?",
final String message = _("Do you want to split the material assignment {0}?",
getMaterial(materialAssignment).getCode());
Map args = new HashMap();

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

@ -1073,7 +1073,7 @@ public class TaskElementAdapter {
.append("<br/>");
result.append(
_(
"cost because of worked hours: {0}, cost because of expenses: {1}",
"hours cost: {0}, expenses cost: {1}",
costHours, costExpenses));
}

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/ResourceAllocationController.java
View file

@ -622,7 +622,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
private void renderAggregatingRow(Row row) {
ResourceAllocationController controller = ResourceAllocationController.this;
append(row, new Label());
append(row, new Label(_("Sum of all rows")));
append(row, new Label(_("Total")));
append(row, allOriginalEffort);
append(row, allTotalEffort);
append(row, allConsolidatedEffort);

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

@ -174,8 +174,7 @@ public class StretchesFunctionModel implements IStretchesFunctionModel {
}
if (!stretchesFunction.checkOneHundredPercent()) {
throw new ValidationException(
_("Last stretch should have one hundred percent for "
+ "length and amount of work percentage"));
_("Last stretch should have 100% for length and amount of work"));
}
if (stretchesFunction.isInterpolated()) {
if (!stretchesFunction.checkHasAtLeastTwoStretches()) {

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

@ -359,7 +359,7 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
Date today = LocalDate.fromDateFields(new Date())
.toDateTimeAtStartOfDay().toDate();
if (value != null && (value.compareTo(today) > 0)) {
throw new WrongValueException(datebox, _("date in future"));
throw new WrongValueException(datebox, _("date in the future"));
}
}

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

@ -763,7 +763,7 @@ public class OrderPlanningModel implements IOrderPlanningModel {
Date today = LocalDate.fromDateFields(new Date())
.toDateTimeAtStartOfDay().toDate();
if (value != null && (value.compareTo(today) > 0)) {
throw new WrongValueException(datebox, _("date in future"));
throw new WrongValueException(datebox, _("date in the future"));
}
}

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

@ -211,7 +211,7 @@ public class CriterionAdminController extends BaseCRUDController<CriterionType>
try {
setupCriterionTreeController(editWindow);
} catch (Exception e) {
LOG.error("Error setting up creationg form for Criterion Type", e);
LOG.error("Error setting up creating form for Criterion Type", e);
}
setResourceComboboxValue((Combobox) editWindow
.getFellowIfAny("resourceCombobox"));
@ -254,7 +254,7 @@ public class CriterionAdminController extends BaseCRUDController<CriterionType>
messagesForUser
.showMessage(
Level.WARNING,
_("This criterion type cannot be deleted because it has assignments to projects or resources"));
_("This criterion type cannot be deleted because it is assigned to projects or resources"));
return false;
}
return true;

2
libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionTreeModel.java
View file

@ -327,7 +327,7 @@ public class CriterionTreeModel implements ICriterionTreeModel {
for(CriterionDTO criterion : criterions){
if(criterion.getName().equals(name)){
InvalidValue[] invalidValues = {
new InvalidValue(_("Already exists other " +
new InvalidValue(_("Already exists another " +
"criterion with the same name"),
Criterion.class, "name",
criterion.getName(), criterion)};

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

@ -133,7 +133,7 @@ public class WorkRelationshipsController extends GenericForwardComposer {
}
i++;
}
throw new RuntimeException(_("Couldn't find criterion {0}", criterion));
throw new RuntimeException("Could not find the criterion " + criterion);
}
public void saveCriterionSatisfaction() {

2
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/ReportAdvancesController.java
View file

@ -163,7 +163,7 @@ public class ReportAdvancesController extends GenericForwardComposer {
private Button getExportButton(
final Order order) {
Button exportButton = new Button(_("XML"));
Button exportButton = new Button("XML");
exportButton.addEventListener(Events.ON_CLICK, new EventListener() {
IServletRequestHandler requestHandler = new IServletRequestHandler() {

2
libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java
View file

@ -181,7 +181,7 @@ public class SubcontractedTasksController extends GenericForwardComposer {
private Button getExportButton(
final SubcontractedTaskData subcontractedTaskData) {
Button exportButton = new Button(_("XML"));
Button exportButton = new Button("XML");
exportButton.addEventListener(Events.ON_CLICK, new EventListener() {
IServletRequestHandler requestHandler = new IServletRequestHandler() {

4
libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java
View file

@ -374,7 +374,7 @@ public class OrderTemplatesController extends GenericForwardComposer implements
*/
public void confirmDelete(OrderElementTemplate template) {
try {
if (Messagebox.show(_("Delete project template. Are you sure?"),
if (Messagebox.show(_("Delete template. Are you sure?"),
_("Confirm"),
Messagebox.OK | Messagebox.CANCEL, Messagebox.QUESTION) == Messagebox.OK) {
if (this.model.hasNotApplications(template)) {
@ -388,7 +388,7 @@ public class OrderTemplatesController extends GenericForwardComposer implements
messagesForUser
.showMessage(
Level.ERROR,
_("This template can not be removed because it has applications."));
_("Template cannot be removed because it has applications"));
}
}
} catch (InterruptedException e) {

2
libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesModel.java
View file

@ -314,7 +314,7 @@ public class OrderTemplatesModel implements IOrderTemplatesModel {
getTemplate().setName(name);
if (!getTemplate().checkConstraintUniqueRootTemplateName()) {
throw new IllegalArgumentException(
_("Already exists other template with the same name"));
_("Already exists another template with the same name"));
}
}

4
libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeComponent.java
View file

@ -97,7 +97,7 @@ public class TemplatesTreeComponent extends TreeComponent {
});
result.add(new TemplatesTreeColumn(
_("Must start after (days since beginning project)"),
_("Must start after (days since project start)"),
"estimated_init") {
@Override
@ -108,7 +108,7 @@ public class TemplatesTreeComponent extends TreeComponent {
});
result.add(new TemplatesTreeColumn(
_("Deadline (days since beggining project)"),
_("Deadline (days since project start)"),
"estimated_end") {
@Override

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

@ -335,16 +335,10 @@ public class WorkReportTypeCRUDController extends BaseCRUDController<WorkReportT
private Button createRemoveButton() {
Button removeButton = new Button();
if (isReadOnly()) {
removeButton.setSclass("icono");
removeButton.setImage("/common/img/ico_borrar_out.png");
removeButton.setTooltiptext(_("Not deletable"));
} else {
removeButton.setSclass("icono");
removeButton.setImage("/common/img/ico_borrar1.png");
removeButton.setHoverImage("/common/img/ico_borrar.png");
removeButton.setTooltiptext(_("Delete"));
}
removeButton.setSclass("icono");
removeButton.setImage("/common/img/ico_borrar1.png");
removeButton.setHoverImage("/common/img/ico_borrar.png");
removeButton.setTooltiptext(_("Delete"));
return removeButton;
}
@ -769,7 +763,7 @@ public class WorkReportTypeCRUDController extends BaseCRUDController<WorkReportT
Row row = findRowByValue(listDescriptionFields.getRows(), field);
Textbox fieldName = (Textbox) row.getFirstChild();
throw new WrongValueException(fieldName,
_("The field name must be unique, not null and not empty"));
_("The field name must be unique and not empty"));
}
private void showInvalidDescriptionFieldLength(DescriptionField field) {
@ -777,7 +771,7 @@ public class WorkReportTypeCRUDController extends BaseCRUDController<WorkReportT
Row row = findRowByValue(listDescriptionFields.getRows(), field);
Intbox fieldName = (Intbox) row.getChildren().get(1);
throw new WrongValueException(fieldName,
_("The length must be greater than 0, and not null."));
_("The length must be greater than 0 and not empty"));
}
private void showInvalidWorkReportLabelTypeAssigment(int combo,

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

@ -29,7 +29,7 @@
apply="org.libreplan.web.expensesheet.ExpenseSheetCRUDController">
<vbox id="messagesContainer"></vbox>
<window id="listWindow" title="${i18n:_('Expense Sheet List')}">
<window id="listWindow" title="${i18n:_('Expense Sheets List')}">
<div align="left">
<hbox align="center">
<!-- Create new Expense Sheet -->

2
libreplan-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul
View file

@ -82,7 +82,7 @@
</hbox>
</row>
<row>
<label value="${i18n:_('Our company login')}:" />
<label value="${i18n:_('Our company username')}:" />
<textbox id="ourCompanyLogin"
value="@{controller.company.ourCompanyLogin}" />
</row>

2
libreplan-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul
View file

@ -20,7 +20,7 @@
-->
<groupbox closable="false">
<caption label="${i18n:_('Criteria of selected type ')}" />
<caption label="${i18n:_('Criteria list')}" />
<vbox id="criterionsTree">
<vbox>

2
libreplan-webapp/src/main/webapp/resources/criterions/_list.zul
View file

@ -19,7 +19,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="listWindow" title="${i18n:_('Criterion Type List')}">
<window id="listWindow" title="${i18n:_('Criterion Types List')}">
<newdatasortablegrid model="@{controller.criterionTypes}" fixedLayout="true" sclass="clickable-rows">
<columns>
<newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="ascending" />

2
libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul
View file

@ -30,7 +30,7 @@
<columns>
<column width="25px" />
<column label="${i18n:_('Name')}"
tooltiptext="${i18n:_('Each worker configuration unit name')}"
tooltiptext="${i18n:_('Configuration unit name')}"
width="400px" sort="auto(name)" />
<column label="${i18n:_('Alpha')}"
tooltiptext="${i18n:_('Human hours per machine working hour within configuration unit')}" />

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

@ -34,7 +34,7 @@
<vbox id="messagesContainer" />
<div align="right">
<label class="subtitulo" value="${i18n:_('Show :')}" />
<label class="subtitulo" value="${i18n:_('Show')}:" />
<listbox id="listFilter" mold="select" rows="1"
model="@{controller.filterItems}"
selectedItem="@{controller.currentFilterItem}"

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

@ -34,7 +34,7 @@
<vbox id="messagesContainer" />
<div align="right">
<label class="subtitulo" value="${i18n:_('Show :')}" />
<label class="subtitulo" value="${i18n:_('Show')}:" />
<listbox id="listFilter" mold="select" rows="1"
model="@{controller.filterItems}"
selectedItem="@{controller.currentFilterItem}"