From 6f18c238bcbcf9d1625497c122489656de58dae7 Mon Sep 17 00:00:00 2001 From: Tijn Kuyper Date: Sun, 27 Jan 2019 14:57:10 +0100 Subject: [PATCH] Closes #3617 - LAN pack export message updated Emails are no longer (unneccesarily) sent --- e107_admin/lancheck.php | 44 +++++++++---------- e107_languages/English/admin/lan_language.php | 7 +-- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php index cb463e0c7..54b668fa5 100644 --- a/e107_admin/lancheck.php +++ b/e107_admin/lancheck.php @@ -458,6 +458,8 @@ class lancheck { $mes = e107::getMessage(); + /* NO LONGER USED + $certVal = isset($_POST['contribute_pack']) ? 1 : 0; if(!varset($_COOKIE['e107_certified'])) @@ -467,39 +469,44 @@ class lancheck else { $_COOKIE['e107_certified'] = $certVal; - } + }*/ // $_POST['language'] = key($_POST['ziplang']); - // If no session data, scan before zipping. + // If no session data, scan before zipping. if(!isset($_SESSION['lancheck'][$language]['total']) || $_SESSION['lancheck'][$language]['total']!='0') { $this->check_all('norender', $language); } $status = $this->makeLanguagePack($language); + //print_a($status); - if($status['error']==FALSE) + if($status['error'] == FALSE) { - $text = $status['message']."
"; - $text .= $this->share($status['file']); - $mes->addSuccess($text); - //$ns->tablerender(LAN_CREATED, $text ); + $srch = array('[', ']'); + $rpl = array("", ""); + + $text = str_replace($srch, $rpl, LANG_LAN_154); + $text .= "
"; + $text .= $status['message']; + //$text .= $this->share($status['file']); // no longer notify by email, but only offer to download + $mes->addSuccess($text); } else { - $mes->addError($status['message']); - //$ns->tablerender(LAN_CREATED_FAILED, $status['message']); + $mes->addError($status['error']); } - return array('text'=>$mes->render(), 'caption'=>''); - + return array('text'=> $mes->render(), 'caption'=>''); } - /** * Share Language File + * + * DEPRECATED - NO LONGER USED AS TRANSLATIONS ARE NOW MANAGED THROUGH GITHUB REPOSITORIES (https://github.com/e107translations) + * * @param object $newfile * Usage of e107 is granted to you provided that this function is not modified or removed in any way. * @return @@ -2038,15 +2045,4 @@ class lancheck } - - -} - - - - - - - - - +} \ No newline at end of file diff --git a/e107_languages/English/admin/lan_language.php b/e107_languages/English/admin/lan_language.php index 82f841651..46d83787f 100644 --- a/e107_languages/English/admin/lan_language.php +++ b/e107_languages/English/admin/lan_language.php @@ -31,8 +31,8 @@ define("LANG_LAN_21", "Language-Packs"); define("LANG_LAN_25", "Language-Pack Creation Status"); define("LANG_LAN_26", "Load language files only for current language"); define("LANG_LAN_27", "If checked, and a required language cannot be found, there will be an error"); -define("LANG_LAN_28", "Check this box if you're an [e107 certified translator]."); -define("LANG_LAN_EML", "Please email your language pack to:"); +//define("LANG_LAN_28", "Check this box if you're an [e107 certified translator]."); +//define("LANG_LAN_EML", "Please email your language pack to:"); define("LANG_LAN_32", "Installed Languages"); define("LANG_LAN_33", "Display only errors during verification"); define("LANG_LAN_50", "Admin-Area Interface Language"); @@ -69,4 +69,5 @@ define("LANG_LAN_150", "[b]Search ENTIRE core before commenting out ANY LAN from define("LANG_LAN_151", "Available"); define("LANG_LAN_152", "Courtesy of the [e107 translations team]"); define("LANG_LAN_153", "Pre-release"); -?> + +define("LANG_LAN_154", "The Language Pack has been created. You can now submit it to the Github repository as instructed [here].") \ No newline at end of file