From 947c97de5a21a35ed7688f1637486924628feecc Mon Sep 17 00:00:00 2001 From: Chris Coleman Date: Tue, 21 Mar 2017 22:01:42 -0400 Subject: [PATCH 1/3] Add language string for Failed to Connect error. --- language/en-GB/en-GB.com_advancedopenportal.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/language/en-GB/en-GB.com_advancedopenportal.ini b/language/en-GB/en-GB.com_advancedopenportal.ini index 443d3f6..aca96e4 100755 --- a/language/en-GB/en-GB.com_advancedopenportal.ini +++ b/language/en-GB/en-GB.com_advancedopenportal.ini @@ -32,4 +32,5 @@ COM_ADVANCEDOPENPORTAL_CASE_CREATED_BY='Raised by' COM_ADVANCEDOPENPORTAL_RAISED='Raised by' COM_ADVANCEDOPENPORTAL_RAISED_ON='on' COM_ADVANCEDOPENPORTAL_OWN_CASES='My cases' -COM_ADVANCEDOPENPORTAL_SEARCH='Search' \ No newline at end of file +COM_ADVANCEDOPENPORTAL_SEARCH='Search' +COM_ADVANCEDOPENPORTAL_ERROR_CONNECT="Failed to connect to SuiteCRM. Please check your Joomla Admin, Components, Advanced Open Portal, Settings." From 3d51c07bdf43489526053f27689c8a79bd9f0672 Mon Sep 17 00:00:00 2001 From: Chris Coleman Date: Tue, 21 Mar 2017 22:30:51 -0400 Subject: [PATCH 2/3] Use language string for Connect Error message. #12 (#1) --- site/models/SugarCasesConnection.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/models/SugarCasesConnection.php b/site/models/SugarCasesConnection.php index deea130..9e60d3e 100755 --- a/site/models/SugarCasesConnection.php +++ b/site/models/SugarCasesConnection.php @@ -42,7 +42,7 @@ public function __construct() { $this->cache = & JFactory::getCache(); $this->cache->setCaching( 1 ); if(!$this->restClient->login()){ - throw new Exception("Failed to connect to sugar. Please check your settings."); + throw new Exception(JText::_('COM_ADVANCEDOPENPORTAL_ERROR_CONNECT')); } } @@ -308,4 +308,4 @@ public function updateOrCreateContact($sugarId,$user){ return $res; } -} \ No newline at end of file +} From f3b91a3b1de33d58679ecc1496fada390df2c599 Mon Sep 17 00:00:00 2001 From: Chris Coleman Date: Tue, 21 Mar 2017 22:33:14 -0400 Subject: [PATCH 3/3] Update en-GB.com_advancedopenportal.ini --- language/en-GB/en-GB.com_advancedopenportal.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/en-GB/en-GB.com_advancedopenportal.ini b/language/en-GB/en-GB.com_advancedopenportal.ini index aca96e4..09b2d2d 100755 --- a/language/en-GB/en-GB.com_advancedopenportal.ini +++ b/language/en-GB/en-GB.com_advancedopenportal.ini @@ -33,4 +33,4 @@ COM_ADVANCEDOPENPORTAL_RAISED='Raised by' COM_ADVANCEDOPENPORTAL_RAISED_ON='on' COM_ADVANCEDOPENPORTAL_OWN_CASES='My cases' COM_ADVANCEDOPENPORTAL_SEARCH='Search' -COM_ADVANCEDOPENPORTAL_ERROR_CONNECT="Failed to connect to SuiteCRM. Please check your Joomla Admin, Components, Advanced Open Portal, Settings." +COM_ADVANCEDOPENPORTAL_ERROR_CONNECT="Failed to connect to SuiteCRM. Please check Settings in Joomla Admin, Components, Advanced Open Portal."