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

i18n: Rename limiting resources to queue-based

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-07-04 17:36:24 +02:00
parent 9028b56c3d
commit ab5893703f
17 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,9 +30,9 @@ import java.util.Set;
*/
public enum ResourceType {
NON_LIMITING_RESOURCE(_("NON LIMITING RESOURCE")),
LIMITING_RESOURCE(_("LIMITING RESOURCE")),
STRATEGIC_RESOURCE(_("STRATEGIC RESOURCE"));
NON_LIMITING_RESOURCE(_("Normal resource")),
LIMITING_RESOURCE(_("Queue-based resource")),
STRATEGIC_RESOURCE(_("Strategic resource"));
private String option;

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

@ -245,7 +245,7 @@ public class Worker extends Resource {
return getId().equals(worker.getId());
}
@AssertTrue(message = "Limiting resources cannot be bound to any user")
@AssertTrue(message = "Queue-based resources cannot be bound to any user")
public boolean checkConstraintLimitingResourceNotBoundToUser() {
if (isLimitingResource()) {
return user == null;

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

@ -281,7 +281,7 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
globalView.goToCompanyLoad();
}
}, "01-introducion.html#id1"));
planningItems.add(subItem(_("Limiting Resources"), new ICapture() {
planningItems.add(subItem(_("Queue-based Resources"), new ICapture() {
@Override
public void capture() {
globalView.goToLimitingResources();

4
libreplan-webapp/src/main/java/org/libreplan/web/common/components/ResourceAllocationBehaviour.java
View file

@ -35,7 +35,7 @@ import org.libreplan.web.common.components.NewAllocationSelector.AllocationType;
*/
public enum ResourceAllocationBehaviour {
NON_LIMITING(_("NON_LIMITING")) {
NON_LIMITING(_("Normal")) {
@Override
public boolean allowMultipleSelection() {
@ -60,7 +60,7 @@ public enum ResourceAllocationBehaviour {
}
},
LIMITING(_("LIMITING")) {
LIMITING(_("Queue-based")) {
@Override
public boolean allowMultipleSelection() {

4
libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/LimitingResourcesController.java
View file

@ -442,7 +442,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
Button result = new Button("", "/common/img/ico_editar1.png");
result.setHoverImage("/common/img/ico_editar.png");
result.setSclass("icono");
result.setTooltiptext(_("Edit limiting resource element"));
result.setTooltiptext(_("Edit queue-based resource element"));
result.addEventListener(Events.ON_CLICK, new EventListener() {
@Override
@ -476,7 +476,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
Button result = new Button("", "/common/img/ico_borrar1.png");
result.setHoverImage("/common/img/ico_borrar.png");
result.setSclass("icono");
result.setTooltiptext(_("Remove limiting resource element"));
result.setTooltiptext(_("Remove queue-based resource element"));
result.addEventListener(Events.ON_CLICK, new EventListener() {
@Override

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

@ -1198,7 +1198,7 @@ class Row {
if (isGroupingRow()) {
return new Label();
} else if (isLimiting) {
return new Label(_("Limiting assignment"));
return new Label(_("Queue-based assignment"));
} else {
if (hboxAssigmentFunctionsCombo == null) {
initializeAssigmentFunctionsCombo();

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

@ -219,7 +219,7 @@ public class LimitingResourceAllocationModel implements ILimitingResourceAllocat
if (!areAllLimitingResources(resources)) {
getMessagesForUser().showMessage(Level.ERROR,
_("All resources must be limiting. "));
_("All resources must be queue-based"));
return;
}

6
libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/LimitingResourcesTabCreator.java
View file

@ -44,7 +44,7 @@ import org.zkoss.zul.Label;
public class LimitingResourcesTabCreator {
/* Unnecesary */
private String ORDER_LIMITING_RESOURCES_VIEW = _("Limiting resources (project)");
private String ORDER_LIMITING_RESOURCES_VIEW = _("Queue-based resources (project)");
public static ITab create(Mode mode,
LimitingResourcesController LimitingResourcesController,
@ -132,7 +132,7 @@ public class LimitingResourcesTabCreator {
}
};
return new CreatedOnDemandTab(_("Limiting Resources Planning"),
return new CreatedOnDemandTab(_("Queue-based Resources Planning"),
"limiting-resources",
componentCreator) {
@Override
@ -153,7 +153,7 @@ public class LimitingResourcesTabCreator {
breadcrumbs.appendChild(new Label(getSchedulingLabel()));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(
_("Limiting Resources Planning")));
_("Queue-based Resources Planning")));
}
};
}

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

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

6
libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java
View file

@ -846,9 +846,9 @@ public class WorkerCRUDController extends GenericForwardComposer implements
}
public enum LimitingResourceEnum {
ALL(_("ALL")),
LIMITING_RESOURCE(_("LIMITING RESOURCE")),
NON_LIMITING_RESOURCE(_("NON LIMITING RESOURCE"));
ALL(_("All")),
LIMITING_RESOURCE(_("Queue-based resource")),
NON_LIMITING_RESOURCE(_("Normal resource"));
/**
* Forces to mark the string as needing translation

4
libreplan-webapp/src/main/webapp/planner/editTask.zul
View file

@ -64,8 +64,8 @@
<tabs>
<tab id="taskPropertiesTab" label="${i18n:_('Task properties')}"
onSelect = "propertiesController.refreshTaskEndDate();"/>
<tab id="resourceAllocationTab" label="${i18n:_('Non limiting resource allocation')}" />
<tab id="limitingResourceAllocationTab" label="${i18n:_('Limiting resource allocation')}" />
<tab id="resourceAllocationTab" label="${i18n:_('Normal resource allocation')}" />
<tab id="limitingResourceAllocationTab" label="${i18n:_('Queue-based resource allocation')}" />
<tab id="subcontractTab" label="${i18n:_('Subcontract')}"
onSelect = "subController.refressGridEndDates();"/>
</tabs>

2
libreplan-webapp/src/main/webapp/reports/hoursWorkedPerWorkerReport.zul
View file

@ -83,7 +83,7 @@
itemRenderer="@{controller.renderer}">
<listhead>
<listheader label="${i18n:_('Type')}" align="center" width="50px"/>
<listheader label="${i18n:_('Limiting')}" align="center" width="60px"/>
<listheader label="${i18n:_('Queue-based')}" align="center" width="60px"/>
<listheader label="${i18n:_('Name')}" sort="auto(name)" align="center" width="250px"/>
<listheader label="${i18n:_('Code')}" align="center" width="270px"/>
<listheader label="${i18n:_('Operations')}" align="center" width="70px"/>

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

@ -65,7 +65,7 @@
</row>
<row>
<hbox>
<label value="${i18n:_('Limited resource')}" />
<label value="${i18n:_('Queue-based resource')}" />
<image height="15px" src="/common/img/axuda.gif" tooltip="limiting-resources-popup" />
</hbox>
<listbox mold="select" width="200px"

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

@ -35,7 +35,7 @@
<newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="ascending" />
<newdatasortablecolumn label="${i18n:_('Description')}" sort="auto(lower(description))" />
<newdatasortablecolumn label="${i18n:_('Code')}" sort="auto(lower(code))" />
<newdatasortablecolumn label="${i18n:_('Limiting')}" sort="auto(limitingResource)" width="90px"/>
<newdatasortablecolumn label="${i18n:_('Queue-based')}" sort="auto(limitingResource)" width="90px"/>
<newdatasortablecolumn label="${i18n:_('Operations')}" width="90px"/>
</columns>
</newdatasortablegrid>

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

@ -43,7 +43,7 @@
<datebox id="filterFinishDate" constraint = "@{controller.checkConstraintFinishDate}"/>
<!-- Limiting resource -->
<label value="${i18n:_('Limiting resource')}"/>
<label value="${i18n:_('Queue-based resource')}"/>
<listbox id="filterLimitingResource" mold="select" />
</hbox>
</groupbox>

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

@ -80,7 +80,7 @@
<textbox value="@{controller.worker.nif}" constraint="no empty"/>
</row>
<row visible="@{controller.isRealWorker}">
<hbox><label value="${i18n:_('Limiting resource')}" /><image height="15px" src="/common/img/axuda.gif" tooltip="limiting-resources-popup" />
<hbox><label value="${i18n:_('Queue-based resource')}" /><image height="15px" src="/common/img/axuda.gif" tooltip="limiting-resources-popup" />
</hbox>
<listbox mold="select" width="200px"
model="@{controller.limitingResourceOptionList}"

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

@ -36,7 +36,7 @@
<newdatasortablecolumn label="${i18n:_('First name')}" sort="auto(lower(firstName))" />
<newdatasortablecolumn label="${i18n:_('ID')}" sort="auto(nif)" />
<newdatasortablecolumn label="${i18n:_('Code')}"/>
<newdatasortablecolumn label="${i18n:_('Limiting')}" sort="auto(limitingResource)" width="90px"/>
<newdatasortablecolumn label="${i18n:_('Queue-based')}" sort="auto(limitingResource)" width="90px"/>
<newdatasortablecolumn label="${i18n:_('Operations')}" width="90px"/>
</columns>
</newdatasortablegrid>