fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GI-158 Implement multilanguage labels

Browse Source
This commit is contained in:
Dante
2015-12-09 11:18:05 -04:00
parent 81f3e3e589
commit 7406a46264
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.labelsGmail.php
View File

@@ -11,7 +11,7 @@ class labelsGmail
$labels = array_merge($labels, $labelsResponse->getLabels()); $labels = array_merge($labels, $labelsResponse->getLabels());
} }
} catch (Exception $e) { } catch (Exception $e) {
print 'An error occurred: ' . $e->getMessage(); print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage();
} }
return $labels; return $labels;
} }
@@ -33,7 +33,7 @@ class labelsGmail
try { try {
$message = $service->users_messages->modify($userId, $messageId, $mods); $message = $service->users_messages->modify($userId, $messageId, $mods);
} catch (Exception $e) { } catch (Exception $e) {
print 'An error occurred: ' . $e->getMessage(); print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage();
} }
} }
@@ -62,7 +62,7 @@ class labelsGmail
$messages = array_merge($messages, $messagesResponse->getMessages()); $messages = array_merge($messages, $messagesResponse->getMessages());
} }
} catch (Exception $e) { } catch (Exception $e) {
print 'An error occurred: ' . $e->getMessage(); print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage();
} }
} while ($pageToken); } while ($pageToken);
@@ -248,7 +248,7 @@ class labelsGmail
try { try {
$service->users_labels->delete($user, $labelId); $service->users_labels->delete($user, $labelId);
} catch (Exception $e) { } catch (Exception $e) {
error_log('An error deleting gmail labels occurred: '.$e->getMessage()); error_log(G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage());
} }
} }

12
workflow/engine/classes/class.pmDrive.php
View File

@@ -144,7 +144,7 @@ class PMDrive extends PMGoogleApi
$createdFolder = $service->files->insert($file); $createdFolder = $service->files->insert($file);
} catch (Exception $e) { } catch (Exception $e) {
$createdFolder = null; $createdFolder = null;
error_log ( "An error occurred: " . $e->getMessage()); error_log ( G::LoadTranslation("ID_MSG_AJAX_FAILURE") . $e->getMessage());
} }
return $createdFolder; return $createdFolder;
} }
@@ -187,7 +187,7 @@ class PMDrive extends PMGoogleApi
); );
} catch (Exception $e) { } catch (Exception $e) {
error_log( "An error occurred: " . $e->getMessage()); error_log( G::LoadTranslation("ID_MSG_AJAX_FAILURE") . $e->getMessage());
} }
return $createdFile; return $createdFile;
} }
@@ -220,13 +220,13 @@ class PMDrive extends PMGoogleApi
if ($httpRequest->getResponseHttpCode() == 200) { if ($httpRequest->getResponseHttpCode() == 200) {
$response = $httpRequest->getResponseBody(); $response = $httpRequest->getResponseBody();
} else { } else {
error_log( "An error occurred. "); error_log(G::LoadTranslation("ID_MSG_AJAX_FAILURE"));
} }
} else { } else {
error_log( "The file doesn't have any content stored on Drive."); error_log(G::LoadTranslation("ID_PMDRIVE_NO_CONTENT_IN_FILE"));
} }
} catch (Exception $e) { } catch (Exception $e) {
error_log( "An error occurred: " . $e->getMessage()); error_log( G::LoadTranslation("ID_MSG_AJAX_FAILURE") . $e->getMessage());
} }
return $response; return $response;
} }
@@ -262,7 +262,7 @@ class PMDrive extends PMGoogleApi
); );
} catch (Exception $e) { } catch (Exception $e) {
error_log('permission error: ' . $e->getMessage()); error_log(G::LoadTranslation("ID_MSG_AJAX_FAILURE") . $e->getMessage());
} }
return $permission; return $permission;
} }

2
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -2469,7 +2469,7 @@ class Cases
} }
if (count($processList) == 0) { if (count($processList) == 0) {
$processList['success'] = 'failure'; $processList['success'] = 'failure';
$processList['message'] = G::LoadTranslation('ID_USER_PROCESS_NOT_START'); $processList['message'] = G::LoadTranslation('ID_NOT_HAVE_BOOKMARKED_PROCESSES');
} }
return $processList; return $processList;