From f353ae77c20d4f411afb0ce2fd2d538a910d8440 Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Wed, 25 Jul 2012 16:51:09 -0400 Subject: [PATCH] BUG 8529 Change "exists" to "exist" in many phrases SOLVED - Remember these grammar rules - Changed grammar rules as suggested. --- gulliver/system/class.dynaformhandler.php | 2 +- rbac/engine/classes/model/AuthenticationSource.php | 6 +++--- workflow/engine/classes/class.Installer.php | 2 +- workflow/engine/classes/class.archive.php | 4 ++-- workflow/engine/classes/class.replacementLogo.php | 2 +- workflow/engine/classes/class.wsTools.php | 4 ++-- workflow/engine/classes/model/AppCacheView.php | 6 +++--- workflow/engine/classes/model/AppFolder.php | 2 +- workflow/engine/classes/model/DashletInstance.php | 2 +- workflow/engine/classes/model/Gateway.php | 2 +- workflow/engine/classes/model/TaskUser.php | 2 +- .../engine/classes/triggers/class.pmSharepointFunctions.php | 2 +- workflow/engine/classes/triggers/class.pmTrZimbra.php | 2 +- workflow/engine/controllers/dashboard.php | 2 +- workflow/engine/methods/appFolder/appFolderAjax.php | 2 +- workflow/engine/methods/bpmn/saveProcess.php | 2 +- workflow/engine/methods/cases/caseNotesAjax.php | 2 +- workflow/engine/methods/cases/casesStartPage_Ajax.php | 2 +- workflow/engine/methods/setup/skin_Ajax.php | 4 ++-- workflow/engine/methods/setup/upgrade_SystemAjax.php | 2 +- .../xmlform/additionalTables/additionalTablesToImport.xml | 2 +- workflow/engine/xmlform/login/newSite.xml | 2 +- workflow/engine/xmlform/login/newSiteAdd.xml | 2 +- .../engine/xmlform/processes/processes_ImportExisting.xml | 2 +- .../xmlform/processes/processes_ImportExistingXpdl.xml | 2 +- .../engine/xmlform/processes/processes_ValidatingGroups.xml | 2 +- 26 files changed, 33 insertions(+), 33 deletions(-) diff --git a/gulliver/system/class.dynaformhandler.php b/gulliver/system/class.dynaformhandler.php index 794906e07..1d9610c15 100755 --- a/gulliver/system/class.dynaformhandler.php +++ b/gulliver/system/class.dynaformhandler.php @@ -469,7 +469,7 @@ class dynaFormHandler $xpath = new DOMXPath($this->dom); $nodeList = @$xpath->query("/dynaForm/$name"); if( ! $nodeList ){ - throw new Exception("Error trying get the field dynaform $name, maybe it doesn't exists in {$this->xmlfile}"); + throw new Exception("Error trying get the field dynaform $name, maybe it doesn't exist in {$this->xmlfile}"); } if( $nodeList->length == 0 ) { diff --git a/rbac/engine/classes/model/AuthenticationSource.php b/rbac/engine/classes/model/AuthenticationSource.php index 7bee5ea02..43d0c99de 100755 --- a/rbac/engine/classes/model/AuthenticationSource.php +++ b/rbac/engine/classes/model/AuthenticationSource.php @@ -43,7 +43,7 @@ class AuthenticationSource extends BaseAuthenticationSource { return $aFields; } else { - throw(new Exception('This row doesn\'t exists!')); + throw(new Exception('This row doesn\'t exist!')); } } catch (Exception $oError) { @@ -109,7 +109,7 @@ class AuthenticationSource extends BaseAuthenticationSource { } } else { - throw(new Exception('This row doesn\'t exists!')); + throw(new Exception('This row doesn\'t exist!')); } } catch (Exception $oError) { @@ -133,7 +133,7 @@ class AuthenticationSource extends BaseAuthenticationSource { return $iResult; } else { - throw(new Exception('This row doesn\'t exists!')); + throw(new Exception('This row doesn\'t exist!')); } } catch (Exception $oError) { diff --git a/workflow/engine/classes/class.Installer.php b/workflow/engine/classes/class.Installer.php index 1835ef21a..d945ecf2c 100755 --- a/workflow/engine/classes/class.Installer.php +++ b/workflow/engine/classes/class.Installer.php @@ -125,7 +125,7 @@ class Installer 'password'=>((trim($this->options['admin']['password'])=='')?false:true) ) ); - $result['name']['message'] = ($result['isset'])?'Workspace already exists':$result['name']['message']; + $result['name']['message'] = ($result['isset'])?'Workspace already exist':$result['name']['message']; $result['name']['status'] = ($result['isset'])?false:$result['name']['status']; //print_r($result); return Array( diff --git a/workflow/engine/classes/class.archive.php b/workflow/engine/classes/class.archive.php index b1c3dd69c..57d2b718d 100755 --- a/workflow/engine/classes/class.archive.php +++ b/workflow/engine/classes/class.archive.php @@ -83,7 +83,7 @@ class archive $pwd = getcwd(); chdir($this->options['basedir']); if ($this->options['overwrite'] == 0 && file_exists($this->options['name'] . ($this->options['type'] == "gzip" || $this->options['type'] == "bzip" ? ".tmp" : ""))){ - $this->error[] = "File {$this->options['name']} already exists."; + $this->error[] = "File {$this->options['name']} already exist."; chdir($pwd); return 0; } @@ -465,7 +465,7 @@ class tar_file extends archive mkdir($file['name'], 0775); } else if ($this->options['overwrite'] == 0 && file_exists($file['name'])){ - $this->error[] = "{$file['name']} already exists."; + $this->error[] = "{$file['name']} already exist."; continue; } else if ($file['type'] == 2){ diff --git a/workflow/engine/classes/class.replacementLogo.php b/workflow/engine/classes/class.replacementLogo.php index e430e6bbc..ffd1ec036 100755 --- a/workflow/engine/classes/class.replacementLogo.php +++ b/workflow/engine/classes/class.replacementLogo.php @@ -63,7 +63,7 @@ class replacementLogo { $infoupload = "Return Code: " . $errorfile . "
"; } else { if (file_exists ( $dirUpload . $namefile )) { - $infoupload = $namefile . " already exists. "; + $infoupload = $namefile . " already exist. "; } else { move_uploaded_file ( $tpnfile, $dirUpload . $namefile ); $infoupload = "Stored in: " . $dirUpload . $namefile; diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index e0193db26..20b214e84 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -1011,9 +1011,9 @@ class workspaceTools { $workspace = new workspaceTools($workspaceName); if ($workspace->workspaceExists()) if ($overwrite) - CLI::logging(CLI::warning("> Workspace $workspaceName already exists, overwriting!") . "\n"); + CLI::logging(CLI::warning("> Workspace $workspaceName already exist, overwriting!") . "\n"); else - throw new Exception("Destination workspace already exists (use -o to overwrite)"); + throw new Exception("Destination workspace already exist (use -o to overwrite)"); if (file_exists($workspace->path)) G::rm_dir($workspace->path); diff --git a/workflow/engine/classes/model/AppCacheView.php b/workflow/engine/classes/model/AppCacheView.php index 4d974a94d..8a017d8a6 100755 --- a/workflow/engine/classes/model/AppCacheView.php +++ b/workflow/engine/classes/model/AppCacheView.php @@ -1042,7 +1042,7 @@ class AppCacheView extends BaseAppCacheView $filenameSql = $this->pathToAppCacheFiles . 'app_cache_view_insert.sql'; if (!file_exists($filenameSql)) { - throw (new Exception("file app_cache_view_insert.sql doesn't exists ")); + throw (new Exception("file app_cache_view_insert.sql does not exist ")); } $sql = explode(';', file_get_contents($filenameSql)); @@ -1095,7 +1095,7 @@ class AppCacheView extends BaseAppCacheView $filenameSql = $this->pathToAppCacheFiles . 'triggerAppDelegationInsert.sql'; if (!file_exists($filenameSql)) { - throw (new Exception("file triggerAppDelegationInsert.sql doesn't exists ")); + throw (new Exception("file triggerAppDelegationInsert.sql does not exist ")); } $sql = file_get_contents($filenameSql); @@ -1142,7 +1142,7 @@ class AppCacheView extends BaseAppCacheView $filenameSql = $this->pathToAppCacheFiles . '/triggerAppDelegationUpdate.sql'; if (!file_exists($filenameSql)) { - throw (new Exception("file triggerAppDelegationUpdate.sql doesn't exists ")); + throw (new Exception("file triggerAppDelegationUpdate.sql does not exist ")); } $sql = file_get_contents($filenameSql); diff --git a/workflow/engine/classes/model/AppFolder.php b/workflow/engine/classes/model/AppFolder.php index c4b4baaa4..e55c6b98f 100755 --- a/workflow/engine/classes/model/AppFolder.php +++ b/workflow/engine/classes/model/AppFolder.php @@ -42,7 +42,7 @@ class AppFolder extends BaseAppFolder { $oDataset->next (); if ($aRow = $oDataset->getRow ()) {//Folder exist, then return the ID $response['success']=false; - $response['message']=$response['error']="Can't create folder
A folder with same name already exists.
$folderName"; + $response['message']=$response['error']="Can't create folder
A folder with same name already exist.
$folderName"; $response['folderUID']=$aRow ['FOLDER_UID']; //return ($aRow ['FOLDER_UID']); return ($response); diff --git a/workflow/engine/classes/model/DashletInstance.php b/workflow/engine/classes/model/DashletInstance.php index cd2922c37..faeb2cc62 100644 --- a/workflow/engine/classes/model/DashletInstance.php +++ b/workflow/engine/classes/model/DashletInstance.php @@ -95,7 +95,7 @@ class DashletInstance extends BaseDashletInstance { return $result; } else { - throw new Exception('Error trying to delete: The row "' . $dasInsUid. '" not exists.'); + throw new Exception('Error trying to delete: The row "' . $dasInsUid. '" does not exist.'); } } catch (Exception $error) { diff --git a/workflow/engine/classes/model/Gateway.php b/workflow/engine/classes/model/Gateway.php index 553b07a12..b7f77bce9 100755 --- a/workflow/engine/classes/model/Gateway.php +++ b/workflow/engine/classes/model/Gateway.php @@ -110,7 +110,7 @@ class Gateway extends BaseGateway { return true; } else { - throw(new Exception('This row doesn\'t exists!')); + throw(new Exception('This row does not exist!')); } } catch (Exception $oError) { diff --git a/workflow/engine/classes/model/TaskUser.php b/workflow/engine/classes/model/TaskUser.php index 27f6a2dc1..7b19d9c22 100755 --- a/workflow/engine/classes/model/TaskUser.php +++ b/workflow/engine/classes/model/TaskUser.php @@ -96,7 +96,7 @@ class TaskUser extends BaseTaskUser { return $iResult; } else { - throw(new Exception('This row doesn\'t exists!')); + throw(new Exception('This row does not exist!')); } } catch (Exception $oError) { diff --git a/workflow/engine/classes/triggers/class.pmSharepointFunctions.php b/workflow/engine/classes/triggers/class.pmSharepointFunctions.php index 01e8bc4ab..f56b6e0b4 100755 --- a/workflow/engine/classes/triggers/class.pmSharepointFunctions.php +++ b/workflow/engine/classes/triggers/class.pmSharepointFunctions.php @@ -281,7 +281,7 @@ function getDWSFolderItems($sharepointServer, $auth,$dwsname, $strFolderUrl) { if(isset($result)) return $result; else - return "Folder does not exists"; + return "Folder does not exist"; } /** diff --git a/workflow/engine/classes/triggers/class.pmTrZimbra.php b/workflow/engine/classes/triggers/class.pmTrZimbra.php index 3c8f8fb23..f78812b40 100644 --- a/workflow/engine/classes/triggers/class.pmTrZimbra.php +++ b/workflow/engine/classes/triggers/class.pmTrZimbra.php @@ -192,7 +192,7 @@ function createZimbraFolder($ServerUrl, $username, $preAuthKey, $folderName, $co if ($sXmlArray) { return "Folder Created succesfully"; } else { - return "A folder with name " . $folderName . " already exists."; + return "A folder with name " . $folderName . " already exist."; } } diff --git a/workflow/engine/controllers/dashboard.php b/workflow/engine/controllers/dashboard.php index ef445479a..6c2ed5f7c 100644 --- a/workflow/engine/controllers/dashboard.php +++ b/workflow/engine/controllers/dashboard.php @@ -183,7 +183,7 @@ class Dashboard extends Controller { $result->additionalFields = PMDashlet::getAdditionalFields($dashletFields['DAS_CLASS']); } else { - throw new Exception('Dashlet "' . $data->DAS_UID . '" not exists.'); + throw new Exception('Dashlet "' . $data->DAS_UID . '" does not exist.'); } } catch (Exception $error) { diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php index 0270970af..77dec527b 100755 --- a/workflow/engine/methods/appFolder/appFolderAjax.php +++ b/workflow/engine/methods/appFolder/appFolderAjax.php @@ -8,7 +8,7 @@ if (! isset ($_REQUEST ['action'])) { } if (! function_exists ($_REQUEST ['action'])) { $res ['success'] = false; - $res ['message'] = 'The requested action doesn\'t exists'; + $res ['message'] = 'The requested action does not exist'; print G::json_encode ($res); die (); } diff --git a/workflow/engine/methods/bpmn/saveProcess.php b/workflow/engine/methods/bpmn/saveProcess.php index 9bab89e25..058ac06eb 100755 --- a/workflow/engine/methods/bpmn/saveProcess.php +++ b/workflow/engine/methods/bpmn/saveProcess.php @@ -38,7 +38,7 @@ try{ else{ $result = array(); $result['status_code'] = $idProcess; - $result['message'] = "the process don't exists"; + $result['message'] = "the process does not exist"; $result['timestamp'] = date('Y-m-d H:i:s'); echo G::json_encode($result); die; diff --git a/workflow/engine/methods/cases/caseNotesAjax.php b/workflow/engine/methods/cases/caseNotesAjax.php index 70a2fd4b3..b896d5ac0 100755 --- a/workflow/engine/methods/cases/caseNotesAjax.php +++ b/workflow/engine/methods/cases/caseNotesAjax.php @@ -7,7 +7,7 @@ if (!isset($_REQUEST ['action'])) { } if (!function_exists($_REQUEST ['action'])) { $res ['success'] = 'failure'; - $res ['message'] = 'The requested action doesn\'t exists'; + $res ['message'] = 'The requested action does not exist'; header("Content-Type: application/json"); print G::json_encode($res); die (); diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php index acdaf858a..cbca42565 100755 --- a/workflow/engine/methods/cases/casesStartPage_Ajax.php +++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php @@ -8,7 +8,7 @@ if (! isset ( $_REQUEST ['action'] )) { } if (! function_exists ( $_REQUEST ['action'] )) { $res ['success'] = 'failure'; - $res ['message'] = 'The requested action doesn\'t exists'; + $res ['message'] = 'The requested action does not exist'; print G::json_encode ( $res ); die (); } diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php index 75e9d1df2..211d93ce3 100755 --- a/workflow/engine/methods/setup/skin_Ajax.php +++ b/workflow/engine/methods/setup/skin_Ajax.php @@ -9,7 +9,7 @@ if (!isset($_REQUEST ['action'])) { } if (!function_exists($_REQUEST ['action'])) { $res ['success'] = false; - $res ['error']=$res ['message'] = 'The requested action doesn\'t exists'; + $res ['error']=$res ['message'] = 'The requested action does not exist'; print G::json_encode($res); die (); @@ -17,7 +17,7 @@ if (!function_exists($_REQUEST ['action'])) { $restrictedFunctions=array('copy_skin_folder','addTarFolder'); if (in_array($_REQUEST ['action'],$restrictedFunctions)) { $res ['success'] = false; - $res ['error']=$res ['message'] = 'The requested action doesn\'t exists *'; + $res ['error']=$res ['message'] = 'The requested action does not exist *'; print G::json_encode($res); die (); } diff --git a/workflow/engine/methods/setup/upgrade_SystemAjax.php b/workflow/engine/methods/setup/upgrade_SystemAjax.php index 3a5672e58..7fa78bb32 100755 --- a/workflow/engine/methods/setup/upgrade_SystemAjax.php +++ b/workflow/engine/methods/setup/upgrade_SystemAjax.php @@ -172,7 +172,7 @@ function processSchemaFile( ) { $oDataBase = new database($DB_ADAPTER, $DB_HOST, $DB_USER, $DB_PASS, $DB_NAME); if ( !$oDataBase->isConnected() ) { - $oDataBase->logQuery ('Not exists an available connection!'); + $oDataBase->logQuery ('Does not exist an available connection!'); return NULL; } diff --git a/workflow/engine/xmlform/additionalTables/additionalTablesToImport.xml b/workflow/engine/xmlform/additionalTables/additionalTablesToImport.xml index 45b471d3f..7f4394e62 100755 --- a/workflow/engine/xmlform/additionalTables/additionalTablesToImport.xml +++ b/workflow/engine/xmlform/additionalTables/additionalTablesToImport.xml @@ -14,7 +14,7 @@ - Overwrite if exists + Overwrite if exist diff --git a/workflow/engine/xmlform/login/newSite.xml b/workflow/engine/xmlform/login/newSite.xml index 8f10c19b3..02a6a4f53 100755 --- a/workflow/engine/xmlform/login/newSite.xml +++ b/workflow/engine/xmlform/login/newSite.xml @@ -19,7 +19,7 @@ Report Database: - Drop database if exists + Drop database if exist Workspace Administrator diff --git a/workflow/engine/xmlform/login/newSiteAdd.xml b/workflow/engine/xmlform/login/newSiteAdd.xml index fcb933bfa..d10fd23e9 100755 --- a/workflow/engine/xmlform/login/newSiteAdd.xml +++ b/workflow/engine/xmlform/login/newSiteAdd.xml @@ -19,7 +19,7 @@ Report Database: - Drop database if exists + Drop database if exist Workspace Administrator diff --git a/workflow/engine/xmlform/processes/processes_ImportExisting.xml b/workflow/engine/xmlform/processes/processes_ImportExisting.xml index fd0941fc6..9450f9e22 100755 --- a/workflow/engine/xmlform/processes/processes_ImportExisting.xml +++ b/workflow/engine/xmlform/processes/processes_ImportExisting.xml @@ -7,7 +7,7 @@ - The process you are trying to import already exists. Please select one of the following options to continue: + The process you are trying to import already exist. Please select one of the following options to continue: diff --git a/workflow/engine/xmlform/processes/processes_ImportExistingXpdl.xml b/workflow/engine/xmlform/processes/processes_ImportExistingXpdl.xml index 4b8110182..756497af6 100755 --- a/workflow/engine/xmlform/processes/processes_ImportExistingXpdl.xml +++ b/workflow/engine/xmlform/processes/processes_ImportExistingXpdl.xml @@ -7,7 +7,7 @@ - The process you are trying to import already exists. Please select one of the following options to continue: + The process you are trying to import already exist. Please select one of the following options to continue: diff --git a/workflow/engine/xmlform/processes/processes_ValidatingGroups.xml b/workflow/engine/xmlform/processes/processes_ValidatingGroups.xml index 4fc1cfead..c18449671 100755 --- a/workflow/engine/xmlform/processes/processes_ValidatingGroups.xml +++ b/workflow/engine/xmlform/processes/processes_ValidatingGroups.xml @@ -7,7 +7,7 @@ - Some of the groups that are you trying to import, already exists. Please select one of the following options to continue: + Some of the groups that are you trying to import, already exist. Please select one of the following options to continue: