From 142d31768c9f01e7b02f0e3bf0d92437046cc176 Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Thu, 2 Jul 2015 13:43:22 +0100 Subject: [PATCH] Replace Duplicate LANs : LAN_TITLE Replace Duplicate LANs : LAN_TITLE --- e107_admin/admin_log.php | 12 ++++++------ e107_admin/mailout.php | 2 +- e107_handlers/mail_manager_class.php | 2 +- e107_handlers/mailout_admin_class.php | 2 +- e107_languages/English/admin/lan_mailout.php | 2 +- e107_languages/English/lan_print.php | 2 +- e107_languages/English/lan_submitnews.php | 6 +++--- .../forum/languages/English/English_front.php | 2 +- e107_plugins/poll/languages/English.php | 2 +- e107_plugins/poll/languages/English_admin_poll.php | 2 +- submitnews.php | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php index a6e315e09..2f1894ce8 100644 --- a/e107_admin/admin_log.php +++ b/e107_admin/admin_log.php @@ -160,14 +160,14 @@ class admin_log_ui extends e_admin_ui 'dblog_user_id' => array ( 'title' => LAN_USER, 'type' => 'user', 'data' => 'int', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms'=>'link=1', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'dblog_eventcode' => array ( 'title' => RL_LAN_023, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'filter' => true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), - 'dblog_title' => array ( 'title' => RL_LAN_025, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), + 'dblog_title' => array ( 'title' => LAN_TITLE, 'type' => 'method', 'data' => 'str', 'width' => 'auto', 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'dblog_remarks' => array ( 'title' => RL_LAN_033, 'type' => 'method', 'data' => 'str', 'width' => '35%', 'filter'=>true, 'help' => '', 'readParms' => '', 'writeParms' => '', 'class' => 'left', 'thclass' => 'left', ), 'options' => array ( 'title' => 'Options', 'type' => null, 'nolist'=>true, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced' => '1', ), ); protected $fieldpref = array( 'dblog_datestamp', 'dblog_type', 'dblog_eventcode', 'dblog_user_id', 'dblog_ip', 'dblog_title', 'dblog_remarks'); - //'adminlog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_023, RL_LAN_025, RL_LAN_033), + //'adminlog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_023, LAN_TITLE, RL_LAN_033), protected $prefs = array( @@ -1357,11 +1357,11 @@ if(isset($page_title[$action])) '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, LAN_USER, RL_LAN_023, RL_LAN_025, RL_LAN_033), - 'auditlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_023, RL_LAN_025, RL_LAN_033), - 'rolllog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_023, RL_LAN_024, RL_LAN_025, RL_LAN_033), + 'adminlog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_023, LAN_TITLE, RL_LAN_033), + 'auditlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_023, LAN_TITLE, RL_LAN_033), + 'rolllog' => array(RL_LAN_019, RL_LAN_032, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_023, RL_LAN_024, LAN_TITLE, RL_LAN_033), 'downlog' => array(RL_LAN_019, RL_LAN_020, RL_LAN_104, LAN_USER, 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, LAN_USER, RL_LAN_023, RL_LAN_025, RL_LAN_033), + 'detailed' => array(LAN_TIME, RL_LAN_096, RL_LAN_098, RL_LAN_032, RL_LAN_020, RL_LAN_104, LAN_USER, RL_LAN_023, LAN_TITLE, RL_LAN_033), 'online' => array(RL_LAN_019, RL_LAN_020, LAN_ID, LAN_USER, RL_LAN_116, RL_LAN_117, RL_LAN_118, RL_LAN_116)); diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index ad386ec77..648c52327 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -287,7 +287,7 @@ class mailout_main_ui extends e_admin_ui 'mail_source_id' => array('title' => LAN_MAILOUT_137, 'width' =>'5%', 'thclass' => 'center', 'class'=>'center', 'forced' => TRUE), 'mail_selectors' => array('title' => LAN_MAILOUT_03, 'type'=>'method', 'data'=>false, 'nolist' => true, 'writeParms'=>'nolabel=0'), - 'mail_title' => array('title' => LAN_MAILOUT_135, 'type'=>'text', 'forced' => TRUE, 'data'=>'str', 'inline'=>true, 'writeParms'=>'size=xxlarge&required=1', 'help'=>'whatever'), + 'mail_title' => array('title' => LAN_TITLE, 'type'=>'text', 'forced' => TRUE, 'data'=>'str', 'inline'=>true, 'writeParms'=>'size=xxlarge&required=1', 'help'=>'whatever'), 'mail_sender_name' => array('title' => LAN_MAILOUT_150, 'type'=>'method', 'data'=>false), 'mail_sender_email' => array('title' => LAN_ID,'type'=>'method','data'=>false), 'mail_copy_to' => array('title' => LAN_MAILOUT_151,'tab'=>1, 'type'=>'method','data'=>false), diff --git a/e107_handlers/mail_manager_class.php b/e107_handlers/mail_manager_class.php index fcb3f94c6..7ca4b4286 100644 --- a/e107_handlers/mail_manager_class.php +++ b/e107_handlers/mail_manager_class.php @@ -834,7 +834,7 @@ class e107MailManager if (($this->currentBatchInfo['mail_togo_count'] == 0) && ($email['mail_notify_complete'] > 0)) // Need to notify completion { $email = array_merge($email, $this->currentBatchInfo); // This should ensure the counters are up to date - $mailInfo = LAN_MAILOUT_247.'
'.LAN_MAILOUT_135.': '.$email['mail_title'].'
'.LAN_MAILOUT_248.$this->statusToText($email['mail_content_status']).'
'; + $mailInfo = LAN_MAILOUT_247.'
'.LAN_TITLE.': '.$email['mail_title'].'
'.LAN_MAILOUT_248.$this->statusToText($email['mail_content_status']).'
'; $mailInfo .= '
'.LAN_MAILOUT_249.'
'; foreach ($this->mailCountFields as $f => $t) { diff --git a/e107_handlers/mailout_admin_class.php b/e107_handlers/mailout_admin_class.php index b074d4f2b..50b0b5580 100644 --- a/e107_handlers/mailout_admin_class.php +++ b/e107_handlers/mailout_admin_class.php @@ -100,7 +100,7 @@ class mailoutAdminClass extends e107MailManager 'forced' => TRUE ), 'mail_title' => array( - 'title' => LAN_MAILOUT_135, + 'title' => LAN_TITLE, 'forced' => TRUE ), 'mail_subject' => array( diff --git a/e107_languages/English/admin/lan_mailout.php b/e107_languages/English/admin/lan_mailout.php index 589f59d71..ade08bd54 100644 --- a/e107_languages/English/admin/lan_mailout.php +++ b/e107_languages/English/admin/lan_mailout.php @@ -145,7 +145,7 @@ define("LAN_MAILOUT_131", "Sending Started"); define("LAN_MAILOUT_132", "Sending Complete"); define("LAN_MAILOUT_133", "Source"); define("LAN_MAILOUT_134", "Priority"); -define("LAN_MAILOUT_135", "Title"); +//define("LAN_MAILOUT_135", "Title");//LAN_TITLE define("LAN_MAILOUT_136", "Mailout Status"); define("LAN_MAILOUT_137", "Mail Ref"); define("LAN_MAILOUT_138", "Email status"); diff --git a/e107_languages/English/lan_print.php b/e107_languages/English/lan_print.php index 1be18f90b..18e313274 100644 --- a/e107_languages/English/lan_print.php +++ b/e107_languages/English/lan_print.php @@ -16,7 +16,7 @@ define("LAN_PRINT_87", "by "); define("LAN_PRINT_94", "Posted by"); define("LAN_PRINT_135", "News Item: "); define("LAN_PRINT_303", "This news item is from "); -define("LAN_PRINT_304", "Title: "); +//define("LAN_PRINT_304", "Title: ");//LAN_TITLE define("LAN_PRINT_305", "Subheading: "); define("LAN_PRINT_306", "This is from: "); define("LAN_PRINT_307", "Print this page"); diff --git a/e107_languages/English/lan_submitnews.php b/e107_languages/English/lan_submitnews.php index e8fc4ec54..dd7bd7305 100644 --- a/e107_languages/English/lan_submitnews.php +++ b/e107_languages/English/lan_submitnews.php @@ -11,7 +11,7 @@ */ define("PAGE_NAME", "Submit News"); define("LAN_7", "Name: "); -define("LAN_62", "News Title: "); +//define("LAN_62", "News Title: ");//LAN_TITLE define("LAN_112", "Email Address: "); define("LAN_133", "Thank you"); define("LAN_134", "Your item has been submitted for review by one of the site administrators."); @@ -19,8 +19,8 @@ define("LAN_135", "News Item: "); define("LAN_136", "Submit News Item"); define("NWSLAN_6", "Category"); define("NWSLAN_10", "No news categories"); -define("NWSLAN_11", "You don't have access to this area."); -define("NWSLAN_12", "Access Denied."); +//define("NWSLAN_11", "You don't have access to this area.");//LAN_UI_403_BODY_ERROR +//define("NWSLAN_12", "Access Denied.");//LAN_UI_403_TITLE_ERROR define("SUBNEWSLAN_1", "You must include a title.\\n"); define("SUBNEWSLAN_2", "You must include some text in the news item.\\n"); diff --git a/e107_plugins/forum/languages/English/English_front.php b/e107_plugins/forum/languages/English/English_front.php index 050f96d9f..ec2e1c5a6 100644 --- a/e107_plugins/forum/languages/English/English_front.php +++ b/e107_plugins/forum/languages/English/English_front.php @@ -371,7 +371,7 @@ define("LAN_410", "Are you sure you want to delete this reply?"); define("LAN_411", "posted by "); //v.616 -define("LAN_412", "Title"); +//define("LAN_412", "Title");//LAN_TITLE define("LAN_413", "Report"); define("LAN_414", "Report this thread to a moderator"); define("LAN_415", "Thread title"); diff --git a/e107_plugins/poll/languages/English.php b/e107_plugins/poll/languages/English.php index 0d5b77af5..3a35b3338 100644 --- a/e107_plugins/poll/languages/English.php +++ b/e107_plugins/poll/languages/English.php @@ -58,7 +58,7 @@ define("POLLAN_30", "Submit"); define("POLLAN_31", "Votes"); define("POLLAN_32", "Click here to see results"); define("POLLAN_33", "No previous polls yet."); -define("POLLAN_34", "Title"); +//define("POLLAN_34", "Title");//LAN_TITLE define("POLLAN_35", "Posted by"); define("POLLAN_36", "Active"); define("POLLAN_37", "active from"); diff --git a/e107_plugins/poll/languages/English_admin_poll.php b/e107_plugins/poll/languages/English_admin_poll.php index 51cf4290f..86401d59e 100644 --- a/e107_plugins/poll/languages/English_admin_poll.php +++ b/e107_plugins/poll/languages/English_admin_poll.php @@ -54,7 +54,7 @@ define("POLLAN_30", "Submit"); define("POLLAN_31", "Votes"); define("POLLAN_32", "Click here to see results"); define("POLLAN_33", "No previous polls yet."); -define("POLLAN_34", "Title"); +//define("POLLAN_34", "Title");//LAN_TITLE define("POLLAN_35", "Posted by"); define("POLLAN_36", "Active"); define("POLLAN_37", "active from"); diff --git a/submitnews.php b/submitnews.php index f1f0a6ec3..a6aef104f 100644 --- a/submitnews.php +++ b/submitnews.php @@ -28,7 +28,7 @@ if (!isset($pref['subnews_class'])) if (!check_class($pref['subnews_class'])) { - $ns->tablerender(NWSLAN_12, NWSLAN_11); + $ns->tablerender(LAN_UI_403_TITLE_ERROR, LAN_UI_403_BODY_ERROR); require_once(FOOTERF); exit; } @@ -202,7 +202,7 @@ $text .= " - ".LAN_62." + ".LAN_TITE."