From c20125b286fa3221d1095665f428caa8366a72fe Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 4 Jul 2012 17:59:41 +0200
Subject: [PATCH] i18n: Translate options in worker edition

FEA: ItEr76S04BugFixing
---
 .../web/resources/worker/WorkerCRUDController.java         | 7 -------
 .../src/main/webapp/resources/machine/_editMachine.zul     | 2 +-
 .../src/main/webapp/resources/search/_resourceFilter.zul   | 2 +-
 .../src/main/webapp/resources/worker/_edition.zul          | 2 +-
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java
index 1ebd4e899..b255f4177 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/worker/WorkerCRUDController.java
@@ -850,13 +850,6 @@ public class WorkerCRUDController extends GenericForwardComposer implements
         LIMITING_RESOURCE(_("Queue-based resource")),
         NON_LIMITING_RESOURCE(_("Normal resource"));
 
-        /**
-         * Forces to mark the string as needing translation
-         */
-        private static String _(String string) {
-            return string;
-        }
-
         private String option;
 
         private LimitingResourceEnum(String option) {
diff --git a/libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul b/libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul
index 16228d6ee..5439c592a 100644
--- a/libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul
+++ b/libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul
@@ -65,7 +65,7 @@
                         </row>
                         <row>
                             <hbox>
-                                <label value="${i18n:_('Queue-based resource')}" />
+                                <label value="${i18n:_('Type')}" />
                                 <image height="15px" src="/common/img/axuda.gif" tooltip="limiting-resources-popup" />
                             </hbox>
                             <listbox mold="select" width="200px"
diff --git a/libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul b/libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul
index d0c4d4931..be7e745b3 100644
--- a/libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul
+++ b/libreplan-webapp/src/main/webapp/resources/search/_resourceFilter.zul
@@ -43,7 +43,7 @@
     <datebox id="filterFinishDate" constraint = "@{controller.checkConstraintFinishDate}"/>
 
     <!-- Limiting resource -->
-    <label value="${i18n:_('Queue-based resource')}"/>
+    <label value="${i18n:_('Type')}"/>
     <listbox id="filterLimitingResource" mold="select" />
     </hbox>
       </groupbox>
diff --git a/libreplan-webapp/src/main/webapp/resources/worker/_edition.zul b/libreplan-webapp/src/main/webapp/resources/worker/_edition.zul
index 75b2ed780..0b83c51a5 100644
--- a/libreplan-webapp/src/main/webapp/resources/worker/_edition.zul
+++ b/libreplan-webapp/src/main/webapp/resources/worker/_edition.zul
@@ -80,7 +80,7 @@
                                 <textbox value="@{controller.worker.nif}" constraint="no empty"/>
                             </row>
                             <row visible="@{controller.isRealWorker}">
-                                <hbox><label value="${i18n:_('Queue-based resource')}" /><image height="15px" src="/common/img/axuda.gif" tooltip="limiting-resources-popup" />
+                                <hbox><label value="${i18n:_('Type')}" /><image height="15px" src="/common/img/axuda.gif" tooltip="limiting-resources-popup" />
                                 </hbox>
                                 <listbox mold="select" width="200px"
                                     model="@{controller.limitingResourceOptionList}"