fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #1928 from norahmollo/master

Browse Source 
UnassignedMessage translation added
This commit is contained in:
julceslauhub
2013-07-25 11:59:30 -07:00
parent 721ae3f9d1 9e5319570a
commit d07b3a6519
4 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.case.php
View File

@@ -4920,10 +4920,10 @@ class Cases
case "SELF_SERVICE":
if ($swtplDefault == 1) {
G::verifyPath($pathEmail, true); //Create if it does not exist
$fileTemplate = $pathEmail . "unassignedMessage.html";
$fileTemplate = $pathEmail . G::LoadTranslation('ID_UNASSIGNED_MESSAGE');
if (!file_exists($fileTemplate)) {
@copy(PATH_TPL . "mails" . PATH_SEP . "unassignedMessage.html", $fileTemplate);
@copy(PATH_TPL . "mails" . PATH_SEP . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'), $fileTemplate);
}
$sBody = G::replaceDataField(file_get_contents($fileTemplate), $aFields);

11
workflow/engine/classes/class.processes.php
View File

@@ -3866,7 +3866,11 @@ class Processes
}
if (! file_exists( $dir . "unassignedMessage.html" )) {
@copy( PATH_TPL . "mails" . PATH_SEP . "unassignedMessage.html", $dir . "unassignedMessage.html" );
if (defined('PARTNER_FLAG')) {
@copy( PATH_TPL . "mails" . PATH_SEP . "unassignedMessagePartner.html", $dir . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'));
} else {
@copy( PATH_TPL . "mails" . PATH_SEP . "unassignedMessage.html", $dir . G::LoadTranslation('ID_UNASSIGNED_MESSAGE'));
}
}
$files = glob( $dir . "*.*" );
@@ -3874,9 +3878,8 @@ class Processes
foreach ($files as $file) {
$fileName = basename( $file );
if ($fileName != "alert_message.html" && $fileName != "unassignedMessage.html") {
$filesList[] = array ("filepath" => $file,"filename" => $fileName
);
if ($fileName != "alert_message.html" && $fileName != G::LoadTranslation('ID_UNASSIGNED_MESSAGE')) {
$filesList[] = array ("filepath" => $file,"filename" => $fileName);
}
}
return $filesList;