Merged in julceslau/processmaker (pull request #1116)

PM-819 Falta traducir varios textos al espanol SOLVED

workflow/engine/classes/class.processMap.php

@@ -3332,7 +3332,7 @@ class processMap
                 'LA_PRO_UID' => $aRow['PRO_UID'],
                 'LA_USR_UID' => $aRow['USR_UID'],
                 'LA_PU_NAME' => $aRow['GRP_TITLE'],
-                'LA_PU_TYPE_NAME' => 'Group');
+                'LA_PU_TYPE_NAME' => G::LoadTranslation('ID_GROUP'));
             $oDataset->next();
         }
 
@@ -3359,7 +3359,7 @@ class processMap
                 'LA_PRO_UID' => $aRow['PRO_UID'],
                 'LA_USR_UID' => $aRow['USR_UID'],
                 'LA_PU_NAME' => $aRow['USR_FIRSTNAME'] . ' ' . $aRow['USR_LASTNAME'],
-                'LA_PU_TYPE_NAME' => 'User');
+                'LA_PU_TYPE_NAME' => G::LoadTranslation('ID_USER'));
             $oDataset->next();
         }
 
@@ -3407,6 +3407,7 @@ class processMap
                 'UID' => 'char',
                 'USER_GROUP' => 'char',
                 'TYPE_UID' => 'char',
+                'TYPE_UID_LABEL' => 'char',
                 'PRO_UID' => 'char')
         );
         $oCriteria = new Criteria('workflow');
@@ -3429,6 +3430,7 @@ class processMap
             $aRespLi[] = array('UID' => $aRow['GRP_UID'],
                 'USER_GROUP' => $aRow['GRP_TITLE'],
                 'TYPE_UID' => 'Group',
+                'TYPE_UID_LABEL' => G::LoadTranslation('ID_GROUP'),
                 'PRO_UID' => $sProcessUID);
             $oDataset->next();
         }
@@ -3475,6 +3477,7 @@ class processMap
             $aRespLi[] = array('UID' => $aRow['USR_UID'],
                 'USER_GROUP' => $aRow['USR_FIRSTNAME'] . ' ' . $aRow['USR_LASTNAME'],
                 'TYPE_UID' => 'User',
+                'TYPE_UID_LABEL' => G::LoadTranslation('ID_USER'),
                 'PRO_UID' => $sProcessUID);
             $oDataset->next();
         }
@@ -3664,8 +3667,13 @@ class processMap
             }
             //Obtain action (permission)
             $sAction = G::LoadTranslation('ID_' . $aRow['OP_ACTION']);
+            if ($aRow['OP_CASE_STATUS'] == '') {
+                $sStatus = G::LoadTranslation('ID_ALL');
+            } else {
+                $sStatus = G::LoadTranslation('ID_' . $aRow['OP_CASE_STATUS']);
+            }
             //Add to array
-            $aObjectsPermissions[] = array('OP_UID' => $aRow['OP_UID'], 'TASK_TARGET' => $sTaskTarget, 'GROUP_USER' => $sUserGroup, 'TASK_SOURCE' => $sTaskSource, 'OBJECT_TYPE' => $sObjectType, 'OBJECT' => $sObject, 'PARTICIPATED' => $sParticipated, 'ACTION' => $sAction, 'OP_CASE_STATUS' => $aRow['OP_CASE_STATUS']);
+            $aObjectsPermissions[] = array('OP_UID' => $aRow['OP_UID'], 'TASK_TARGET' => $sTaskTarget, 'GROUP_USER' => $sUserGroup, 'TASK_SOURCE' => $sTaskSource, 'OBJECT_TYPE' => $sObjectType, 'OBJECT' => $sObject, 'PARTICIPATED' => $sParticipated, 'ACTION' => $sAction, 'OP_CASE_STATUS' => $sStatus);
             $oDataset->next();
         }
         global $_DBArray;
@@ -3813,8 +3821,13 @@ class processMap
             }
             //Obtain action (permission)
             $sAction = G::LoadTranslation('ID_' . $aRow['OP_ACTION']);
+            if ($aRow['OP_CASE_STATUS'] == '') {
+                $sStatus = G::LoadTranslation('ID_ALL');
+            } else {
+                $sStatus = G::LoadTranslation('ID_' . $aRow['OP_CASE_STATUS']);
+            }
             //Add to array
-            $aObjectsPermissions[] = array('OP_UID' => $aRow['OP_UID'], 'TASK_TARGET' => $sTaskTarget, 'GROUP_USER' => $sUserGroup, 'TASK_SOURCE' => $sTaskSource, 'OBJECT_TYPE' => $sObjectType, 'OBJECT' => $sObject, 'PARTICIPATED' => $sParticipated, 'ACTION' => $sAction, 'OP_CASE_STATUS' => $aRow['OP_CASE_STATUS']);
+            $aObjectsPermissions[] = array('OP_UID' => $aRow['OP_UID'], 'TASK_TARGET' => $sTaskTarget, 'GROUP_USER' => $sUserGroup, 'TASK_SOURCE' => $sTaskSource, 'OBJECT_TYPE' => $sObjectType, 'OBJECT' => $sObject, 'PARTICIPATED' => $sParticipated, 'ACTION' => $sAction, 'OP_CASE_STATUS' => $sStatus);
             $oDataset->next();
         }
         return $aObjectsPermissions;
@@ -6148,7 +6161,7 @@ class processMap
     }
 
     /**
-     * listProcessesUser for Extjs
+     * listExtProcessesSupervisors for Extjs
      *
      * @param string $sProcessUID
      * @return array(aProcessUser) $aProcessUser

workflow/engine/methods/events/eventsEditAction.php

@@ -247,7 +247,7 @@ function setLabels () {
         'LABEL_ADD_USERS'   => G::LoadTranslation( 'ID_EVENT_ADD_USERS' ),
         'LABEL_REMOVED_SELECTED'    => G::LoadTranslation( 'ID_EVENT_REMOVE_SELECTED' ),
         'LABEL_ADD_DYNAVAR' => G::LoadTranslation( 'ID_EVENT_ADD_DYNAVAR' ),
-        'LABEL_ADD_GROUPS'  => G::LoadTranslation( 'ID_EVENT_ADD_GROUPS' )
+        'LABEL_ADD_GROUPS'  => G::LoadTranslation( 'ID_EVENT_ADD_GROUP' )
     );
     return $labels;
 }

workflow/engine/methods/events/eventsSetupGraph.php

@@ -151,7 +151,7 @@ function drawTimerEvent ($im, $x1, $y1, $h)
 imageline( $im, 15, $h - 19, $w - 15, $h - 19, $red );
 imageline( $im, $w - 23, $h - 23, $w - 15, $h - 19, $red );
 imageline( $im, $w - 23, $h - 15, $w - 15, $h - 19, $red );
-imagestring( $im, 2, $w - 30, $h - 37, G::LoadTranslation('ID_DAYS'), $red );
+imagestring( $im, 2, $w - 30, $h - 37, utf8_decode(G::LoadTranslation('ID_DAYS')), $red );
 
 if ($estimated == 0) {
     $s = 'i';

workflow/engine/templates/pmTables/data.js

@@ -78,7 +78,7 @@ Ext.onReady(function(){
 
   appUidSearch = new Ext.form.Checkbox ({
 	  id: 'appUidSearch',
-      boxLabel : 'Search also in the APP_UID field'
+      boxLabel : _('ID_SEARCH_ALSO_APP_UID')
   });
 
   contextMenu = new Ext.menu.Menu({

workflow/engine/templates/setup/cron.js

@@ -70,7 +70,6 @@ cron.application = {
                 var formItems = Ext.getCmp("frmLogView").form.items;
                 formItems.items[0].setValue(strData);
 
-                winLog.setTitle("Log - " + _("ID_WORKSPACE") + " " + record.get("WORKSPACE"));
                 winLog.show();
             }
         }
@@ -260,6 +259,14 @@ cron.application = {
             items: ["-", _("ID_PAGE_SIZE") + " ", cboPageSize]
         });
 
+        var renderStatus = function(val) {
+            if (val == 'action') {
+                return _('ID_COMPLETED');
+            } else {
+                return _('ID_FAILED');
+            }
+        };
+
         var cmodel = new Ext.grid.ColumnModel({
             defaults: {
                 width: 50,
@@ -270,7 +277,7 @@ cron.application = {
                 {id: "ID", dataIndex: "DATE", hidden: true, hideable: false},
                 {header: _("ID_DATE_LABEL"), dataIndex: "DATE", width: 10, align: "center"},
                 {header: _("ID_ACTION"), dataIndex: "ACTION", width: 10},
-                {header: _("ID_STATUS"), dataIndex: "STATUS", width: 7, align: "center"},
+                {header: _("ID_STATUS"), dataIndex: "STATUS", width: 7, align: "center", renderer: renderStatus},
                 {header: _("ID_DESCRIPTION"), dataIndex: "DESCRIPTION"}
             ]
         });

workflow/engine/xmlform/cases/cases_Scheduler_Edit.html

@@ -109,7 +109,7 @@
                 <table id="startTime" border="0" style="width: 100%">
                     <tr>
                         <td class="FormLabel" width="{$form_labelWidth}"><font color="red">*  </font> {$SCH_START_TIME}</td>
-                        <td class="FormFieldContent">{$form.SCH_START_TIME} format 24 hrs. (HH:MM) </td>
+                        <td class="FormFieldContent">{$form.SCH_START_TIME} {php}echo (G::LoadTranslation('ID_FORMAT_24_HOURS'));{/php} </td>
                     </tr>
                 </table>
                 </td>
@@ -119,7 +119,7 @@
                 <table id="everyTime" border="0" style="width: 100%">
                     <tr>
                         <td class="FormLabel" width="{$form_labelWidth}"><font color="red">*  </font> {$SCH_REPEAT_EVERY}</td>
-                        <td class="FormFieldContent">{$form.SCH_REPEAT_EVERY} hour(s). </td>
+                        <td class="FormFieldContent">{$form.SCH_REPEAT_EVERY} {php}echo (G::LoadTranslation('ID_HOUR_HOURS'));{/php} </td>
                     </tr>
                 </table>
                 </td>

workflow/engine/xmlform/cases/cases_Scheduler_New.html

@@ -92,8 +92,8 @@
                 <td  colspan="2" align="center">
                 <table id="startTime" border="0">
                     <tr>
-                        <td class="FormLabel" width="{$form_labelWidth}"><font color="red">*  </font> {$SCH_START_TIME}</td>
-                        <td class="FormFieldContent">{$form.SCH_START_TIME} format 24 hrs. (HH:MM) </td>
+                        <td class="FormLabel" ><font color="red">*  </font> {$SCH_START_TIME}</td>
+                        <td class="FormFieldContent">{$form.SCH_START_TIME} {php}echo (G::LoadTranslation('ID_FORMAT_24_HOURS'));{/php} </td>
                     </tr>
                 </table>
                 </td>
@@ -103,12 +103,12 @@
                 <table id="everyTime" border="0" style="width: 100%">
                     <tr>
                         <td class="FormLabel" width="{$form_labelWidth}"><font color="red">* </font> {$SCH_REPEAT_EVERY}</td>
-                        <td class="FormFieldContent">{$form.SCH_REPEAT_EVERY} Hour(s). </td>
+                        <td class="FormFieldContent">{$form.SCH_REPEAT_EVERY} {php}echo (G::LoadTranslation('ID_HOUR_HOURS'));{/php} </td>
                     </tr>
                 </table>
                 </td>
               </tr>
-              
+
               <tr>
               <td class="FormSubTitle" colspan="2" id="form[SELECT_DATE]" align="">
                 <span>{$form.SELECT_DATE}</span>

workflow/engine/xmlform/processes/processes_EditObjectPermission.xml

@@ -9,11 +9,11 @@
 
 <OP_CASE_STATUS type="dropdown" mode="edit">
   <en>Status Case
-  <option name="ALL">ALL</option>
-  <option name="DRAFT">DRAFT</option>
-  <option name="TO_DO">TO_DO</option>
-  <option name="PAUSED">PAUSED</option>
-  <option name="COMPLETED">COMPLETED</option>
+  <option name="ALL">All</option>
+  <option name="DRAFT">Draft</option>
+  <option name="TO_DO">To Do</option>
+  <option name="PAUSED">Paused</option>
+  <option name="COMPLETED">Completed</option>
   </en>
 </OP_CASE_STATUS>
 

workflow/engine/xmlform/processes/processes_NewObjectPermission.xml

@@ -10,10 +10,10 @@
 <OP_CASE_STATUS type="dropdown" mode="edit">
   <en>Status Case
   <option name="ALL">All</option>
-  <option name="DRAFT">DRAFT</option>
-  <option name="TO_DO">TO DO</option>
-  <option name="PAUSED">PAUSED</option>
-  <option name="COMPLETED">COMPLETED</option>
+  <option name="DRAFT">Draft</option>
+  <option name="TO_DO">To Do</option>
+  <option name="PAUSED">Paused</option>
+  <option name="COMPLETED">Completed</option>
   </en>
 </OP_CASE_STATUS>
 

workflow/engine/xmlform/processes/processes_availableProcessesUser.xml

@@ -2,11 +2,12 @@
 <dynaForm type="pagetable" menu="processes/processes_availableProcessesUserOptions" searchBy="USER_GROUP" sqlConnection="" rowsPerPage="10">
   <PRO_UID type="hidden" showInTable="0"/>
   <UID type="hidden" showInTable="0"/>
+  <TYPE_UID type="hidden" showInTable="0"/>
   <USER_GROUP type="text" titlealign="left" colWidth="150">
     <en><![CDATA[User or Group]]></en>
   </USER_GROUP>
-  <TYPE_UID type="text" align="right" colWidth="80">
+  <TYPE_UID_LABEL type="text" align="right" colWidth="80">
     <en><![CDATA[Type]]></en>
-  </TYPE_UID>
+  </TYPE_UID_LABEL>
   <ASSIGN type="link" colWidth="40" value="@G::LoadTranslation(ID_ASSIGN)" link="#" onclick="assignProcessUser(@QPRO_UID, @QUID, @QTYPE_UID);return false;"/>
 </dynaForm>

workflow/engine/xmlform/tracker/tracker_objectsList.xml

@@ -7,8 +7,8 @@
   <CTO_TITLE type="text" colWidth="300" titleAlign="left" align="left">
     <en><![CDATA[Title]]></en>
   </CTO_TITLE>
-  <CTO_TYPE_OBJ type="text" colWidth="300" titleAlign="left" align="left">
-    <en><![CDATA[Type]]></en>
+  <CTO_TYPE_OBJ type="dropdown">
+    <en><![CDATA[Type]]><option name="DYNAFORM"><![CDATA[Dynaform]]></option><option name="INPUT_DOCUMENT"><![CDATA[Input Document]]></option><option name="OUTPUT_DOCUMENT"><![CDATA[Output Document]]></option></en>
   </CTO_TYPE_OBJ>
   <CONDITION type="link" colWidth="40" value="@G::LoadTranslation(ID_CONDITION)" link="#" onclick="conditionCaseTrackerObject(@QCTO_UID);return false;"/>
   <UP type="link" colWidth="20" value="@G::LoadTranslation(ID_UP)" link="#" onclick="upCaseTrackerObject(@QCTO_UID, @QPRO_UID, @QCTO_POSITION);return false;"/>