ItEr33S06DocumentacionFormacionItEr32S07 Corrections in English literals
Some of the hard-coded English literals were corrected.
This commit is contained in:
Jacobo Aragunde Pérez
Javier Moran Rua
parent
c317c81204
commit
6791de1946
22 changed files with 36 additions and 36 deletions
|
|
@ -151,7 +151,7 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer {
|
|||
}
|
||||
if (!(advanceTypeModel.distinctNames((String) value))) {
|
||||
throw new WrongValueException(comp,
|
||||
_("The name is not valid, Exist other advance type with a similar name. "));
|
||||
_("The name is not valid, there is another advance type with a similar name. "));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
|
|||
messagesForUser
|
||||
.showMessage(Level.ERROR,
|
||||
_("The calendar was not removed because it still has children. "
|
||||
+ "Some other calendar is derived from this."));
|
||||
+ "Some other calendar is derived from this one."));
|
||||
} else {
|
||||
baseCalendarModel.confirmRemove();
|
||||
hideConfirmingWindow();
|
||||
|
|
|
|||
|
|
@ -375,7 +375,7 @@ public abstract class BaseCalendarEditionController extends
|
|||
|
||||
switch (typeOfDay) {
|
||||
case ANCESTOR_EXCEPTION:
|
||||
return _("Derived excpetion");
|
||||
return _("Derived exception");
|
||||
case OWN_EXCEPTION:
|
||||
return _("Exception");
|
||||
case ZERO_HOURS:
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
|
|||
}
|
||||
|
||||
public void initializeMenu() {
|
||||
topItem(_("Planification"), "/planner/index.zul");
|
||||
topItem(_("Scheduling"), "/planner/index.zul");
|
||||
|
||||
topItem(_("Resources"), "/resources/worker/worker.zul",
|
||||
subItem(_("Workers List"),
|
||||
|
|
@ -179,9 +179,9 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
|
|||
"/workreports/workReport.zul"));
|
||||
|
||||
topItem(_("Administration"), "/advance/advanceTypes.zul",
|
||||
subItem(_("Manage advances types"),
|
||||
subItem(_("Manage advance types"),
|
||||
"/advance/advanceTypes.zul"),
|
||||
subItem(_("Manage criterions"),
|
||||
subItem(_("Manage criteria"),
|
||||
"/resources/criterions/criterions-V2.zul"),
|
||||
subItem(_("Calendars"), "/calendars/calendars.zul"),
|
||||
subItem(_("Label types"), "/labels/labelTypes.zul"));
|
||||
|
|
|
|||
|
|
@ -869,7 +869,7 @@ public class ManageOrderElementAdvancesController extends
|
|||
advanceMeasurement)) {
|
||||
throw new WrongValueException(
|
||||
comp,
|
||||
_("The date is not valid, the date must be unique for this advance assignment"));
|
||||
_("The date is not valid, the date must be unique for this advanced assignment"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -247,7 +247,7 @@ class FormBinder {
|
|||
.get(generic);
|
||||
throw new WrongValueException(
|
||||
decimalbox,
|
||||
_("there are no workers for required criterions. So the generic allocation can't be done"));
|
||||
_("there are no workers for required criteria. So the generic allocation can't be done"));
|
||||
}
|
||||
|
||||
public void setAllocationsList(Listbox allocationsList) {
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ import org.zkoss.zkplus.databind.AnnotateDataBinder;
|
|||
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
|
||||
public class MultipleTabsPlannerController implements Composer {
|
||||
|
||||
public static final String PLANNIFICATION = _("Plannification");
|
||||
public static final String PLANNIFICATION = _("Scheduling");
|
||||
|
||||
public static final String BREADCRUMBS_SEPARATOR = "/common/img/migas_separacion.gif";
|
||||
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ public class CriterionAdminController_V2 extends GenericForwardComposer {
|
|||
try {
|
||||
criterionsModel_V2.saveCriterionType();
|
||||
messagesForUser.showMessage(Level.INFO,
|
||||
_("CriterionType and its criterions saved"));
|
||||
_("CriterionType and its criteria saved"));
|
||||
} catch (ValidationException e) {
|
||||
for (InvalidValue invalidValue : e.getInvalidValues()) {
|
||||
String message = invalidValue.getPropertyName() + " : "
|
||||
|
|
|
|||
|
|
@ -351,7 +351,7 @@ public class AssignedMachineCriterionsModel implements IAssignedMachineCriterion
|
|||
Criterion criterion = satisfactionDTO.getCriterionWithItsType()
|
||||
.getCriterion();
|
||||
if (checkSameCriterionAndSameInterval(satisfactionDTO)) {
|
||||
throw new IllegalStateException(_("The {0} can not be assigned to this resource. Its interval overlap with other criterion", criterion.getName()));
|
||||
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()));
|
||||
|
|
|
|||
|
|
@ -148,11 +148,11 @@ public class CriterionsController extends GenericForwardComposer {
|
|||
}
|
||||
if(assignedCriterionsModel.checkSameCriterionAndSameInterval(satisfaction)){
|
||||
throw new WrongValueException(comp,
|
||||
_("Criterion is not valid, the criterion overlap other criterionSatisfaction whith same criterion"));
|
||||
_("Criterion is not valid, it overlaps other criterionSatisfaction with the same criterion"));
|
||||
}
|
||||
if(assignedCriterionsModel.checkNotAllowSimultaneousCriterionsPerResource(satisfaction)){
|
||||
throw new WrongValueException(comp,
|
||||
_("CriterionType is not valid, the criterionType overlap other criterionSatisfaction whith same criterionType"));
|
||||
_("CriterionType is not valid, it overlaps other criterionSatisfaction with the same criterionType"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -300,7 +300,7 @@ public class WorkerModel implements IWorkerModel {
|
|||
Validate
|
||||
.isTrue(
|
||||
type.isAllowSimultaneousCriterionsPerResource(),
|
||||
_("Must allow multiple active criterions for this type to use this assignment strategy"));
|
||||
_("You must allow multiple active criteria for this type to use this assignment strategy"));
|
||||
this.criterionDAO = criterionDAO;
|
||||
this.resource = resource;
|
||||
this.type = type;
|
||||
|
|
|
|||
|
|
@ -108,13 +108,13 @@
|
|||
<rows>
|
||||
<row>
|
||||
<label
|
||||
value="${i18n:_('Budget hours:')}" />
|
||||
value="${i18n:_('Budget hours')}:" />
|
||||
<label
|
||||
value="@{asignedHoursToOrderElementController.estimatedHours}" />
|
||||
</row>
|
||||
<row>
|
||||
<label
|
||||
value="${i18n:_('Imputed hours:')}" />
|
||||
value="${i18n:_('Imputed hours')}:" />
|
||||
<label
|
||||
value="@{asignedHoursToOrderElementController.totalAsignedHours}" />
|
||||
</row>
|
||||
|
|
|
|||
|
|
@ -75,8 +75,8 @@
|
|||
</panelchildren>
|
||||
</panel>
|
||||
|
||||
<!-- Manage criterions -->
|
||||
<panel id="panelCriterions" title="${i18n:_('Manage criterions')}">
|
||||
<!-- Manage criteria -->
|
||||
<panel id="panelCriterions" title="${i18n:_('Manage criteria')}">
|
||||
<panelchildren>
|
||||
<vbox id="selectCriterions">
|
||||
<twowayselector
|
||||
|
|
|
|||
|
|
@ -116,9 +116,9 @@
|
|||
<intbox id="taskElapsedDays" width="300px" />
|
||||
</vbox>
|
||||
</row>
|
||||
<!-- Required criterions -->
|
||||
<!-- Required criteria -->
|
||||
<row>
|
||||
<label value="${i18n:_('Required criterions')}:" />
|
||||
<label value="${i18n:_('Required criteria')}:" />
|
||||
<label value="@{allocationController.taskCriterions}" />
|
||||
</row>
|
||||
<!-- Total order hours -->
|
||||
|
|
@ -181,7 +181,7 @@
|
|||
<window id="splittingWindow" visible="false" apply="${splittingTaskController}" minwidth="${400}" >
|
||||
<vbox>
|
||||
<hbox>
|
||||
<label value="${i18n:_('Total hours:')}" /> <label id="totalHoursLabel"/>
|
||||
<label value="${i18n:_('Total hours')}:" /> <label id="totalHoursLabel"/>
|
||||
</hbox>
|
||||
<grid id="sharesListing" fixedLayout="true">
|
||||
<columns sizable="true">
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<panel title="${i18n:_('Asociated Criterions')}" border="normal">
|
||||
<panel title="${i18n:_('Associated Criteria')}" border="normal">
|
||||
<panelchildren>
|
||||
<vbox id="criterionsTree">
|
||||
<vbox>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<tabbox>
|
||||
<tabs>
|
||||
<tab id="tbMachineData" label="${i18n:_('Machine data')}"></tab>
|
||||
<tab label="${i18n:_('Assigned criterions')}"></tab>
|
||||
<tab label="${i18n:_('Assigned criteria')}"></tab>
|
||||
<tab label="${i18n:_('Calendar')}"></tab>
|
||||
<tab label="${i18n:_('Configuration')}"></tab>
|
||||
</tabs>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
<vbox id="criterionsContainer" style="padding: 10px" >
|
||||
<vbox id="messagesContainer"/>
|
||||
<panel title="${i18n:_('Assigned Criterions')}" border="normal">
|
||||
<panel title="${i18n:_('Assigned criteria')}" border="normal">
|
||||
<panelchildren>
|
||||
<hbox align="center">
|
||||
<separator bar="false" spacing="40px" orient="horizontal"/>
|
||||
<separator bar="false" spacing="20px" orient="vertical"/>
|
||||
<button onClick="assignedCriterionsController.addCriterionSatisfaction();"
|
||||
label="${i18n:_('Add criterion')}" />
|
||||
<label class="subtitulo" value="${i18n:_('Filters :')}" />
|
||||
<label class="subtitulo" value="${i18n:_('Filters')}:" />
|
||||
<combobox id="comboboxFilter"
|
||||
onSelect="assignedCriterionsController.reload();">
|
||||
<comboitem label="${i18n:_('All')}" />
|
||||
<comboitem label="${i18n:_('Currents')}" />
|
||||
<comboitem label="${i18n:_('Current')}" />
|
||||
</combobox>
|
||||
<separator bar="false" spacing="20px" orient="vertical"/>
|
||||
</hbox>
|
||||
|
|
|
|||
|
|
@ -40,8 +40,8 @@
|
|||
</vbox>
|
||||
|
||||
<vbox>
|
||||
<!-- Criterions -->
|
||||
<label value="${i18n:_('Criterions')}" />
|
||||
<!-- Criteria -->
|
||||
<label value="${i18n:_('Criteria')}" />
|
||||
<tree id="criterionsTree" width="280px"
|
||||
rows="10" vflex="true" multiple="true"
|
||||
model="@{controller.criterions}">
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
<panel id="criterionsContainer" title="${i18n:_('Assigned Criterions')}" border="normal">
|
||||
<panel id="criterionsContainer" title="${i18n:_('Assigned criteria')}" border="normal">
|
||||
<panelchildren>
|
||||
<hbox align="center">
|
||||
<separator bar="false" spacing="40px" orient="horizontal"/>
|
||||
<separator bar="false" spacing="20px" orient="vertical"/>
|
||||
<button onClick="assignedCriterionsController.addCriterionSatisfaction();"
|
||||
label="${i18n:_('Add criterion')}" />
|
||||
<label class="subtitulo" value="${i18n:_('Filters :')}" />
|
||||
<label class="subtitulo" value="${i18n:_('Filters')}:" />
|
||||
<combobox id="comboboxfilter"
|
||||
onSelect="assignedCriterionsController.reload();">
|
||||
<comboitem label="${i18n:_('All')}" />
|
||||
<comboitem label="${i18n:_('Currents')}" />
|
||||
<comboitem label="${i18n:_('Current')}" />
|
||||
</combobox>
|
||||
<separator bar="false" spacing="20px" orient="vertical"/>
|
||||
</hbox>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
<tabbox>
|
||||
<tabs>
|
||||
<tab label="${i18n:_('Personal data')}"></tab>
|
||||
<tab label="${i18n:_('Assigned criterions')}"></tab>
|
||||
<tab label="${i18n:_('Assigned criteria')}"></tab>
|
||||
<tab visible="false" label="${i18n:_('Locations')}"></tab>
|
||||
<tab visible="false" label="${i18n:_('Work record')}"></tab>
|
||||
<tab label="${i18n:_('Calendar')}"></tab>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
model="@{controller.localizations.activeSatisfactions}"
|
||||
height="200px" multiple="true" checkmark="true">
|
||||
<listhead>
|
||||
<listheader label="${i18n:_('Grup')}"
|
||||
<listheader label="${i18n:_('Group')}"
|
||||
sort="auto(criterion.name)"></listheader>
|
||||
<listheader label="${i18n:_('Starting date')}"
|
||||
sort="auto(startDate)" />
|
||||
|
|
|
|||
|
|
@ -38,17 +38,17 @@
|
|||
<rows>
|
||||
<row>
|
||||
<label
|
||||
value="${i18n:_('Responsible:')}" />
|
||||
value="${i18n:_('Responsible')}:" />
|
||||
<textbox id="responsible"
|
||||
value="@{controller.workReport.responsible}" width="300px" />
|
||||
</row>
|
||||
<row>
|
||||
<label value="${i18n:_('Place:')}" />
|
||||
<label value="${i18n:_('Place')}:" />
|
||||
<textbox
|
||||
value="@{controller.workReport.place}" width="300px" />
|
||||
</row>
|
||||
<row>
|
||||
<label value="${i18n:_('Date:')}" />
|
||||
<label value="${i18n:_('Date')}:" />
|
||||
<datebox id="date"
|
||||
value="@{controller.workReport.date}" />
|
||||
</row>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue