From 15a83d309a175417537958d2486fa3dfa24f04dd Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Sun, 8 Nov 2009 09:14:39 +0000 Subject: [PATCH] Some language file cleanup. Undetected phrases have been disabled. --- e107_admin/admin_log.php | 18 ++--- e107_admin/banlist.php | 6 +- e107_admin/db.php | 24 +++---- e107_admin/fla.php | 12 ++-- e107_admin/image.php | 24 +++---- e107_admin/language.php | 31 +++++---- e107_admin/users.php | 8 +-- .../batch/admin_shortcodes_class.php | 4 +- e107_images/banners/banner2.png | Bin 19137 -> 48642 bytes e107_languages/English/admin/lan_admin.php | 7 +- .../English/admin/lan_admin_log.php | 30 ++++----- .../English/admin/lan_administrator.php | 25 ++++--- e107_languages/English/admin/lan_banlist.php | 62 +++++++++--------- e107_languages/English/admin/lan_cpage.php | 18 ++--- e107_languages/English/admin/lan_credits.php | 12 ++-- e107_languages/English/admin/lan_cron.php | 8 +-- e107_languages/English/admin/lan_db.php | 18 ++--- .../English/admin/lan_db_verify.php | 8 +-- .../English/admin/lan_e107_update.php | 12 ++-- e107_languages/English/admin/lan_emoticon.php | 6 +- .../English/admin/lan_filemanager.php | 20 +++--- e107_languages/English/admin/lan_fla.php | 22 +++---- .../English/admin/lan_frontpage.php | 22 +------ e107_languages/English/admin/lan_image.php | 28 ++++---- e107_languages/English/admin/lan_lancheck.php | 22 +++---- e107_languages/English/admin/lan_language.php | 8 +-- 26 files changed, 220 insertions(+), 235 deletions(-) diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php index b418af9b3..500e8ce8b 100644 --- a/e107_admin/admin_log.php +++ b/e107_admin/admin_log.php @@ -9,9 +9,9 @@ * Administration Area - Admin Log * * $Source: /cvs_backup/e107_0.8/e107_admin/admin_log.php,v $ - * $Revision: 1.30 $ - * $Date: 2009-08-28 16:10:50 $ - * $Author: marj_nl_fr $ + * $Revision: 1.31 $ + * $Date: 2009-11-08 09:14:22 $ + * $Author: e107coders $ * */ @@ -213,7 +213,7 @@ if(($action == "confdel") || ($action == "auditdel")) $text = "
- ".RL_LAN_051." + ".LAN_CONFDELETE."
@@ -224,14 +224,14 @@ if(($action == "confdel") || ($action == "auditdel"))
- +
"; - $ns->tablerender(RL_LAN_051, $text); + $ns->tablerender(LAN_CONFDELETE, $text); } // Arrays of options for the various logs - the $page_title array is used to determine the allowable values for $action ('options' is a special case) @@ -519,7 +519,7 @@ if(isset($page_title[$action])) $col_widths = array('adminlog' => array(18, 4, 14, 7, 15, 8, 14, 20), // Date - Pri - IP - UID - User - Code - Event - Info 'auditlog' => array(18, 14, 7, 15, 8, 14, 24), 'rolllog' => array(15, 4, 12, 6, 12, 7, 13, 13, 18), // Date - Pri - IP - UID - User - Code - Caller - Event - Info 'downlog' => array(18, 14, 7, 15, 8, 38), 'detailed' => array(10, 8, 6, 4, 14, 6, 17, 7, 17, 21), 'comments' => array(14, 7, 7, 7, 14, 3, 10, 12, 5, 17, 1, 1, 1), 'online' => array(18, 15, 7, 14, 32, 6, 4, 4)); - $col_titles = array('adminlog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'auditlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'rolllog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_024, RL_LAN_025, RL_LAN_033), 'downlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_068, RL_LAN_069), 'detailed' => array(RL_LAN_097, RL_LAN_096, RL_LAN_098, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'comments' => array(RL_LAN_019, RL_LAN_100, RL_LAN_101, RL_LAN_102, RL_LAN_103, RL_LAN_104, RL_LAN_105, RL_LAN_020, RL_LAN_106, RL_LAN_107, RL_LAN_108, RL_LAN_109, RL_LAN_110), 'online' => array(RL_LAN_019, RL_LAN_020, RL_LAN_021, RL_LAN_022, RL_LAN_116, RL_LAN_117, RL_LAN_118, RL_LAN_116)); + $col_titles = array('adminlog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'auditlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'rolllog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_024, RL_LAN_025, RL_LAN_033), 'downlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_068, RL_LAN_069), 'detailed' => array(LAN_TIME, RL_LAN_096, RL_LAN_098, RL_LAN_032, RL_LAN_020, RL_LAN_104, RL_LAN_022, RL_LAN_023, RL_LAN_025, RL_LAN_033), 'comments' => array(RL_LAN_019, RL_LAN_100, RL_LAN_101, RL_LAN_102, RL_LAN_103, RL_LAN_104, LAN_AUTHOR, RL_LAN_020, RL_LAN_106, RL_LAN_107, RL_LAN_108, RL_LAN_109, RL_LAN_110), 'online' => array(RL_LAN_019, RL_LAN_020, RL_LAN_021, RL_LAN_022, RL_LAN_116, RL_LAN_117, RL_LAN_118, RL_LAN_116)); // For DB where the delete option is available, specifies the ID field $delete_field = array('comments' => 'comment_id'); @@ -1028,7 +1028,7 @@ function admin_log_adminmenu() $var['comments']['text'] = 'Comments'; $var['comments']['link'] = "admin_log.php?comments"; - $var['config']['text'] = RL_LAN_027; + $var['config']['text'] = LAN_OPTIONS; $var['config']['link'] = "admin_log.php?config"; /* XXX - why?! @@ -1068,7 +1068,7 @@ function headerjs() $ret = " "; diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php index ceb387358..6768b4dda 100644 --- a/e107_admin/banlist.php +++ b/e107_admin/banlist.php @@ -9,8 +9,8 @@ * Ban List Management * * $Source: /cvs_backup/e107_0.8/e107_admin/banlist.php,v $ - * $Revision: 1.20 $ - * $Date: 2009-11-07 02:10:34 $ + * $Revision: 1.21 $ + * $Date: 2009-11-08 09:14:22 $ * $Author: e107coders $ * */ @@ -820,7 +820,7 @@ function banlist_adminmenu() $var['times']['link'] = e_SELF."?times"; $var['times']['perm'] = "0"; - $var['options']['text'] = BANLAN_62; + $var['options']['text'] = LAN_OPTIONS; $var['options']['link'] = e_SELF."?options"; $var['options']['perm'] = "0"; } diff --git a/e107_admin/db.php b/e107_admin/db.php index c62046c32..68afa9e43 100644 --- a/e107_admin/db.php +++ b/e107_admin/db.php @@ -9,8 +9,8 @@ * Administration - Database Utilities * * $Source: /cvs_backup/e107_0.8/e107_admin/db.php,v $ - * $Revision: 1.37 $ - * $Date: 2009-10-26 01:04:05 $ + * $Revision: 1.38 $ + * $Date: 2009-11-08 09:14:22 $ * $Author: e107coders $ * */ @@ -577,8 +577,8 @@ class system_tools
- ".$frm->admin_button('delpref_checked', DBLAN_21, 'delete')." - ".$frm->admin_button('back', DBLAN_13, 'back')." + ".$frm->admin_button('delpref_checked', LAN_DELCHECKED, 'delete')." + ".$frm->admin_button('back', LAN_BACK, 'back')."
@@ -645,12 +645,12 @@ class system_tools /* we all are awaiting for PHP5 only support - method chaining... $emessage->add(DBLAN_22.' - '.DBLAN_23, E_MESSAGE_SUCCESS) - ->add("".DBLAN_13."", E_MESSAGE_SUCCESS) + ->add("".LAN_BACK."", E_MESSAGE_SUCCESS) ->add(DBLAN_30); */ $emessage->add(DBLAN_23, E_MESSAGE_SUCCESS); - $emessage->add("".DBLAN_13."", E_MESSAGE_SUCCESS); + $emessage->add("".LAN_BACK."", E_MESSAGE_SUCCESS); $emessage->add(DBLAN_30); $text = " @@ -913,7 +913,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think). } $emessage->add($qry, E_MESSAGE_DEBUG); - $emessage->add("".DBLAN_13."", E_MESSAGE_DEBUG); + $emessage->add("".LAN_BACK."", E_MESSAGE_DEBUG); } } @@ -958,7 +958,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).
".$frm->admin_button('check_verify_sql_record', DBLAN_38)." - ".$frm->admin_button('back', DBLAN_13, 'back')." + ".$frm->admin_button('back', LAN_BACK, 'back')."
@@ -1013,7 +1013,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think). ".DBLAN_41." ".DBLAN_42." ".DBLAN_43." - ".DBLAN_44." + ".LAN_OPTIONS." @@ -1031,7 +1031,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think). {$v['itemid']} ".($v['table_exist'] ? DBLAN_45 : DBLAN_46)." - ".$frm->checkbox('del_dbrec['.$ctype.']['.$delkey.'][]', '1').$frm->label(DBLAN_47, 'del_dbrec['.$ctype.']['.$delkey.'][]', '1')." + ".$frm->checkbox('del_dbrec['.$ctype.']['.$delkey.'][]', '1').$frm->label(LAN_DELETE, 'del_dbrec['.$ctype.']['.$delkey.'][]', '1')." "; @@ -1263,8 +1263,8 @@ function verify_sql_record() // deprecated by db_verify.php ( i think). $text .= "
- ".$frm->admin_button('delete_verify_sql_record', DBLAN_48, 'delete')." - ".$frm->admin_button('verify_sql_record', DBLAN_13, 'back')." + ".$frm->admin_button('delete_verify_sql_record', LAN_DELCHECKED, 'delete')." + ".$frm->admin_button('verify_sql_record', LAN_BACK, 'back')."
diff --git a/e107_admin/fla.php b/e107_admin/fla.php index fa28e4058..8aeaab6ef 100644 --- a/e107_admin/fla.php +++ b/e107_admin/fla.php @@ -9,9 +9,9 @@ * Manage/View failed login attempts * * $Source: /cvs_backup/e107_0.8/e107_admin/fla.php,v $ - * $Revision: 1.8 $ - * $Date: 2009-07-18 13:08:37 $ - * $Author: marj_nl_fr $ + * $Revision: 1.9 $ + * $Date: 2009-11-08 09:14:22 $ + * $Author: e107coders $ * */ require_once("../class2.php"); @@ -146,7 +146,7 @@ else $text = "
- ".FLALAN_1." + ".ADLAN_146." @@ -157,7 +157,7 @@ else - + - + - + @@ -593,9 +593,9 @@ if (isset($_POST['check_avatar_sizes']))
".FLALAN_6."".LAN_DATE." ".FLALAN_7." ".FLALAN_8." @@ -214,7 +214,7 @@ else } -$e107->ns->tablerender(FLALAN_1, $emessage->render().$text); +$e107->ns->tablerender(ADLAN_146, $emessage->render().$text); require_once("footer.php"); /** diff --git a/e107_admin/image.php b/e107_admin/image.php index 1b739381f..7fddf87f8 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -9,8 +9,8 @@ * Image Administration Area * * $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $ - * $Revision: 1.26 $ - * $Date: 2009-11-07 11:20:26 $ + * $Revision: 1.27 $ + * $Date: 2009-11-08 09:14:22 $ * $Author: e107coders $ * */ @@ -450,9 +450,9 @@ function show_avatars()
- ".$frm->admin_button('check_all', IMALAN_59, 'action')." - ".$frm->admin_button('uncheck_all', IMALAN_60, 'action')." - ".$frm->admin_button('submit_show_delete_multi', IMALAN_58, 'delete')." + ".$frm->admin_button('check_all', LAN_CHECKALL, 'action')." + ".$frm->admin_button('uncheck_all', LAN_UNCHECKALL, 'action')." + ".$frm->admin_button('submit_show_delete_multi', LAN_DELCHECKED, 'delete')." ".$frm->admin_button('submit_show_deleteall', IMALAN_25, 'delete')." ".$frm->admin_button('submit_cancel_show', IMALAN_68, 'cancel')."
@@ -495,9 +495,9 @@ if (isset($_POST['check_avatar_sizes']))
".LAN_OPTIONS."".IMALAN_64."".LAN_USER." ".IMALAN_62."".IMALAN_63."".LAN_URL."
- ".$frm->admin_button('check_all', IMALAN_59, 'action')." - ".$frm->admin_button('uncheck_all', IMALAN_60, 'action')." - ".$frm->admin_button('submit_avdelete_multi', IMALAN_58, 'delete')." + ".$frm->admin_button('check_all', LAN_CHECKALL, 'action')." + ".$frm->admin_button('uncheck_all', LAN_UNCHECKALL, 'action')." + ".$frm->admin_button('submit_avdelete_multi', LAN_DELCHECKED, 'delete')."
@@ -762,7 +762,7 @@ if (isset($_POST['check_avatar_sizes'])) ".IMALAN_36." - ".$frm->admin_button('check_avatar_sizes', IMALAN_17)." + ".$frm->admin_button('check_avatar_sizes', ADLAN_145)." @@ -924,7 +924,7 @@ function headerjs() $ret = " "; diff --git a/e107_admin/language.php b/e107_admin/language.php index 1c6be85b3..1e771d7d7 100644 --- a/e107_admin/language.php +++ b/e107_admin/language.php @@ -9,8 +9,8 @@ * Administration Area - Languages * * $Source: /cvs_backup/e107_0.8/e107_admin/language.php,v $ - * $Revision: 1.25 $ - * $Date: 2009-11-07 11:34:22 $ + * $Revision: 1.26 $ + * $Date: 2009-11-08 09:14:22 $ * $Author: e107coders $ * */ @@ -298,7 +298,7 @@ if (isset($_POST['edit_existing'])) - ".LANG_LAN_10." + ".LAN_CONFDELETE." ".$frm->checkbox('remove', 1)."
".$frm->label(LANG_LAN_11, 'remove', 1)."
@@ -523,7 +523,7 @@ function multilang_db() { //FIXME sprintf $text .= " - "; + "; } elseif ($e_language != $pref['sitelanguage']) { @@ -635,9 +635,12 @@ function show_tools() $fl->mode = 'full'; $lans = $fl->get_files(e_LANGUAGEDIR."English/admin"); + $exclude = array('lan_admin.php'); + + foreach($lans as $script=>$lan) { - if(basename($lan)=='lan_admin.php') + if(in_array(basename($lan),$exclude)) { continue; } @@ -950,7 +953,7 @@ function getDefined($line) -function compareit($needle,$haystack,$value='',$disabled){ +function compareit($needle,$haystack,$value='',$disabled=FALSE){ // return "Need=".$needle."
hack=".$haystack."
val=".$val; @@ -973,7 +976,7 @@ function compareit($needle,$haystack,$value='',$disabled){ { if(strtoupper(trim($value)) == strtoupper($common)) { - //$text .= "
$common
"; + //$text .= "
$common
"; $foundCommon = TRUE; break; } @@ -989,12 +992,18 @@ function compareit($needle,$haystack,$value='',$disabled){ $count = 1; foreach($lines as $ln) - { - if(strpos($ln,$needle.'.')!==FALSE || strpos($ln,$needle.';')!==FALSE || strpos($ln,$needle.';')!==FALSE) + { + if(preg_match("/\b".$needle."\b/i",$ln)) { - $text .= "Line:".$count." "; // "' Found"; + if($disabled) + { + $text .= ADMIN_WARNING_ICON; + } + $text .= " Line:".$count." "; // "' Found"; + $found = TRUE; } + $count++; } @@ -1051,7 +1060,7 @@ function headerjs()