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

i18n: Fix string

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Diego Pino 2012-07-04 12:12:43 +02:00
parent 2170cb8586
commit 9a477cdd7c
52 changed files with 75 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-business/src/main/java/org/libreplan/business/advance/entities/AdvanceType.java
View file

@ -263,7 +263,7 @@ public class AdvanceType extends BaseEntity implements IHumanIdentifiable{
}
}
@AssertTrue(message = "the default max value must be greater than the precision value")
@AssertTrue(message = "Default Max value must be greater than precision value")
public boolean checkDefaultMaxValueGreaterThanPrecision() {
if (defaultMaxValue.compareTo(unitPrecision) == -1) {
return false;

4
libreplan-business/src/main/java/org/libreplan/business/advance/entities/DirectAdvanceAssignment.java
View file

@ -192,7 +192,7 @@ public class DirectAdvanceAssignment extends AdvanceAssignment {
return null;
}
@AssertTrue(message = "The previous advance measurements must have a value less than the value of the posterior advance measurements.")
@AssertTrue(message = "Progress measurements must have a value lower than their following progress measurements.")
public boolean checkConstraintValidAdvanceMeasurements() {
if (advanceMeasurements.isEmpty()) {
return true;
@ -263,4 +263,4 @@ public class DirectAdvanceAssignment extends AdvanceAssignment {
return !nonCalculatedConsolidations.isEmpty();
}
}
}

2
libreplan-business/src/main/java/org/libreplan/business/common/daos/EntitySequenceDAO.java
View file

@ -79,7 +79,7 @@ public class EntitySequenceDAO extends
if (entitySequence.getLastValue() > 0) {
throw new IllegalArgumentException(
I18nHelper
._("You can not remove this entity sequence, it is already in use"));
._("Entity Sequence cannot be deleted. Entity Sequence already in use"));
}
remove(entitySequence.getId());

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

@ -133,7 +133,7 @@ public class Configuration extends BaseEntity {
return companyCode;
}
@AssertTrue(message = "company code must not contain white spaces")
@AssertTrue(message = "company code cannot contain whitespaces")
public boolean checkConstraintCompanyCodeWithoutWhiteSpaces() {
if ((companyCode == null) || (companyCode.isEmpty())) {
return false;

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

@ -143,7 +143,7 @@ public class EntitySequence extends BaseEntity {
return numberOfDigits;
}
@AssertTrue(message = "number of digits is out of range")
@AssertTrue(message = "number of digits out of range")
public boolean checkConstraintNumberOfDigitsInRange() {
if ((numberOfDigits != null)
&& (numberOfDigits >= MIN_NUMBER_OF_DIGITS)

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

@ -128,7 +128,7 @@ public class CostCategory extends IntegrationEntity implements IHumanIdentifiabl
.getInitDate().compareTo(endDate) <= 0)) {
throw ValidationException
.invalidValue(
_("Two hour costs with the same type overlap in time"),
_("Two Hour Cost of the same type overlap in time"),
listElement);
} else if ((endDate != null && listElement.getEndDate() != null)
&& ((listElement.getEndDate().compareTo(initDate) >= 0 && listElement
@ -137,7 +137,7 @@ public class CostCategory extends IntegrationEntity implements IHumanIdentifiabl
.getInitDate().compareTo(endDate) <= 0))) {
throw ValidationException
.invalidValue(
_("Two hour costs with the same type overlap in time"),
_("Two Hour Cost of the same type overlap in time"),
listElement);
}
}
@ -267,7 +267,7 @@ public class CostCategory extends IntegrationEntity implements IHumanIdentifiabl
throw new InstanceNotFoundException(code, HourCost.class.getName());
}
@AssertFalse(message="Two hour costs with the same type overlap in time")
@AssertFalse(message="Two Hour Cost of the same type overlap in time")
public boolean checkHourCostsOverlap() {
try {
validateHourCostsOverlap(getHourCosts());

4
libreplan-business/src/main/java/org/libreplan/business/costcategories/entities/TypeOfWorkHours.java
View file

@ -143,7 +143,7 @@ public class TypeOfWorkHours extends IntegrationEntity implements IHumanIdentifi
}
}
@AssertTrue(message = "the type of work hours for monthly timesheets cannot be disabled")
@AssertTrue(message = "type of work hours for monthly timesheets cannot be disabled")
public boolean checkMonthlyTimesheetsTypeOfWorkHoursNotDisabled() {
if (!isNewObject() && !getEnabled()) {
TypeOfWorkHours typeOfWorkHours = Registry.getConfigurationDAO()
@ -165,4 +165,4 @@ public class TypeOfWorkHours extends IntegrationEntity implements IHumanIdentifi
return name;
}
}
}

2
libreplan-business/src/main/java/org/libreplan/business/expensesheet/entities/ExpenseSheet.java
View file

@ -257,4 +257,4 @@ public class ExpenseSheet extends IntegrationEntity implements IHumanIdentifiabl
return true;
}
}
}

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

@ -146,7 +146,7 @@ public class ExternalCompany extends BaseEntity implements IHumanIdentifiable,
return ourCompanyPassword;
}
@AssertTrue(message="company name has to be unique. It is already used")
@AssertTrue(message="company name must be unique. Company name already used")
public boolean checkConstraintUniqueName() {
IExternalCompanyDAO dao = Registry.getExternalCompanyDAO();

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

@ -253,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");
"Criterion cannot be assigned to this Hours Group. Criterion Resource Type is of a different type");
}
if (existSameCriterionRequirement(requirement)) {
throw new IllegalStateException(
"The criterion can not be assigned to this hoursGroup because it already exist into the hoursGroup");
"Criterion cannot be assigned to this Hours Group. Criterion already exist within Hours Group");
}
requirement.setHoursGroup(this);

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

@ -271,7 +271,7 @@ public class WorkReportLine extends IntegrationEntity implements Comparable,
return true;
}
@AssertTrue(message = "The start hour cannot be higher than finish hour")
@AssertTrue(message = "Start hour cannot be greater than finish hour")
public boolean checkCannotBeHigher() {
if (!firstLevelValidationsPassed()) {
return true;

2
libreplan-webapp/src/main/java/org/libreplan/web/advance/AdvanceTypeModel.java
View file

@ -88,7 +88,7 @@ public class AdvanceTypeModel implements IAdvanceTypeModel {
private void checkCanBeModified(AdvanceType advanceType) {
if (!canBeModified(advanceType)) {
throw new IllegalArgumentException(
_("The progress type cannot be modified"));
_("Progress type cannot be modified"));
}
}

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

@ -615,7 +615,7 @@ public abstract class BaseCalendarEditionController extends
.getSelectedItem().getValue();
if (type == null) {
throw new WrongValueException(exceptionTypes,
_("You should select the type of exception"));
_("Please, select type of exception"));
} else {
Clients.closeErrorBox(exceptionTypes);
}
@ -633,7 +633,7 @@ public abstract class BaseCalendarEditionController extends
Date endDate = dateboxEndDate.getValue();
if (endDate == null) {
throw new WrongValueException(dateboxEndDate,
_("You should select an end date for the exception"));
_("Please, select an End Date for the Exception"));
} else {
Clients.closeErrorBox(dateboxEndDate);
}
@ -1269,7 +1269,7 @@ public abstract class BaseCalendarEditionController extends
Date endDate = dateboxEndDate.getValue();
if (endDate == null) {
throw new WrongValueException(dateboxEndDate,
_("You should select an end date for the exception"));
_("Please, select an End Date for the Exception"));
} else {
Clients.closeErrorBox(dateboxEndDate);
}

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

@ -532,7 +532,7 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
}
}
throw new ValidationException(
_("This date can not include the whole next work week"));
_("Date cannot include the entire next work week"));
}
@Override

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

@ -46,7 +46,7 @@ public class EffortDurationBox extends Textbox {
EffortDuration result = EffortDuration.parseFromFormattedString(value);
if (result == null) {
throw new WrongValueException(this,
_("Not a valid effort duration"));
_("Invalid Effort Duration"));
}
return result;
}

2
libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/CriterionBandboxFinder.java
View file

@ -121,4 +121,4 @@ public class CriterionBandboxFinder extends BandboxFinder implements IBandboxFin
return etiqueta.concat(criterion.getName());
}
}
}

2
libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/OrderElementInExpenseSheetBandboxFinder.java
View file

@ -105,4 +105,4 @@ public class OrderElementInExpenseSheetBandboxFinder extends BandboxFinder imple
}
};
}
}

2
libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceAllocationFilterEnum.java
View file

@ -47,4 +47,4 @@ public enum ResourceAllocationFilterEnum implements IFilterEnum {
return description;
}
}
}

2
libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceFilterEnum.java
View file

@ -46,4 +46,4 @@ public enum ResourceFilterEnum implements IFilterEnum {
return description;
}
}
}

2
libreplan-webapp/src/main/java/org/libreplan/web/common/components/finders/ResourceInExpenseSheetBandboxFinder.java
View file

@ -99,4 +99,4 @@ public class ResourceInExpenseSheetBandboxFinder extends BandboxFinder implement
}
};
}
}

2
libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java
View file

@ -120,4 +120,4 @@ public class CostStatusController extends GenericForwardComposer {
lblVAC.setValue(String.format(_("%s h"), value.toString()));
}
}
}

2
libreplan-webapp/src/main/java/org/libreplan/web/expensesheet/ExpenseSheetCRUDController.java
View file

@ -511,7 +511,7 @@ public class ExpenseSheetCRUDController extends
if (!getExpenseSheet().isCodeAutogenerated()) {
String code = (String) value;
if (code == null || code.isEmpty()) {
throw new WrongValueException(comp, _("The code cannot be empty."));
throw new WrongValueException(comp, _("Code cannot be empty."));
} else {
String oldCode = line.getCode();
line.setCode(code);

24
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(_("Invalid Spread values. 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, at least one value should be true"));
Level.ERROR, _("Invalid Spread values. At least one value should be true"));
} catch (InvalidValueException e) {
messagesForUser.showMessage(Level.ERROR, e.getMessage());
} catch (InstanceNotFoundException e) {
@ -299,7 +299,7 @@ public class ManageOrderElementAdvancesController extends
showMessageDeleteSpread();
} else if (manageOrderElementAdvancesModel
.hasConsolidatedAdvances(advance)) {
showErrorMessage(_("This progress assignment cannot be deleted or changed because it has some progress consolidation"));
showErrorMessage(_("Progress Assignment cannot be deleted or changed. Progress Assignment contains Progress Consolidations values"));
} else {
manageOrderElementAdvancesModel
.removeLineAdvanceAssignment(advance);
@ -327,7 +327,7 @@ public class ManageOrderElementAdvancesController extends
.removeLineAdvanceMeasurement(advance);
reloadAdvances();
} else {
showErrorMessage(_("This progress measurement cannot be deleted or changed because it is consolidated"));
showErrorMessage(_("Progress Measurement cannot be deleted. Progress Measurement already consolidated"));
}
}
@ -506,7 +506,7 @@ public class ManageOrderElementAdvancesController extends
.hasConsolidatedAdvances(advanceAssignment)) {
throw new WrongValueException(
maxValue,
_("This progress assignment cannot be deleted or changed because it has some progress consolidation"));
_("Progress Assignment cannot be deleted or changed. Progress Assignment contains Progress Consolidations values"));
} else {
setPercentage();
reloadAdvances();
@ -1094,7 +1094,7 @@ public class ManageOrderElementAdvancesController extends
} else {
throw new WrongValueException(
value,
_("This progress measurement cannot be deleted or changed because it is consolidated"));
_("Progress Measurement cannot be deleted. Progress Measurement already consolidated"));
}
}
});
@ -1157,7 +1157,7 @@ public class ManageOrderElementAdvancesController extends
} else {
throw new WrongValueException(
date,
_("This progress measurement cannot be deleted or changed because it is consolidated"));
_("Progress Measurement cannot be deleted. Progress Measurement already consolidated"));
}
}
});
@ -1227,11 +1227,11 @@ public class ManageOrderElementAdvancesController extends
.hasConsolidatedAdvances(measure)) {
removeButton.setDisabled(true);
removeButton
.setTooltiptext(_("Consolidated progress measurement can not be removed"));
.setTooltiptext(_("Consolidated progress measurement cannot be removed"));
} else if (manageOrderElementAdvancesModel.isAlreadyReportedProgress(measure)) {
removeButton.setDisabled(true);
removeButton
.setTooltiptext(_("Values are read only because they have already been sent to the customer company."));
.setTooltiptext(_("Values already sent to the customer. Values cannot be changed "));
} else if (isReadOnlyAdvanceMeasurements()) {
removeButton.setDisabled(isReadOnlyAdvanceMeasurements());
removeButton
@ -1325,7 +1325,7 @@ public class ManageOrderElementAdvancesController extends
.stripTrailingZeros().toPlainString());
}
if (manageOrderElementAdvancesModel.lessThanPreviousMeasurements()) {
return _("Value is not valid, the value must be greater than the value of the previous progress.");
return _("Invalid value. Value must be greater than the value of previous progress.");
}
return null;
}
@ -1337,7 +1337,7 @@ public class ManageOrderElementAdvancesController extends
if (!manageOrderElementAdvancesModel.isDistinctValidDate(value,
measurement)) {
return _("The date is not valid, the date must be unique for this progress assignment");
return _("Invalid date. Date must be unique for this Progress Assignment");
}
if (measurement != null) {
if (manageOrderElementAdvancesModel
@ -1347,7 +1347,7 @@ public class ManageOrderElementAdvancesController extends
manageOrderElementAdvancesModel.sortListAdvanceMeasurement();
if (manageOrderElementAdvancesModel
.lessThanPreviousMeasurements()) {
return _("Value is not valid, the value must be greater than the value of the previous progress.");
return _("Invalid value. Value must be greater than the value of previous progress.");
}
}

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

@ -313,7 +313,7 @@ public class OrderCRUDController extends GenericForwardComposer {
_("Forward"), _("Schedule from start to deadline")));
schedulingMode.appendChild(createCombo(
SchedulingMode.BACKWARDS, _("Backwards"),
_("Schedule from the deadline to start")));
_("Schedule from deadline to start")));
}
}
@ -1290,7 +1290,7 @@ public class OrderCRUDController extends GenericForwardComposer {
if (!SecurityUtils.isSuperuserOrUserInRoles(UserRole.ROLE_TEMPLATES)) {
buttonDerived.setDisabled(true);
buttonDerived
.setTooltiptext(_("You do not have permissions to create templates"));
.setTooltiptext(_("Not enough permissions to create templates"));
}
hbox.appendChild(buttonDerived);
}

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

@ -285,7 +285,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
.isSuperuserOrUserInRoles(UserRole.ROLE_TEMPLATES)) {
createTemplateButton.setDisabled(true);
createTemplateButton
.setTooltiptext(_("You do not have permissions to create templates"));
.setTooltiptext(_("Not enough permissions to create templates"));
}
}
}

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

@ -1311,7 +1311,7 @@ class Row {
private int showConfirmChangeFunctionDialog()
throws InterruptedException {
return Messagebox
.show(_("You are going to change the assignment function. Are you sure?"),
.show(_("Assignment function will be changed. Are you sure?"),
_("Confirm change"),
Messagebox.YES | Messagebox.NO, Messagebox.QUESTION);
}

4
libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java
View file

@ -823,8 +823,8 @@ public abstract class AllocationRow {
String firstLine = _(
"In the available periods {0} only {1} hours are available.",
validPeriods, sumReached.getHours());
String secondLine = isGeneric() ? _("The periods available depend on the satisfaction of the criteria by the resources and their calendars.")
: _("The periods available depend on the resource's calendar.");
String secondLine = isGeneric() ? _("Periods available depend on the satisfaction of the criteria of resources and their calendars.")
: _("Periods available depend on resources' calendar.");
throw new WrongValueException(effortInput, firstLine + "\n"
+ secondLine);
}

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

@ -287,7 +287,7 @@ public class StretchesFunctionModel implements IStretchesFunctionModel {
if (date.compareTo(taskEndDate) > 0) {
throw new IllegalArgumentException(
_("Stretch date must not be after task end date: "
_("Stretch date must be earlier than End date: "
+ sameFormatAsDefaultZK(taskEndDate)));
}

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

@ -751,7 +751,7 @@ public class OrderPlanningModel implements IOrderPlanningModel {
.getIndicatorsDefinitionInterval(), LocalDate
.fromDateFields(value))) {
throw new WrongValueException(comp,
_("the date must be inside the visualization area"));
_("Date must be inside visualization area"));
}
}

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

@ -352,4 +352,4 @@ public class SubcontractController extends GenericForwardComposer {
public String getMoneyFormat() {
return Util.getMoneyFormat();
}
}
}

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

@ -341,7 +341,7 @@ public class CriterionTreeModel implements ICriterionTreeModel {
throws ValidationException{
if(name.isEmpty()){
InvalidValue[] invalidValues = {
new InvalidValue(_("The name of the criterion is empty."),
new InvalidValue(_("Name of criterion is empty."),
CriterionType.class, "name",
"",criterionType)};
throw new ValidationException(invalidValues);

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

@ -539,7 +539,7 @@ public class MachineCRUDController extends BaseCRUDController<Machine> {
messagesForUser
.showMessage(
Level.WARNING,
_("This machine cannot be deleted because it has assignments to projects or imputed hours"));
_("Machine cannot be deleted. Machine is allocated to a project or contains imputed hours"));
return false;
}
return true;

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

@ -213,7 +213,7 @@ public class CriterionsController extends GenericForwardComposer {
}
if(!criterionSatisfactionDTO.isLessToEndDate((Date) value)){
throw new WrongValueException(comp,
_("Start date is not valid, the new start date must be lower than the end date"));
_("Invalid Start Date. New Start Date must be earlier than End Date"));
}else if(!criterionSatisfactionDTO.isPreviousStartDate((Date) value)){
throw new WrongValueException(
comp,
@ -239,7 +239,7 @@ public class CriterionsController extends GenericForwardComposer {
_("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"));
_("Invaldid End Date. New End Date must be after current End Date "));
}
}

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

@ -215,7 +215,7 @@ public class CriterionsMachineController extends GenericForwardComposer {
} 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"));
_("Invaldid End Date. New End Date must be after current End Date "));
}
}
@ -238,7 +238,7 @@ public class CriterionsMachineController extends GenericForwardComposer {
if (!criterionSatisfactionDTO.isLessToEndDate((Date) value)) {
throw new WrongValueException(
comp,
_("Start date is not valid, the new start date must be lower than the end date"));
_("Invalid Start Date. New Start Date must be earlier than End Date"));
} else if (!criterionSatisfactionDTO.isPreviousStartDate((Date) value)) {
throw new WrongValueException(
comp,

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

@ -413,7 +413,7 @@ public class WorkerModel extends IntegrationEntityModel implements IWorkerModel
Validate
.isTrue(
type.isAllowSimultaneousCriterionsPerResource(),
_("You must allow multiple active criteria for this type to use this assignment strategy"));
_("Please, allow Multiple Active Criteria in this type in order to use selected Assignment Strategy"));
this.criterionDAO = criterionDAO;
this.resource = resource;
this.type = type;

2
libreplan-webapp/src/main/java/org/libreplan/web/scenarios/TransferOrdersModel.java
View file

@ -145,7 +145,7 @@ public class TransferOrdersModel implements ITransferOrdersModel {
}
if (destinationScenario == null) {
throw new ValidationException(
_("You should select a destination scenario"));
_("Please, select a destination scenario"));
}
if (sourceScenario.getId().equals(destinationScenario.getId())) {

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

@ -222,4 +222,4 @@ public class CustomerCommunicationCRUDController extends GenericForwardComposer
public void onApplyFilter(Event event) {
refreshCustomerCommunicationsList();
}
}
}

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

@ -265,4 +265,4 @@ public class SubcontractorCommunicationCRUDController extends GenericForwardComp
public void onApplyFilter(Event event) {
refreshSubcontractorCommunicationsList();
}
}
}

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

@ -346,4 +346,4 @@ public class TemplatesTreeController extends
operationsForOrderTemplate.deleteSelectedElement();
}
}
}

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

@ -146,7 +146,7 @@ public class OrderElementHistoricalAssignmentComponent extends HtmlMacroComponen
globalView.goToOrderElementDetails(order, orderElement);
} else {
Messagebox
.show(_("You do not have permissions to edit the project"),
.show(_("Not enough permissions to edit this project"),
_("Warning"), Messagebox.OK,
Messagebox.EXCLAMATION);
}
@ -207,4 +207,4 @@ public class OrderElementHistoricalAssignmentComponent extends HtmlMacroComponen
return webApplicationContext.getBean(classname);
}
}
}

2
libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java
View file

@ -186,7 +186,7 @@ public class MonthlyTimesheetController extends GenericForwardComposer
EffortDuration effortDuration = effortDurationFromString(value);
if (effortDuration == null) {
throw new WrongValueException(textbox,
_("Not a valid effort duration"));
_("Invalid Effort Duration"));
}
monthlyTimesheetModel.setEffortDuration(orderElement,
textboxDate, effortDuration);

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

@ -409,7 +409,7 @@ public class WorkReportTypeModel extends IntegrationEntityModel implements
throws IllegalArgumentException {
if ((code == null) || (code.isEmpty())) {
throw new IllegalArgumentException(
_("the code cannot be empty"));
_("Code cannot be empty"));
}
if (code.contains("_")) {
throw new IllegalArgumentException(

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

@ -37,4 +37,4 @@
</hbox>
</vbox>
</window>
</zk>
</zk>

2
libreplan-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
View file

@ -88,4 +88,4 @@
paneColor="#FFFFFF" height="200" width="500" />
</hbox>
</groupbox>
</vbox>
</vbox>

2
libreplan-webapp/src/main/webapp/orders/_orderFilter.zul
View file

@ -28,7 +28,7 @@
<datebox id="filterStartDate" constraint = "@{orderFilterController.checkConstraintStartDate}"/>
<label value="${i18n:_('to')}"/>
<datebox id="filterFinishDate" constraint = "@{orderFilterController.checkConstraintFinishDate}"/>
<label value="${i18n:_('sub elements')}"/>
<label value="${i18n:_('subelements')}"/>
<checkbox id="checkIncludeOrderElements"
tooltiptext="${i18n:_('Apply filtering to tasks satisfying required criteria')}" />
<button mold="trendy" image="/common/img/ico_filter.png" style="margin-top: -4px"

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

@ -53,4 +53,4 @@
</window>
</zk>
</zk>

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

@ -91,4 +91,4 @@
</row>
</rows>
</newdatasortablegrid>
</div>
</div>

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

@ -59,4 +59,4 @@
<button id="show_create_form" onClick="controller.goToCreateVirtualWorkerForm();"
label="${i18n:_('Create Virtual Worker')}" sclass="create-button global-action">
</button>
</window>
</window>

2
libreplan-webapp/src/main/webapp/scenarios/transferOrders.zul
View file

@ -84,4 +84,4 @@
</window>
</zk>
</zk>

2
libreplan-webapp/src/main/webapp/unittypes/_editUnitType.zul
View file

@ -70,4 +70,4 @@
<button onClick="controller.cancelForm();"
label="${arg.cancel_button_label}"
sclass="cancel-button global-action"/>
</window>
</window>

2
libreplan-webapp/src/main/webapp/unittypes/unitTypes.zul
View file

@ -43,4 +43,4 @@
cancel_button_label="${i18n:_('Cancel')}"
/>
</window>
</zk>
</zk>

2
libreplan-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul
View file

@ -56,4 +56,4 @@
</panel>
<separator bar="false" spacing="40px" orient="vertical"/>
</vbox>
</vbox>