From c5fbb5332c53db907389b628a878c30393ea620f Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Mon, 10 Oct 2016 20:06:43 +0100 Subject: [PATCH] #6 Clean up Lans on Core Languages & Checker #6 Clean up Lans on Core Languages & Checker --- e107_admin/lancheck.php | 24 +++---- e107_admin/language.php | 71 ++++++++++--------- e107_languages/English/English.php | 4 +- e107_languages/English/admin/lan_admin.php | 9 +++ e107_languages/English/admin/lan_lancheck.php | 11 +-- e107_languages/English/admin/lan_language.php | 22 +++++- 6 files changed, 85 insertions(+), 56 deletions(-) diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php index 04683b163..14f887869 100644 --- a/e107_admin/lancheck.php +++ b/e107_admin/lancheck.php @@ -139,7 +139,7 @@ if(isset($_POST['submit'])) } else { - $caption = LAN_CHECK_PAGE_TITLE.' - '.LAN_CHECK_24; + $caption = LAN_CHECK_PAGE_TITLE.' - '.LAN_SUMMARY; $mes->addSuccess(sprintXXX(str_replace("[x]", "%s", LAN_CHECK_23), basename($writeit))); } fclose($writeit); @@ -242,7 +242,7 @@ if(isset($_POST['language_sel']) && isset($_POST['language'])) $text .= "
- ".LAN_CHECK_22." + ".LAN_THEME." @@ -286,7 +286,7 @@ if(isset($_POST['language_sel']) && isset($_POST['language'])) } - $ns->tablerender(LAN_CHECK_25, $mes->render(). $text); + $ns->tablerender(LAN_THEMES, $mes->render(). $text); @@ -1057,7 +1057,7 @@ class lancheck // Themes ------------- $theme_header = "
- + "; @@ -1114,7 +1114,7 @@ class lancheck $mes->add($message, $mesStatus); - // $ns -> tablerender(LAN_CHECK_24.": ".$lan,$message); + // $ns -> tablerender(LAN_SUMMARY.": ".$lan,$message); @@ -1122,10 +1122,10 @@ class lancheck $ret['text'] = $mes->render(); $tabs = array( - 'core' => array('caption'=>'Front', 'text'=> $core_text), - 'admin' => array('caption'=> LAN_ADMIN, 'text'=>$core_admin), - 'plugin' => array('caption'=> ADLAN_CL_7, 'text'=>$plug_text), - 'theme' => array('caption'=> LAN_CHECK_25, 'text'=>$theme_text), + 'core' => array('caption'=> LAN_CHECK_26, 'text'=>$core_text), + 'admin' => array('caption'=> LAN_ADMIN, 'text'=>$core_admin), + 'plugin' => array('caption'=> ADLAN_CL_7, 'text'=>$plug_text), + 'theme' => array('caption'=> LAN_THEMES, 'text'=>$theme_text), ); $ret['text'] .= e107::getForm()->tabs($tabs); @@ -1137,7 +1137,7 @@ class lancheck $ns -> tablerender(LANG_LAN_21.SEP.$lan.SEP.LAN_CHECK_2, $core_text); $ns -> tablerender(LAN_CHECK_3.": ".$lan."/admin", $core_admin); $ns -> tablerender(ADLAN_CL_7, $plug_text); - $ns -> tablerender(LAN_CHECK_25, $theme_text); */ + $ns -> tablerender(LAN_THEMES, $theme_text); */ //TODO Add a return statement here. } @@ -1847,12 +1847,12 @@ class lancheck $rowamount = round(strlen($trans['orig'][$sk])/34)+1; $hglt1=""; $hglt2=""; if ($trans['tran'][$sk] == "" && $trans['orig'][$sk]!="") { - $hglt1=""; + $hglt1="";//Missing $hglt2=""; } elseif($trans['tran'][$sk] == $trans['orig'][$sk]) { - $hglt1=""; + $hglt1="";//Identical $hglt2=""; } $text .=" diff --git a/e107_admin/language.php b/e107_admin/language.php index c739d23b7..97d653155 100644 --- a/e107_admin/language.php +++ b/e107_admin/language.php @@ -79,7 +79,7 @@ if(!empty($_GET['iframe'])) if(e_DEVELOPER == true) { - $this->adminMenu['main/deprecated'] = array('caption'=>'Deprecated LANs', 'perm'=>'0'); + $this->adminMenu['main/deprecated'] = array('caption'=>LANG_LAN_04, 'perm'=>'0'); } } @@ -986,14 +986,14 @@ class lanDeveloper $new = $this->disableUnused($data); if(file_put_contents($_POST['disable-unused-lanfile'],$new)) { - $mes->addSuccess("Overwriting ".$_POST['disable-unused-lanfile']); + $mes->addSuccess(LANG_LAN_135.$_POST['disable-unused-lanfile']);//Overwriting } else { - $mes->addError("Couldn't overwrite ".$_POST['disable-unused-lanfile']); + $mes->addError(LANG_LAN_136.$_POST['disable-unused-lanfile']);//Couldn't overwrite } - $ns->tablerender("Processed".SEP.$_POST['disable-unused-lanfile'],$mes->render()."
".htmlentities($new)."
"); + $ns->tablerender(LANG_LAN_137.SEP.$_POST['disable-unused-lanfile'],$mes->render()."
".htmlentities($new)."
");//Processed } @@ -1019,14 +1019,14 @@ class lanDeveloper { if(strpos($scr,e_ADMIN)!==false) // CORE { - $mes->addDebug("Mode: Core Admin Calculated"); + $mes->addDebug(LANG_LAN_138);//Mode: Core Admin Calculated //$scriptname = str_replace("lan_","",basename($lanfile)); $lanfile[$k] = e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_".basename($scr); $this->adminFile = true; } else // Root { - $mes->addDebug("Mode: Search Core Root lan calculated"); + $mes->addDebug(LANG_LAN_139);//Mode: Search Core Root lan calculated $lanfile[$k] = e_LANGUAGEDIR.e_LANGUAGE."/lan_".basename($scr); $lanfile[$k] = str_replace("lan_install", "lan_installer", $lanfile[$k]); //quick fix., @@ -1035,7 +1035,7 @@ class lanDeveloper if(!is_readable($scr)) { - $mes->addError("Not Readable: ".$scr); + $mes->addError(LAN_NOTREADABLE.$scr); // $script = $scriptname; // matching files. lan_xxxx.php and xxxx.php } } @@ -1158,10 +1158,10 @@ class lanDeveloper $text .= " - + @@ -1405,7 +1406,7 @@ class lanDeveloper if($disabled) { $text .= ADMIN_WARNING_ICON; - $label = " Must be re-enabled"; + $label = " ".LANG_LAN_144."";//Must be re-enabled $this->errors++; // $text .= "blabla"; // $class = 'alert alert-warning'; @@ -1413,7 +1414,7 @@ class lanDeveloper elseif($reverse == true) { $value = ADMIN_TRUE_ICON; - $value .= " Line:".implode(", ",$found[$file]['count']) ." "; // "' Found"; + $value .= " ".LAN_LINE."".implode(", ",$found[$file]['count']) ." "; // "' Found"; foreach($found[$file]['line'] as $defLine) { $text .= print_a($defLine, true); @@ -1422,7 +1423,7 @@ class lanDeveloper } else { - $text .= " Line:".implode(", ",$found[$file]['count']) ." "; // "' Found"; + $text .= " ".LAN_LINE.":".implode(", ",$found[$file]['count']) ." "; // "' Found"; } } @@ -1450,7 +1451,7 @@ class lanDeveloper else { // $color = "background-color:yellow"; - $value = "".ADMIN_WARNING_ICON.""; + $value = "".ADMIN_WARNING_ICON.""; $this->errors++; $label = "".LANG_LAN_131.""; // $class = "alert alert-warning"; @@ -1461,7 +1462,7 @@ class lanDeveloper { // $color = "background-color:pink"; $class = ' '; - $label = " Unused"; + $label = " ".LAN_UNUSED.""; $text .= "-"; $this->errors++; } @@ -1496,7 +1497,7 @@ class lanDeveloper { $color = "font-style:italic"; $class = 'muted text-important '; - $label .= " Disabled"; + $label .= " ".LAN_DISABLED.""; } if(empty($found) && $disabled === true) @@ -1531,7 +1532,7 @@ class lanDeveloper if($reverse == true) { - $mes->addDebug("REVERSE MODE "); + $mes->addDebug(LANG_LAN_145); // Reverse Mode $exclude = array("e_LANGUAGE","e_LANGUAGEDIR","e_LAN","e_LANLIST","e_LANCODE", "LANGUAGES_DIRECTORY", "e_LANGUAGEDIR_ABS", "LAN"); $data = ''; foreach($script as $d) @@ -1561,16 +1562,16 @@ class lanDeveloper $tmp = is_array($lanfile) ? $lanfile : explode(",", $lanfile); foreach($tmp as $scr) { - $mes->addDebug("Script: ".$scr); + $mes->addDebug(LANG_LAN_146.": ".$scr); if(!file_exists($scr)) { - $mes->addError("reverse Mode: ".LANG_LAN_121." ".$scr); + $mes->addError(LANG_LAN_146.": ".LANG_LAN_121." ".$scr); continue; } $compare[$scr] = file_get_contents($scr); - $mes->addDebug("LanFile: ".$scr); + $mes->addDebug(LANG_LAN_147.": ".$scr); } @@ -1578,12 +1579,12 @@ class lanDeveloper } else { - $mes->addDebug("NORMAL MODE "); + $mes->addDebug(LANG_LAN_148);//NORMAL MODE $lanDefines = ''; foreach($lanfile as $arr) { $lanDefines .= file_get_contents($arr); - $mes->addDebug("LanFile: ".$arr); + $mes->addDebug(LANG_LAN_147.": ".$arr); } @@ -1592,11 +1593,11 @@ class lanDeveloper { if(!file_exists($scr)) { - $mes->addError("Normal mode: ".LANG_LAN_121." ".$scr); + $mes->addError(LANG_LAN_148.": ".LANG_LAN_121." ".$scr); continue; } $compare[$scr] = file_get_contents($scr); - $mes->addDebug("Script: ".$scr); + $mes->addDebug(LANG_LAN_146.": ".$scr); } } @@ -1607,12 +1608,12 @@ class lanDeveloper if(!$compare) { - $mes->addError("Line ".__LINE__.": ".LANG_LAN_121." ".$script); + $mes->addError(LAN_LINE." ".__LINE__.": ".LANG_LAN_121." ".$script); } if(!$lanDefines) { - $mes->addError("Line ".__LINE__.": ".LANG_LAN_121." ".$lanfile); + $mes->addError(LAN_LINE." ".__LINE__.": ".LANG_LAN_121." ".$lanfile); } $srch = array(""); @@ -1642,7 +1643,7 @@ class lanDeveloper if($reverse == false) { - $text .= ""; + $text .= ""; } foreach($compare as $k=>$val) @@ -1695,11 +1696,11 @@ class lanDeveloper if($reverse != true) { - $mes->addInfo("Search ENTIRE core before commenting out ANY LAN from ANY language file."); + $mes->addInfo(LANG_LAN_150); //Search Everywhere before commenting out } $ret['text'] = $mes->render().$text; - $ret['caption'] = "Errors: ".intval($this->errors); + $ret['caption'] = LAN_ERRORS.": ".intval($this->errors); return $ret; } diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php index 05ff48cd0..24f1742bc 100644 --- a/e107_languages/English/English.php +++ b/e107_languages/English/English.php @@ -125,6 +125,6 @@ define("LAN_SHOW", "Show"); define("LAN_GENERATE", "Generate"); define("LAN_SUMMARY", "Summary"); // TODO more files use summary replace define("LAN_REQUIRED_BLANK", "Required field(s) were left blank."); +define("LAN_PLEASEWAIT", "Please Wait"); - -?> \ No newline at end of file +?> diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index da650795c..6547c8916 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -230,6 +230,7 @@ define("LAN_SAVED","Saved"); define("LAN_SETSAVED","Your settings have been saved"); define("LAN_NOCHANGE_NOTSAVED", "Nothing changed - not saved"); define("LAN_CONFIRMDEL","Please confirm you wish to delete"); +define("LAN_ERRORS", "Errors"); define("LAN_OPTIONS","Options"); define("LAN_PREFS","Preferences"); @@ -256,6 +257,9 @@ define("LAN_IMPORT","Import"); // define("LAN_PRESET_DELETED","Preset successfully deleted"); // define("LAN_PRESET_CONFIRMDEL","Are you sure you want to delete this preset?"); define("LAN_NOTWRITABLE"," is not writable, you need to CHMOD 777 the file or folder first."); +define("LAN_NOTREADABLE", "Not Readable"); +define("LAN_MISSING", "Missing"); +define("LAN_UNUSED", "Unused"); define("LAN_TIME","Time"); // define("LAN_YES","Yes"); @@ -266,6 +270,7 @@ define("LAN_EXISTING","Existing Entries"); define("LAN_CONFDELETE","Confirm Delete"); define("LAN_PLUGIN","Plugin"); define("LAN_THEMES","Themes"); +define("LAN_THEME","Theme"); define("LAN_LATEST_e107_NEWS","Latest e107 News"); define("LAN_WEBSITE_STATUS","Website Status"); define("LAN_STATS","Stats"); @@ -274,6 +279,9 @@ define("LAN_ORDER","Order"); define("LAN_SELECT","Select ..."); define("LAN_ADMIN","Admin"); +define("LAN_ROOT","Root"); +define("LAN_LINE","Line"); +define("LAN_SHORTCODES","Shortcodes"); define("LAN_DISPLAYOPT", "Edit Display Options"); // define("LAN_GOPAGE", "Go to page:"); define("LAN_DATESTAMP","Date stamp"); @@ -361,6 +369,7 @@ define("LAN_COPY","Copy"); define("LAN_KEYWORDS","Keywords"); define("LAN_TEMPLATE","Template"); +define("LAN_TEMPLATES","Templates"); // define("LAN_NONE", "None"); define("LAN_CATEGORIES", "Categories"); diff --git a/e107_languages/English/admin/lan_lancheck.php b/e107_languages/English/admin/lan_lancheck.php index faacda907..140dce996 100644 --- a/e107_languages/English/admin/lan_lancheck.php +++ b/e107_languages/English/admin/lan_lancheck.php @@ -17,12 +17,15 @@ define("LAN_CHECK_18", "Language files in the standard format are NOT available define("LAN_CHECK_19", "Non-UTF-8 characters found!"); define("LAN_CHECK_20", "Generate Language Pack"); define("LAN_CHECK_21", "Verify Again"); -define("LAN_CHECK_22", "Theme"); +//define("LAN_CHECK_22", "Theme");//LAN_THEME define("LAN_CHECK_23", "Errors Found"); -define("LAN_CHECK_24", "Summary"); -define("LAN_CHECK_25", "Themes"); +//define("LAN_CHECK_24", "Summary");//LAN_SUMMARY +//define("LAN_CHECK_25", "Themes");//LAN_THEMES +define("LAN_CHECK_26", "Front"); define("LAN_CHECK_PAGE_TITLE", "Languages"); define("LAN_CHECK_27", "Number of language-pack errors found"); +define("LAN_CHECK_28", "Identical"); +define("LAN_CHECK_29", "Missing"); define("LANG_LAN_23", "Create Language-Pack (zip)"); define("LANG_LAN_30", "Release Date"); @@ -40,4 +43,4 @@ define("LANG_LAN_120", "Please make sure you are using default folder names in e define("LANG_LAN_AGR", "Note: By using these tools you agree to share your language pack(s) with the e107 community."); -?> \ 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 68201ec56..4c7eb46aa 100644 --- a/e107_languages/English/admin/lan_language.php +++ b/e107_languages/English/admin/lan_language.php @@ -10,7 +10,7 @@ define("LANG_LAN_00", "[x] could not be created (already exists)."); define("LANG_LAN_01", "[x] was deleted (if existing) and created."); define("LANG_LAN_02", "[x] couldn't be deleted."); define("LANG_LAN_03", "Tables"); - +define("LANG_LAN_04", "Deprecated LANs"); define("LANG_LAN_05", "Not Installed"); define("LANG_LAN_06", "Create tables"); define("LANG_LAN_07", "Drop existing tables?"); @@ -31,6 +31,7 @@ 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_32", "Installed Languages"); define("LANG_LAN_33", "Display only errors during verification"); @@ -52,5 +53,20 @@ define("LANG_LAN_131", "Missing from language file"); define("LANG_LAN_132", "is a common phrase."); define("LANG_LAN_133", "Use"); define("LANG_LAN_134", "instead."); - -?> \ No newline at end of file +define("LANG_LAN_135", "Overwriting "); +define("LANG_LAN_136", "Couldn't overwrite "); +define("LANG_LAN_137", "Processed"); +define("LANG_LAN_138", "Mode: Core Admin Calculated"); +define("LANG_LAN_139", "Mode: Search Core Root lan calculated"); +define("LANG_LAN_140", "Hold down CTRL key to select multiple.[br]e.g. To check [b]lan_signup.php[/b] you'll want to also select [b]signup_shortcodes.php[/b] and [b]signup_template.php[/b]."); +define("LANG_LAN_141", "Select Script..."); +define("LANG_LAN_142", "Auto-Detect"); +define("LANG_LAN_143", "Specific LAN file:"); +define("LANG_LAN_144", "Must be re-enabled"); +define("LANG_LAN_145", "REVERSE MODE"); +define("LANG_LAN_146", "Script"); +define("LANG_LAN_147", "LanFile"); +define("LANG_LAN_148", "NORMAL MODE"); +define("LANG_LAN_149", "Value"); +define("LANG_LAN_150", "[b]Search ENTIRE core before commenting out ANY LAN from ANY language file.[/b]"); +?>
".LAN_CHECK_22."".LAN_THEME." ".LAN_CHECK_16." ".$lan." ".LAN_OPTIONS."
Hold down CTRL key to select multiple.
eg. To check lan_signup.php you'll want to also select signup_shortcodes.php and signup_template.php.
".LANG_LAN_140."
 "; // $frm->select('deprecatedLanFile',$_SESSION['languageTools_lanFileList'], $_POST['deprecatedLanFile'],'class=select&useValues=1','Select Language File (optional)'). - $text .= $frm->admin_button('searchDeprecated',"Check",'other'); + $text .= $frm->admin_button('searchDeprecated',LAN_GO,'other'); // $text .= "".(count($lans) + count($plugs))." files found"; $text .= " Value".LANG_LAN_149."