mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2041 from yesszus/patch-20

Browse Source 
Update e107_languages/English/admin/lan_theme.php
This commit is contained in:
Cameron
2016-11-27 10:34:42 -08:00
committed by GitHub
parent f2424894a3 e92466dd76
commit 7f2f99c0ad
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
e107_handlers/e_marketplace.php
View File

@@ -372,7 +372,7 @@ abstract class e_marketplace_adapter_abstract
$remotefile = $this->downloadUrl."?auth=".$this->getAuthKey()."&".$qry; $remotefile = $this->downloadUrl."?auth=".$this->getAuthKey()."&".$qry;
$localfile = md5($remotefile.time()).".zip"; $localfile = md5($remotefile.time()).".zip";
$mes->addSuccess("Downloading..."); $mes->addSuccess(TPVLAN_81);
// FIXME call the service, check status first, then download (if status OK), else retireve the error break and show it // FIXME call the service, check status first, then download (if status OK), else retireve the error break and show it
@@ -394,7 +394,7 @@ abstract class e_marketplace_adapter_abstract
if(!file_exists(e_TEMP.$localfile)) if(!file_exists(e_TEMP.$localfile))
{ {
$mes->addError( "Automated download not possible. Please <a href='".$remotefile."'>Download Manually</a>"); $mes->addError( TPVLAN_83." <a href='".$remotefile."'>".TPVLAN_84."</a>");
if(E107_DEBUG_LEVEL > 0) if(E107_DEBUG_LEVEL > 0)
{ {
@@ -407,23 +407,16 @@ abstract class e_marketplace_adapter_abstract
if($fl->unzipArchive($localfile,$type)) if($fl->unzipArchive($localfile,$type))
{ {
$mes->addSuccess("Download Complete!"); $mes->addSuccess(TPVLAN_82);
return true; return true;
} }
else else
{ {
$mes->addSuccess( "<a href='".$remotefile."'>Download Manually</a>"); // flush(); usleep(50000); $mes->addSuccess( "<a href='".$remotefile."'>".TPVLAN_84."</a>");
} }
return false; return false;
} }
@@ -510,7 +503,7 @@ class e_marketplace_adapter_wsdl extends e_marketplace_adapter_abstract
} }
catch (Exception $e) catch (Exception $e)
{ {
e107::getMessage()->addError("Unable to connect. Please check firewall and/or internet connection."); e107::getMessage()->addError(TPVLAN_90);
e107::getMessage()->addDebug($e->getMessage()); e107::getMessage()->addDebug($e->getMessage());
} }

7
e107_languages/English/admin/lan_theme.php
View File

@@ -115,11 +115,12 @@ define("TPVLAN_CONV_15", "Give this stylesheet a name");
//marketplace //marketplace
define("TPVLAN_81","Downloading..."); define("TPVLAN_81","Downloading...");
define("TPVLAN_82","Download Complete!"); define("TPVLAN_82","Download Complete!");
define("TPVLAN_83","Automated download not possible."); define("TPVLAN_83","Automated download not possible!");
define("TPVLAN_84","Please Download Manually"); define("TPVLAN_84","[Please Download Manually]");
define("TPVLAN_85","Connecting..."); define("TPVLAN_85","Connecting...");
define("TPVLAN_86","Could not change site theme."); define("TPVLAN_86","Could not change site theme.");
define("TPVLAN_87","Rendering Theme Config"); define("TPVLAN_87","Rendering Theme Config");
define("TPVLAN_88","Converter"); define("TPVLAN_88","Converter");
define("TPVLAN_89", "Apply dashboard preferences to all administrators"); define("TPVLAN_89", "Apply dashboard preferences to all administrators");
define("TPVLAN_90","Unable to connect. Please check firewall and/or internet connection.");