From 05637a4422535b54c5266574ea953aec93693a11 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 30 Jan 2015 18:14:06 -0800 Subject: [PATCH] Forum language-file cleanup. --- e107_handlers/sitelinks_class.php | 6 +- e107_languages/English/English.php | 6 + e107_languages/English/admin/lan_admin.php | 25 ++-- e107_plugins/forum/e_dashboard.php | 2 +- e107_plugins/forum/e_frontpage.php | 2 +- e107_plugins/forum/e_notify.php | 2 +- e107_plugins/forum/e_search.php | 4 +- e107_plugins/forum/forum.php | 6 +- e107_plugins/forum/forum_admin.php | 43 +++--- e107_plugins/forum/forum_class.php | 24 ++-- e107_plugins/forum/forum_conf.php | 6 +- e107_plugins/forum/forum_mod.php | 12 +- e107_plugins/forum/forum_post.php | 2 +- e107_plugins/forum/forum_stats.php | 33 ++--- e107_plugins/forum/forum_uploads.php | 4 +- e107_plugins/forum/forum_viewforum.php | 2 +- .../forum/languages/English/English_front.php | 57 +++++--- .../languages/English/English_global.php | 3 +- .../languages/English/lan_forum_admin.php | 124 +++++++++--------- .../languages/English/lan_forum_conf.php | 29 ---- .../languages/English/lan_forum_notify.php | 6 +- .../languages/English/lan_forum_search.php | 4 +- .../languages/English/lan_forum_stats.php | 18 +-- .../languages/English/lan_forum_uploads.php | 2 +- .../forum/languages/English/lan_forum_url.php | 2 +- .../English/lan_newforumposts_menu.php | 2 +- e107_plugins/forum/newforumposts_menu.php | 5 +- e107_plugins/forum/search/search_advanced.php | 6 +- e107_plugins/forum/search/search_parser.php | 2 +- .../shortcodes/batch/view_shortcodes.php | 6 +- .../forum/templates/forum_icons_template.php | 6 +- e107_plugins/forum/url/rewrite_url.php | 2 +- e107_plugins/forum/url/url.php | 2 +- e107_plugins/poll/languages/English.php | 12 ++ 34 files changed, 243 insertions(+), 224 deletions(-) diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php index a9703cd97..875c5a218 100644 --- a/e107_handlers/sitelinks_class.php +++ b/e107_handlers/sitelinks_class.php @@ -780,7 +780,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; } $array_sub_functions = array(); $array_sub_functions[17][] = array(e_ADMIN.'newspost.php', LAN_MANAGE, ADLAN_3, 'H', 3, E_16_MANAGE, E_32_MANAGE); $array_sub_functions[17][] = array(e_ADMIN.'newspost.php?create', LAN_CREATE, ADLAN_2, 'H', 3, E_16_CREATE, E_32_CREATE); - $array_sub_functions[17][] = array(e_ADMIN.'newspost.php?pref', LAN_PREFS, ADLAN_4, 'H', 3, E_16_SETTINGS, E_32_SETTINGS); + $array_sub_functions[17][] = array(e_ADMIN.'newspost.php?pref', LAN_PREFS, LAN_PREFS, 'H', 3, E_16_SETTINGS, E_32_SETTINGS); return $array_sub_functions; } @@ -810,8 +810,8 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; } 16 => array(e_ADMIN_ABS.'meta.php', ADLAN_66, ADLAN_67, 'T', 1, E_16_META, E_32_META), 17 => array(e_ADMIN_ABS.'newspost.php', ADLAN_0, ADLAN_1, 'H|N|7', 3, E_16_NEWS, E_32_NEWS), 18 => array(e_ADMIN_ABS.'phpinfo.php', ADLAN_68, ADLAN_69, '0', 20, E_16_PHP, E_32_PHP), - 19 => array(e_ADMIN_ABS.'prefs.php', ADLAN_4, ADLAN_5, '1', 1, E_16_PREFS, E_32_PREFS), - 20 => array(e_ADMIN_ABS.'search.php', ADLAN_142, ADLAN_143, 'X', 1, E_16_SEARCH, E_32_SEARCH), + 19 => array(e_ADMIN_ABS.'prefs.php', LAN_PREFS, ADLAN_5, '1', 1, E_16_PREFS, E_32_PREFS), + 20 => array(e_ADMIN_ABS.'search.php', LAN_SEARCH, ADLAN_143, 'X', 1, E_16_SEARCH, E_32_SEARCH), 21 => array(e_ADMIN_ABS.'admin_log.php', ADLAN_155, ADLAN_156, 'S', 4, E_16_ADMINLOG, E_32_ADMINLOG), 22 => array(e_ADMIN_ABS.'theme.php', ADLAN_140, ADLAN_141, '1', 5, E_16_THEMEMANAGER, E_32_THEMEMANAGER), 23 => array(e_ADMIN_ABS.'upload.php', ADLAN_72, ADLAN_73, 'V', 3, E_16_UPLOADS, E_32_UPLOADS), diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php index c51a1ba15..2d5ebdda9 100644 --- a/e107_languages/English/English.php +++ b/e107_languages/English/English.php @@ -46,6 +46,8 @@ define("EMESSLAN_TITLE_SUCCESS", "Success"); define("EMESSLAN_TITLE_WARNING", "Warning"); define("EMESSLAN_TITLE_DEBUG", "System Debug"); +define("LAN_EDIT","Edit"); +define("LAN_DELETE","Delete"); define("LAN_MORE", "More.."); define("LAN_READ_MORE", "Read more.."); define("LAN_GOPAGE", "Go to page"); @@ -65,6 +67,10 @@ define("LAN_INVALID_CODE", "Incorrect code entered."); define("LAN_SEARCH", "Search"); define("LAN_SHARE", "Share"); define("LAN_BACK", "Back"); +define("LAN_NAME", "Name"); +define("LAN_CANCEL","Cancel"); +define("LAN_DATE","Date"); +define("LAN_JSCONFIRM","Are you sure?"); ?> \ 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 da79c31af..9c9f7287d 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -11,7 +11,7 @@ define("ADLAN_1", "Manage news items"); define("ADLAN_2", "Create news item"); define("ADLAN_3", "News items List"); define("ADLAN_3a", "News Settings"); -define("ADLAN_4", "Preferences"); +// define("ADLAN_4", "Preferences"); define("ADLAN_5", "Edit Site Preferences"); define("ADLAN_6", "Menu Manager"); define("ADLAN_7", "Alter the order of your menus"); @@ -115,7 +115,7 @@ define("ADLAN_106", "Image Settings"); define("ADLAN_110", "Registered members"); define("ADLAN_111", "Unverified members"); define("ADLAN_112", "Banned users"); -define("ADLAN_113", "Forum posts"); +// define("ADLAN_113", "Forum posts"); // should already be loaded from forum global language file. define("ADLAN_114", "Comments"); define("ADLAN_115", "Chatbox posts"); define("ADLAN_116", "Admin log ..."); @@ -154,7 +154,7 @@ define("ADLAN_139", "Add/edit/delete links"); define("ADLAN_140", "Theme Manager"); define("ADLAN_141", "Install / set themes etc"); -define("ADLAN_142", "Search"); +// define("ADLAN_142", "Search"); define("ADLAN_143", "Search Configuration"); define("ADLAN_144", "You are in simple-view mode, to switch to advanced-view"); define("ADLAN_145", "click here"); @@ -216,8 +216,7 @@ define("ADLAN_ERR_3", "There are one or more files in your public upload directo // Common Terms -define("LAN_EDIT","Edit"); -define("LAN_DELETE","Delete"); + define("LAN_CREATE","Create"); define("LAN_MANAGE","Manage"); define("LAN_UPDATE","Update"); @@ -227,7 +226,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_JSCONFIRM","Are you sure?"); + define("LAN_OPTIONS","Options"); define("LAN_PREFS","Preferences"); define("LAN_DELETED","Successfully deleted"); @@ -245,20 +244,20 @@ define("LAN_RESET","Reset"); define("LAN_CLEAR","Clear"); // define("LAN_OK","OK"); // defined in e107_languages/English/English.php -define("LAN_PRESET","Preset"); -define("LAN_PRESET_SAVED","Preset saved successfully"); +// define("LAN_PRESET","Preset"); +// define("LAN_PRESET_SAVED","Preset saved successfully"); -define("LAN_PRESET_DELETED","Preset successfully deleted"); -define("LAN_PRESET_CONFIRMDEL","Are you sure you want to delete this preset?"); +// 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_DATE","Date"); + define("LAN_TIME","Time"); // define("LAN_YES","Yes"); // define("LAN_NO","No"); // defined in e107_languages/English/English.php define("LAN_EMPTY","There are no entries in the database yet"); define("LAN_EXISTING","Existing Entries"); -define("LAN_CANCEL","Cancel"); + define("LAN_CONFDELETE","Confirm Delete"); define("LAN_PLUGIN","Plugin"); define("LAN_ORDER","Order"); @@ -320,7 +319,7 @@ define("LAN_STATUS", "Status"); define("LAN_URL", "URL"); define("LAN_USER", "User"); define("LAN_OWNER", "Owner"); -define("LAN_NAME", "Name"); + define("LAN_EMAIL","Email address"); define("LAN_ID", "ID"); define("LAN_IP", "IP Address"); diff --git a/e107_plugins/forum/e_dashboard.php b/e107_plugins/forum/e_dashboard.php index d7e1776a2..977e8bb45 100644 --- a/e107_plugins/forum/e_dashboard.php +++ b/e107_plugins/forum/e_dashboard.php @@ -17,7 +17,7 @@ class forum_dashboard // include plugin-folder in the name. $forum_posts = $sql->count('forum_post'); $var[0]['icon'] = E_16_FORUM; - $var[0]['title'] = ADLAN_113; + $var[0]['title'] = LAN_PLUGIN_FORUM_POSTS; $var[0]['url'] = e_PLUGIN."forum/forum_admin.php"; $var[0]['total'] = $forum_posts; diff --git a/e107_plugins/forum/e_frontpage.php b/e107_plugins/forum/e_frontpage.php index 3ebe7edfa..1a1a7a89e 100644 --- a/e107_plugins/forum/e_frontpage.php +++ b/e107_plugins/forum/e_frontpage.php @@ -7,6 +7,6 @@ e107::lan('forum', 'English_front'); /** * @todo - extend array to allow selection of any main forum, as well as the forum front page */ -$front_page['forum'] = array('page' => $PLUGINS_DIRECTORY.'forum/forum.php', 'title' => LAN_FORUM_0001); +$front_page['forum'] = array('page' => $PLUGINS_DIRECTORY.'forum/forum.php', 'title' => LAN_PLUGIN_FORUM_NAME); ?> \ No newline at end of file diff --git a/e107_plugins/forum/e_notify.php b/e107_plugins/forum/e_notify.php index ccb46e818..aa06fd5f7 100644 --- a/e107_plugins/forum/e_notify.php +++ b/e107_plugins/forum/e_notify.php @@ -64,7 +64,7 @@ class forum_notify extends notify function forum_nt($data) { $message = 'todo'; - $this->send('forum_nt', FORUM_NT_6, $message); + $this->send('forum_nt', LAN_PLUGIN_FORUM_NAME, $message); } function forum_ntp($data) diff --git a/e107_plugins/forum/e_search.php b/e107_plugins/forum/e_search.php index 72e29d3c0..fdfa47001 100644 --- a/e107_plugins/forum/e_search.php +++ b/e107_plugins/forum/e_search.php @@ -1,11 +1,11 @@ e_PLUGIN.'forum/search/search_parser.php', - 'qtype' => FOR_SCH_LAN_1, + 'qtype' => LAN_PLUGIN_FORUM_NAME, 'refpage' => 'forum', 'advanced' => e_PLUGIN.'forum/search/search_advanced.php', 'id' => 'forum' diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php index 85e24fe1b..835423431 100644 --- a/e107_plugins/forum/forum.php +++ b/e107_plugins/forum/forum.php @@ -62,7 +62,7 @@ if(isset($_GET['f'])) $fVars = new e_vars; $gen = new convert; -$fVars->FORUMTITLE = LAN_FORUM_0001; +$fVars->FORUMTITLE = LAN_PLUGIN_FORUM_NAME; $fVars->THREADTITLE = LAN_FORUM_0002; $fVars->REPLYTITLE = LAN_FORUM_0003; $fVars->LASTPOSTITLE = LAN_FORUM_0004; @@ -251,7 +251,7 @@ $newflag_list = $forum->forumGetUnreadForums(); if (!$forumList) { - $ns->tablerender(LAN_FORUM_0001, "
".LAN_FORUM_0067.'
', array('forum', '51')); + $ns->tablerender(LAN_PLUGIN_FORUM_NAME, "
".LAN_FORUM_0067.'
', array('forum', '51')); require_once(FOOTERF); exit; } @@ -552,7 +552,7 @@ function forum_rules($action = 'check') { $rules_text = LAN_FORUM_0072; } - e107::getRender()->tablerender(LAN_FORUM_0071, "
{$rules_text}
", array('forum', 'forum_rules')); + e107::getRender()->tablerender(LAN_FORUM_0016, "
{$rules_text}
", array('forum', 'forum_rules')); } ?> \ No newline at end of file diff --git a/e107_plugins/forum/forum_admin.php b/e107_plugins/forum/forum_admin.php index cc1a0818d..26ba654a4 100644 --- a/e107_plugins/forum/forum_admin.php +++ b/e107_plugins/forum/forum_admin.php @@ -11,6 +11,7 @@ $eplug_admin = true; require_once('../../class2.php'); include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_admin.php'); +e107::lan('forum','front'); if (!getperms('P')) { @@ -157,7 +158,7 @@ if(isset($_POST['update_subs'])) { if ($sql->delete("forum", "forum_id='$id' ")) { - $msg .= FORLAN_150." ". LAN_ID.":"." ".$id." ".LAN_DELETED."
"; + $msg .= LAN_FORUM_1002." ". LAN_ID.":"." ".$id." ".LAN_DELETED."
"; $cnt = $sql->delete("forum_thread", "thread_forum_id = {$id}"); $msg .= $cnt." ".FORLAN_152." ".LAN_DELETED."
"; } @@ -169,7 +170,7 @@ if(isset($_POST['update_subs'])) $_order = (int)$_POST['suborder'][$id]; if($sql->update('forum', "forum_name='{$_name}', forum_description='{$_desc}', forum_order='{$_order}' WHERE forum_id = {$id}")) { - $msg .= FORLAN_150 ." ". LAN_ID.":"." ".$id." ".LAN_UPDATED."
"; + $msg .= LAN_FORUM_1002 ." ". LAN_ID.":"." ".$id." ".LAN_UPDATED."
"; } } } @@ -503,15 +504,15 @@ class forumAdmin } $var['order']['text'] = FORLAN_78; $var['order']['link'] = e_SELF.'?order'; - $var['opt']['text'] = FORLAN_79; + $var['opt']['text'] = LAN_PREFS; $var['opt']['link'] = e_SELF.'?opt'; $var['prune']['text'] = LAN_PRUNE; $var['prune']['link'] = e_SELF.'?prune'; - $var['rules']['text'] = FORLAN_123; + $var['rules']['text'] = LAN_FORUM_0016; $var['rules']['link'] = e_SELF.'?rules'; $var['sr']['text'] = FORLAN_116; $var['sr']['link'] = e_SELF.'?sr'; - $var['mods']['text'] = FORLAN_33; + $var['mods']['text'] = LAN_FORUM_2003; $var['mods']['link'] = e_SELF.'?mods'; $var['tools']['text'] = FORLAN_153; $var['tools']['link'] = e_SELF.'?tools'; @@ -716,8 +717,8 @@ class forumAdmin ".LAN_ID." ".LAN_NAME." ".LAN_DESCRIPTION." - ".FORLAN_37." - ".FORLAN_20." + ".LAN_ORDER." + ".LAN_DELETE." "; if($sql->select('forum', 'forum_id, forum_name, forum_description, forum_order', "forum_sub = {$id} ORDER by forum_order ASC")) @@ -757,7 +758,7 @@ class forumAdmin ".LAN_ID." ".LAN_NAME." ".LAN_DESCRIPTION." - ".FORLAN_37." + ".LAN_ORDER."   @@ -771,9 +772,9 @@ class forumAdmin ".$frm->admin_button('create_sub', LAN_CREATE, 'submit')." - - "; - $ns->tablerender(FORLAN_149, $txt); // TODO LAN + "; + + $ns->tablerender(LAN_FORUM_0069, $txt); } function show_existing_forums($sub_action, $id, $mode = false) @@ -806,7 +807,7 @@ class forumAdmin $text .= " - + "; while ($row = $sql->fetch(MYSQL_ASSOC)) @@ -818,7 +819,7 @@ class forumAdmin $text .= " "; $text .= " @@ -907,7 +908,7 @@ class forumAdmin else { $text .= "
".FORLAN_28."".LAN_FORUM_1001." ".LAN_OPTIONS."
".$parent['forum_name']." -
".FORLAN_140.": ".e107::getUserClass()->uc_get_classname($parent['forum_class'])."  ".FORLAN_141.": ".e107::getUserClass()->uc_get_classname($parent['forum_postclass'])." +
".FORLAN_140.": ".e107::getUserClass()->uc_get_classname($parent['forum_class'])."  ".LAN_FORUM_2015.": ".e107::getUserClass()->uc_get_classname($parent['forum_postclass'])." 		"; @@ -864,7 +865,7 @@ class forumAdmin $text .= "
".$tp->toHTML($forum['forum_description'])."  -
".FORLAN_140.": ".e107::getUserClass()->uc_get_classname($forum['forum_class'])."  ".FORLAN_141.": ".e107::getUserClass()->uc_get_classname($forum['forum_postclass'])." +
".FORLAN_140.": ".e107::getUserClass()->uc_get_classname($forum['forum_class'])."  ".LAN_FORUM_2015.": ".e107::getUserClass()->uc_get_classname($forum['forum_postclass'])."
".$frm->admin_button('update_order', LAN_UPDATE, 'update')."
"; - $ns->tablerender(FORLAN_37, $mes->render() . $text); + $ns->tablerender(LAN_ORDER, $mes->render() . $text); } } @@ -1012,7 +1013,7 @@ class forumAdmin - ".FORLAN_22.": + ".LAN_FORUM_0004.": "; $sql->select('forum', '*', 'forum_parent=0'); @@ -1036,7 +1037,7 @@ class forumAdmin - ".FORLAN_33.": + ".LAN_FORUM_2003.": "; $text .= e107::getUserClass()->uc_dropdown('forum_moderators', $fInfo['forum_moderators'], 'admin,classes')."".FORLAN_34.""; $text .= " @@ -1071,7 +1072,7 @@ class forumAdmin "; - $ns->tablerender(FORLAN_28, $text); + $ns->tablerender(LAN_FORUM_1001, $text); } @@ -1109,7 +1110,7 @@ class forumAdmin { $txt .= " ".$tp->toHTML($f['forum_name'])."
"; } - $txt .= " ".FORLAN_157.""; + $txt .= " ".LAN_PLUGIN_FORUM_ALLFORUMS.""; } $txt .= " @@ -1334,7 +1335,7 @@ class forumAdmin ".e107::getDate()->convert_date($row['gen_datestamp'], "long")." - ".FORLAN_176.": + ".LAN_FORUM_2046.": ".$row['gen_chardata']." @@ -1492,7 +1493,7 @@ class forumAdmin ".$frm->admin_button('setMods', LAN_UPDATE, 'update')." "; - $ns->tablerender(FORLAN_33, $txt); // FIX: LAN button update was WMGLAN_4." ".FORLAN_33) + $ns->tablerender(LAN_FORUM_2003, $txt); } // TODO: check media category on $frm->bbarea() diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php index c8b06097b..84e446be8 100644 --- a/e107_plugins/forum/forum_class.php +++ b/e107_plugins/forum/forum_class.php @@ -377,7 +377,7 @@ class e107forum case 'lock': if(e107::getDb()->update('forum_thread', 'thread_active=0 WHERE thread_id='.$id)) { - $ret['msg'] = LAN_FORUM_CLOSE; // FORLAN_CLOSE; + $ret['msg'] = LAN_FORUM_CLOSE; $ret['status'] = 'ok'; } else @@ -390,7 +390,7 @@ class e107forum case 'unlock': if(e107::getDb()->update('forum_thread', 'thread_active=1 WHERE thread_id='.$id)) { - $ret['msg'] = LAN_FORUM_OPEN; // FORLAN_OPEN; + $ret['msg'] = LAN_FORUM_OPEN; $ret['status'] = 'ok'; } else @@ -403,7 +403,7 @@ class e107forum case 'stick': if(e107::getDb()->update('forum_thread', 'thread_sticky=1 WHERE thread_id='.$id)) { - $ret['msg'] = LAN_FORUM_STICK; // FORLAN_STICK; + $ret['msg'] = LAN_FORUM_STICK; $ret['status'] = 'ok'; } else @@ -416,7 +416,7 @@ class e107forum case 'unstick': if(e107::getDb()->update('forum_thread', 'thread_sticky=0 WHERE thread_id='.$id)) { - $ret['msg'] = LAN_FORUM_UNSTICK; // FORLAN_UNSTICK; + $ret['msg'] = LAN_FORUM_UNSTICK; $ret['status'] = 'ok'; } else @@ -1736,7 +1736,7 @@ class e107forum $FORUM_CRUMB['sitename']['value'] = str_replace($search, $replace, $FORUM_CRUMB['sitename']['value']); $search = array('{FORUMS_TITLE}', '{FORUMS_HREF}'); - $replace = array(LAN_FORUM_0001, e107::getUrl()->create('forum/forum/main')); + $replace = array(LAN_PLUGIN_FORUM_NAME, e107::getUrl()->create('forum/forum/main')); $FORUM_CRUMB['forums']['value'] = str_replace($search, $replace, $FORUM_CRUMB['forums']['value']); $search = array('{PARENT_TITLE}', '{PARENT_HREF}'); @@ -1771,7 +1771,7 @@ class e107forum else { $dfltsep = ' :: '; - $BREADCRUMB = "".SITENAME."".$dfltsep."".LAN_FORUM_0001."".$dfltsep; + $BREADCRUMB = "".SITENAME."".$dfltsep."".LAN_PLUGIN_FORUM_NAME."".$dfltsep; if($forumInfo['sub_parent']) { $forum_sub_parent = (substr($forumInfo['sub_parent'], 0, 1) == '*' ? substr($forumInfo['sub_parent'], 1) : $forumInfo['sub_parent']); @@ -1800,7 +1800,7 @@ class e107forum $breadcrumb = array(); - $breadcrumb[] = array('text'=> LAN_FORUM_0001 , 'url'=> e107::getUrl()->create('forum/forum/main')); + $breadcrumb[] = array('text'=> LAN_PLUGIN_FORUM_NAME , 'url'=> e107::getUrl()->create('forum/forum/main')); if($forumInfo['sub_parent']) { @@ -1970,16 +1970,12 @@ class e107forum * @return string path to and filename of forum icon image * * @param string $filename filename of forum image -* @param string $eMLANG_folder if specified, indicates its a multilanguage image being processed and -* gives the subfolder of the image path to the eMLANG_path() function, -* default = FALSE -* @param string $eMLANG_pref if specified, indicates that $filename may be overridden by the -* $pref with $eMLANG_pref as its key if that pref is TRUE, default = FALSE + * * @desc checks for the existence of a forum icon image in the themes forum folder and if it is found * returns the path and filename of that file, otherwise it returns the path and filename of the -* default forum icon image in e_IMAGES. The additional $eMLANG args if specfied switch the process -* to the sister multi-language function eMLANG_path(). +* default forum icon image in e_IMAGES. The additional args if specfied switch the process +* to the sister multi-language function * * @access public */ diff --git a/e107_plugins/forum/forum_conf.php b/e107_plugins/forum/forum_conf.php index f466fae09..b0dcfac51 100644 --- a/e107_plugins/forum/forum_conf.php +++ b/e107_plugins/forum/forum_conf.php @@ -124,11 +124,11 @@ if ($action == "delete_poll") ".FORCONF_13."

- +
"; - $ns->tablerender(FORCONF_16, $text); + $ns->tablerender(LAN_UI_DELETE_LABEL, $text); require_once(FOOTERF); exit; } @@ -199,7 +199,7 @@ if ($action == 'move')
- +
diff --git a/e107_plugins/forum/forum_mod.php b/e107_plugins/forum/forum_mod.php index 4c8bef676..158fb0284 100644 --- a/e107_plugins/forum/forum_mod.php +++ b/e107_plugins/forum/forum_mod.php @@ -26,22 +26,22 @@ function forum_thread_moderate($p) { case 'lock': $sql->update('forum_thread', 'thread_active=0 WHERE thread_id='.$id); - return FORLAN_CLOSE; + return LAN_FORUM_CLOSE; break; case 'unlock': $sql->update('forum_thread', 'thread_active=1 WHERE thread_id='.$id); - return FORLAN_OPEN; + return LAN_FORUM_OPEN; break; case 'stick': $sql->update('forum_thread', 'thread_sticky=1 WHERE thread_id='.$id); - return FORLAN_STICK; + return LAN_FORUM_STICK; break; case 'unstick': $sql->update('forum_thread', 'thread_sticky=0 WHERE thread_id='.$id); - return FORLAN_UNSTICK; + return LAN_FORUM_UNSTICK; break; case 'deleteThread': @@ -62,7 +62,7 @@ function forumDeleteThread($threadId) require_once (e_PLUGIN.'forum/forum_class.php'); $f = new e107forum; $ret = $f->threadDelete($threadId); - return FORLAN_6.' and '.$ret.' '.FORLAN_7.'.'; + return LAN_CANCEL.' and '.$ret.' '.FORLAN_7.'.'; } function forumDeletePost($postId) @@ -70,7 +70,7 @@ function forumDeletePost($postId) require_once (e_PLUGIN.'forum/forum_class.php'); $f = new e107forum; $ret = $f->postDelete($postId); - return FORLAN_6.' and '.$ret.' '.FORLAN_7.'.'; + return LAN_CANCEL.' and '.$ret.' '.FORLAN_7.'.'; } ?> \ No newline at end of file diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php index 33eb4d25c..7ff30d29a 100644 --- a/e107_plugins/forum/forum_post.php +++ b/e107_plugins/forum/forum_post.php @@ -148,7 +148,7 @@ if (isset($_POST['fpreview'])) } else { - $poster = ($_POST['anonname']) ? $_POST['anonname'] : LAN_FORUM_3004; + $poster = ($_POST['anonname']) ? $_POST['anonname'] : LAN_ANONYMOUS; } $postdate = $gen->convert_date(time(), "forum"); $tsubject = $tp->post_toHTML($_POST['subject'], true); diff --git a/e107_plugins/forum/forum_stats.php b/e107_plugins/forum/forum_stats.php index 4f53f5cf5..a3a709e91 100644 --- a/e107_plugins/forum/forum_stats.php +++ b/e107_plugins/forum/forum_stats.php @@ -22,6 +22,9 @@ if (!$e107->isInstalled('forum')) //TODO: Investigate the queries used here include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_stats.php'); +e107::lan('forum','front'); + + require_once(e_PLUGIN.'forum/forum_class.php'); $gen = new convert; $forum = new e107forum; @@ -219,7 +222,7 @@ $text = " ".FSLAN_2.":  {$open_date} ".FSLAN_3.":  {$open_since} ".FSLAN_4.":  {$total_posts} - ".FSLAN_5.":  {$total_topics} + ".LAN_FORUM_1007.":  {$total_topics} ".FSLAN_6.":  {$total_replies} ".FSLAN_7.":  {$total_views} ".FSLAN_24.":  {$postsperday} @@ -231,14 +234,14 @@ $text = "
- + - - + + - + "; @@ -276,10 +279,10 @@ $text .= "
".FSLAN_10."".LAN_FORUM_0011."
".FSLAN_11."".FSLAN_12."".FSLAN_13."".LAN_FORUM_1003."".LAN_FORUM_0003." ".FSLAN_14."".FSLAN_15."".LAN_DATE."
".FSLAN_11." -".FSLAN_12." -".FSLAN_17." +".LAN_FORUM_1003." +".LAN_FORUM_1005." ".FSLAN_14." -".FSLAN_15." +".LAN_DATE." "; @@ -313,13 +316,13 @@ $text .= "
- + - - + + @@ -353,8 +356,8 @@ $text .= " - - + + @@ -385,8 +388,8 @@ $text .= "
".FSLAN_18."".LAN_FORUM_0010."
".FSLAN_11."".FSLAN_19."".FSLAN_20."".LAN_NAME."".LAN_FORUM_2032." %  
".FSLAN_11."".FSLAN_19."".FSLAN_20."".LAN_NAME."".LAN_FORUM_2032." %  
".FSLAN_11." -".FSLAN_19." -".FSLAN_20." +".LAN_NAME." +".LAN_FORUM_2032." %   diff --git a/e107_plugins/forum/forum_uploads.php b/e107_plugins/forum/forum_uploads.php index c69fb89af..85dc61367 100644 --- a/e107_plugins/forum/forum_uploads.php +++ b/e107_plugins/forum/forum_uploads.php @@ -24,6 +24,8 @@ if(!USER) include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_forum_uploads.php'); +e107::lan('forum','front'); + if(is_array($_POST['delete'])) { foreach(array_keys($_POST['delete']) as $fname) @@ -101,7 +103,7 @@ if(is_array($fileList)) } else { - $txt .= "".FRMUP_8." "; + $txt .= "".FRMUP_8." "; } $txt .= ""; } diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php index 381a960ce..9217a4e2f 100644 --- a/e107_plugins/forum/forum_viewforum.php +++ b/e107_plugins/forum/forum_viewforum.php @@ -365,7 +365,7 @@ else echo ""; diff --git a/e107_plugins/forum/languages/English/English_front.php b/e107_plugins/forum/languages/English/English_front.php index 143715f4f..219a591b6 100644 --- a/e107_plugins/forum/languages/English/English_front.php +++ b/e107_plugins/forum/languages/English/English_front.php @@ -24,7 +24,7 @@ vf = viewforum, vt = viewtopic, p = post, etc. define("e_PAGETITLE", "Forum"); // forum.php (forum_template) -define("LAN_FORUM_0001", "Forum"); // LAN_46 +// define("LAN_FORUM_0001", "Forum"); // LAN_46 define("LAN_FORUM_0002", "Topics"); // LAN_47 / FORLAN_21 define("LAN_FORUM_0003", "Replies"); // LAN_48 / LAN_55 define("LAN_FORUM_0004", "Last Post"); // LAN_49 / FORLAN_22 / LAN_57 @@ -109,7 +109,7 @@ define("LAN_FORUM_0068", "No forums in this section yet, please check back soon. define('LAN_FORUM_0069', 'Sub-forums'); // FORLAN_444 define("LAN_FORUM_0070", "Cancel Topic Tracking"); // LAN_392 -define("LAN_FORUM_0071", "Forum Rules"); // LAN_433 +//define("LAN_FORUM_0071", "Forum Rules"); // LAN_433 define("LAN_FORUM_0072", "No rules defined."); // FORLAN_441 define("LAN_FORUM_0073", "Tracked topics"); // LAN_397 define("LAN_FORUM_0074", "Posted by"); // LAN_423 @@ -137,7 +137,7 @@ define("LAN_FORUM_1016", "Poll"); // FORLAN_23 define("LAN_FORUM_1017", "Go to"); // LAN_401 (p?) define("LAN_FORUM_1018", "New topic"); -define("LAN_FORUM_1019", "Are you sure?"); // new +// define("LAN_FORUM_1019", "Are you sure?"); // new // starting at LAN_FORUM_2xxx => forum_viewtopic.php define("LAN_FORUM_2001", "Previous topic"); // LAN_389 @@ -190,8 +190,8 @@ define("LAN_FORUM_2036", "Send Private Message"); // new / LAN_399 define("LAN_FORUM_2037", "Post deleted on"); // new define("LAN_FORUM_2038", "Reason"); // new -define("LAN_FORUM_2039", "Edit"); // LAN_400 -define("LAN_FORUM_2040", "Delete"); // LAN_435 (vf)? +// define("LAN_FORUM_2039", "Edit"); // LAN_400 +// define("LAN_FORUM_2040", "Delete"); // LAN_435 (vf)? define("LAN_FORUM_2041", "Quote"); // LAN_401 define("LAN_FORUM_2042", "Move"); // FORCONF_25 ? define("LAN_FORUM_2043", "Split"); // new @@ -204,9 +204,9 @@ define("LAN_FORUM_3001", "You are not authorized to post to this forum."); // LA define("LAN_FORUM_3002", "This topic is locked."); // LAN_397 define("LAN_FORUM_3003", "Replying to"); // LAN_02 (p) -define("LAN_FORUM_3004", "Anonymous"); // LAN_311 +// define("LAN_FORUM_3004", "Anonymous"); // LAN_311 define("LAN_FORUM_3005", "Preview"); // LAN_323 -define("LAN_FORUM_3006", "Duplicate post"); // LAN_FORUM_2 +// define("LAN_FORUM_3006", "Duplicate post"); // LAN_FORUM_2 define("LAN_FORUM_3007", "You left required field(s) blank"); // LAN_27 define("LAN_FORUM_3008", "Unauthorised"); // LAN_95 define("LAN_FORUM_3009", "You are not authorised to edit this forum post."); //LAN_96 @@ -234,15 +234,6 @@ define("LAN_FORUM_3026", "Post topic as"); // LAN_400 (p) // poll - partly in e107_plugins/poll/poll_class.php define("LAN_FORUM_3028", "Add Poll"); // new -define("LAN_FORUM_3029", "If you do not wish to add a poll to your topic, leave the fields blank."); // LAN_386 -define("LAN_FORUM_3030", "Poll question"); // LAN_5 -define("LAN_FORUM_3031", "Poll answer"); // LAN_391 -define("LAN_FORUM_3032", "Add another answer"); // LAN_6 -define("LAN_FORUM_3033", "Allow multiple choices?"); // LAN_506 -define("LAN_FORUM_3034", "Vote storage method"); // POLLAN_16 -define("LAN_FORUM_3035", "Cookie"); // POLLAN_17 -define("LAN_FORUM_3036", "IP address"); // POLLAN_18 -define("LAN_FORUM_3037", "User ID (only members can vote)"); // POLLAN_19 define("LAN_FORUM_3038", "Normal"); // LAN_1 define("LAN_FORUM_3039", "Deactivate emoticons for this post"); // LAN_FORUMPOST_EMOTES @@ -277,11 +268,45 @@ define("LAN_FORUM_4012", "Unstick thread"); // LAN_398 define("LAN_FORUM_4013", "Lock thread"); // LAN_399 define("LAN_FORUM_4014", "Unlock thread"); // LAN_400 + +// Ajax and actions define("LAN_FORUM_CLOSE", "Thread closed."); define("LAN_FORUM_OPEN", "Thread reopened."); define("LAN_FORUM_STICK", "Thread made sticky."); define("LAN_FORUM_UNSTICK", "Thread unstuck."); +// Config -TO BE RENAMED + +define("FORCONF_5", "Poll deleted."); // FORCONF_5 +define("FORCONF_6", "Thread deleted"); // FORCONF_6 +define("FORCONF_7", "replies deleted"); // FORCONF_7 +define("FORCONF_8", "Delete cancelled."); // FORCONF_8 +define("FORCONF_9", "Thread moved."); // FORCONF_9 +define("FORCONF_10", "Move cancelled."); // FORCONF_10 +define("FORCONF_11", "Back To Forums"); // FORCONF_11 +define("FORCONF_12", "Forum Configuration"); // FORCONF_12 +define("FORCONF_13", "Are you absolutely certain you want to delete this poll?
Once deleted it cannot be retrieved."); +// define("FORCONF_14", "Cancel"); +define("FORCONF_15", "Confirm Delete Forum Post"); // FORCONF_15 +// define("FORCONF_16", "Confirm Delete Poll"); // FORCONF_16 +define("FORCONF_17", "posted by"); // FORCONF_17 +define("FORCONF_18", "Are you absolutely certain you want to delete this forum"); +define("FORCONF_19", "thread and it's related posts?"); +define("FORCONF_20", "the poll will also be deleted"); +define("FORCONF_21", "Once deleted they"); +define("FORCONF_22", "post?
Once deleted it"); +define("FORCONF_23", "cannot be retrieved"); +define("FORCONF_24", "Move thread to forum"); +define("FORCONF_25", "Move Thread"); +define("FORCONF_26", "Reply deleted"); + +define("FORCONF_27", "moved"); + +define("FORCONF_28", "Do not rename thread title"); +define("FORCONF_29", "Add"); +define("FORCONF_30", "to title"); +define("FORCONF_31", "Rename to:"); +define("FORCONF_32", "Rename thread options:"); /* THIS WILL BE DELETED ONCE THE REWRITE IS DONE ================================================== diff --git a/e107_plugins/forum/languages/English/English_global.php b/e107_plugins/forum/languages/English/English_global.php index 8976f3e3b..45a38ce50 100644 --- a/e107_plugins/forum/languages/English/English_global.php +++ b/e107_plugins/forum/languages/English/English_global.php @@ -3,6 +3,7 @@ define("LAN_PLUGIN_FORUM_NAME", "Forum"); define("LAN_PLUGIN_FORUM_DESC", "This plugin is a fully featured forum system."); define("LAN_PLUGIN_FORUM_POSTS", "Forum posts"); +define("LAN_PLUGIN_FORUM_ALLFORUMS", "All Forums"); // Notify // TODO - LAN cleanup (see e_notify) @@ -11,7 +12,7 @@ define("LAN_PLUGIN_FORUM_POSTS", "Forum posts"); //define('FORUM_NT_3', 'Post'); //define('FORUM_NT_4', 'added by'); //define('FORUM_NT_5', 'moved by'); -define('FORUM_NT_6', 'Forum - Thread created'); +// define('FORUM_NT_6', 'Forum - Thread created'); define('FORUM_NT_7', 'Forum - Thread created by new user'); define('FORUM_NT_8', 'Forum - Thread deleted'); define('FORUM_NT_9', 'Forum - Thread split'); diff --git a/e107_plugins/forum/languages/English/lan_forum_admin.php b/e107_plugins/forum/languages/English/lan_forum_admin.php index 83f22b97d..219b77e62 100644 --- a/e107_plugins/forum/languages/English/lan_forum_admin.php +++ b/e107_plugins/forum/languages/English/lan_forum_admin.php @@ -9,12 +9,12 @@ | $Author$ +----------------------------------------------------------------------------+ */ -define("FORLAN_1", "You must enter the number of days you wish to prune."); +//define("FORLAN_1", "You must enter the number of days you wish to prune."); define("FORLAN_2", "Please select to either delete pruned posts completely, or make them inactive (not deleted but not visible in forums)"); -define("FORLAN_3", "delete"); -define("FORLAN_4", "Make inactive"); -define("FORLAN_5", "Carry Out Prune"); -define("FORLAN_6", "Cancel"); +// define("FORLAN_3", "delete"); +// define("FORLAN_4", "Make inactive"); +// define("FORLAN_5", "Carry Out Prune"); +// define("FORLAN_6", "Cancel"); define("FORLAN_7", "Forum Options"); define("FORLAN_8", "Forums pruned."); define("FORLAN_9", "Prune not required."); @@ -23,38 +23,38 @@ define("FORLAN_9", "Prune not required."); //define("FORLAN_12", "Forum updated"); //define("FORLAN_13", "Parent created"); //define("FORLAN_14", "Forum parent updated"); -define("FORLAN_15", "Please tick the confirm box to delete the forum"); -define("FORLAN_16", "Forums"); -define("FORLAN_17", "No parents yet."); -define("FORLAN_18", "Existing Parents"); -define("FORLAN_19", "Edit"); -define("FORLAN_20", "Delete"); -define("FORLAN_21", "tick to confirm"); -define("FORLAN_22", "Parent"); +//define("FORLAN_15", "Please tick the confirm box to delete the forum"); +// define("FORLAN_16", "Forums"); +//define("FORLAN_17", "No parents yet."); +//define("FORLAN_18", "Existing Parents"); +// define("FORLAN_19", "Edit"); +// define("FORLAN_20", "Delete"); +//define("FORLAN_21", "tick to confirm"); +//define("FORLAN_22", "Parent"); define("FORLAN_23", "Viewable by"); define("FORLAN_24", "Indicates who can view the forum"); //define("FORLAN_25", "Update Parent"); //define("FORLAN_26", "Create Parent"); -define("FORLAN_27", "You need to define at least one forum parent before creating a forum."); -define("FORLAN_28", "Forums"); +//define("FORLAN_27", "You need to define at least one forum parent before creating a forum."); +// define("FORLAN_28", "Forums"); define("FORLAN_29", "No forums yet."); define("FORLAN_30", "Existing Forums"); //define("FORLAN_31", "Name"); //define("FORLAN_32", "Description"); -define("FORLAN_33", "Moderators"); +// define("FORLAN_33", "Moderators"); define("FORLAN_34", "Choose userclass for moderators of this forum"); //define("FORLAN_35", "Update Forum"); //define("FORLAN_36", "Create Forum"); -define("FORLAN_37", "Order"); -define("FORLAN_38", "Closed"); -define("FORLAN_39", "Members Only"); -define("FORLAN_40", "Restricted"); -define("FORLAN_41", "move up"); -define("FORLAN_42", "move down"); -define("FORLAN_43", "Preview / Forum Order"); -define("FORLAN_44", "Enclose tables"); -define("FORLAN_45", "Tick this to render the forum within theme table"); -define("FORLAN_46", "Title displayed in caption if enclose tables is ticked"); +// define("FORLAN_37", "Order"); +// define("FORLAN_38", "Closed"); +// define("FORLAN_39", "Members Only"); +// define("FORLAN_40", "Restricted"); +// define("FORLAN_41", "move up"); +// define("FORLAN_42", "move down"); +// define("FORLAN_43", "Preview / Forum Order"); + define("FORLAN_44", "Enclose tables"); + define("FORLAN_45", "Tick this to render the forum within theme table"); +// define("FORLAN_46", "Title displayed in caption if enclose tables is ticked"); define("FORLAN_47", "Enable email notification"); define("FORLAN_48", "Tick this to allow your users to have the option of receiving an email when somebody replies to their post"); define("FORLAN_49", "Enable polls for"); @@ -71,8 +71,8 @@ define("FORLAN_58", "Number of posts displayed per page"); define("FORLAN_60", "This will delete all threads that have not received a reply in the number of days you enter.
Please be careful using this function!"); //define("FORLAN_61", "Update Options"); define("FORLAN_62", "Forum Options"); -define("FORLAN_63", "Ranks"); -define("FORLAN_64", "Enter your levels here, if left blank generic stars will be used to denote level. Separate levels with comma. Maximum of 10 levels, lowest first."); +// define("FORLAN_63", "Ranks"); +// define("FORLAN_64", "Enter your levels here, if left blank generic stars will be used to denote level. Separate levels with comma. Maximum of 10 levels, lowest first."); define("FORLAN_65", "Forum Title"); define('FORLAN_66', 'Not installed'); @@ -85,17 +85,17 @@ define("FORLAN_75", "Parents"); define("FORLAN_76", "Forums Front Page"); define("FORLAN_77", "Create Forums"); define("FORLAN_78", "Forum Order"); -define("FORLAN_79", "Preferences"); +// define("FORLAN_79", "Preferences"); //define("FORLAN_80", "Options"); -define("FORLAN_81", "Are you sure you want to delete this parent? - forums of this parent will also be deleted"); -define("FORLAN_82", "Are you sure you want to delete this forum?"); +// define("FORLAN_81", "Are you sure you want to delete this parent? - forums of this parent will also be deleted"); +// define("FORLAN_82", "Are you sure you want to delete this forum?"); define("FORLAN_83", "Create Parents"); -define("FORLAN_84", "Members Only"); -define("FORLAN_85", "Read Only"); -define("FORLAN_86", "Admin Only"); +// define("FORLAN_84", "Members Only"); +// define("FORLAN_85", "Read Only"); +// define("FORLAN_86", "Admin Only"); define("FORLAN_87", "Prune topics with no replies in this many days:"); -define("FORLAN_88", "Prune topics with no replies in this many days:"); +// define("FORLAN_88", "Prune topics with no replies in this many days:"); define("FORLAN_89", "Delete posts completely"); define("FORLAN_90", "Make posts inactive"); @@ -104,40 +104,40 @@ define("FORLAN_91", "post(s) made inactive"); define("FORLAN_92", "thread(s) deleted"); define("FORLAN_93", "reply (replies) deleted"); -define("FORLAN_94", "Set Ranks"); -define("FORLAN_95", "Ranks saved"); +// define("FORLAN_94", "Set Ranks"); +// define("FORLAN_95", "Ranks saved"); //define("FORLAN_96", "Forum deleted"); //define("FORLAN_97", "Parent deleted"); -define("FORLAN_98", "Rank Name"); -define("FORLAN_99", "number of points before level change"); -define("FORLAN_100", "upload images to e107_themes/Your_Theme/forum/"); -define("FORLAN_101", "Main Site Admin"); -define("FORLAN_102", "Threshold"); -define("FORLAN_103", "Site Admin"); -define("FORLAN_104", "Rank Image"); -define("FORLAN_105", "Forum Moderator"); +// define("FORLAN_98", "Rank Name"); +// define("FORLAN_99", "number of points before level change"); +// define("FORLAN_100", "upload images to e107_themes/Your_Theme/forum/"); +// define("FORLAN_101", "Main Site Admin"); +// define("FORLAN_102", "Threshold"); +// define("FORLAN_103", "Site Admin"); +// define("FORLAN_104", "Rank Image"); +// define("FORLAN_105", "Forum Moderator"); -define("FORLAN_106", "Prune Type:"); -define("FORLAN_107", "Forum"); -define("FORLAN_108", " deleted"); -define("FORLAN_109", "days:"); -define("FORLAN_110", "Prune"); -define("FORLAN_111", "deactivate"); +// define("FORLAN_106", "Prune Type:"); +// define("FORLAN_107", "Forum"); +// define("FORLAN_108", " deleted"); +// define("FORLAN_109", "days:"); +// define("FORLAN_110", "Prune"); +// define("FORLAN_111", "deactivate"); define("FORLAN_112", "Enable Redirect"); define("FORLAN_113", "Tick this to make browser redirect to forum page after replying"); //define("FORLAN_114", "User Custom Title"); //define("FORLAN_115", "Tick this to allow users to change their Custom Title"); define("FORLAN_116", "Reported Posts"); -define("FORLAN_117", "This will delete the record of the reported post. Not the post itself."); +// define("FORLAN_117", "This will delete the record of the reported post. Not the post itself."); // define("FORLAN_118", "Reported post deleted"); // define("FORLAN_119", "Clicking links will open forum in a new window."); -define("FORLAN_120", "Tick this to allow users to change their Custom Title"); +// define("FORLAN_120", "Tick this to allow users to change their Custom Title"); define("FORLAN_121", "No reported posts"); define("FORLAN_122", "Click here to email admin when someone reports a forum post"); -define("FORLAN_123", "Forum Rules"); +// define("FORLAN_123", "Forum Rules"); define("WMGLAN_1", "Rules for Guests"); define("WMGLAN_2", "Rules for Members"); define("WMGLAN_3", "Rules for Administrators"); @@ -159,7 +159,7 @@ define("FORLAN_137", "Enabling this will resize larger images and also create a define("FORLAN_138", "Prune these forums"); define("FORLAN_139", "To use this setting you also need to tick 'Enable image posting' on the images page"); // FIX html in LAN define("FORLAN_140", "View"); -define("FORLAN_141", "Post"); +// define("FORLAN_141", "Post"); define("FORLAN_142", "Post permission"); define("FORLAN_143", "Indicates who can post to the forum"); //define("FORLAN_144", "Moderators set"); @@ -167,16 +167,16 @@ define("FORLAN_145", "Configure sub-forums"); define("FORLAN_146", "No sub-forums yet"); //define("FORLAN_147", "Update sub-forums"); //define("FORLAN_148", "Create sub-forums"); -define("FORLAN_149", "sub-forums"); -define("FORLAN_150", "sub-forum"); +// define("FORLAN_149", "sub-forums"); +// define("FORLAN_150", "sub-forum"); //define("FORLAN_151", "ID"); define("FORLAN_152", "posts"); define("FORLAN_153", "Tools"); -define("FORLAN_154", "Reply Deleted"); +// define("FORLAN_154", "Reply Deleted"); define("FORLAN_155", "Forum Categories"); define("FORLAN_156", "Select forum(s) to perform action on"); -define("FORLAN_157", "All Forums"); +// define("FORLAN_157", "All Forums"); define("FORLAN_158", "Recalculate forum lastpost info"); define("FORLAN_159", "Select to recalculate lastpost info"); define("FORLAN_160", "Select to perform this on forums only, not threads"); @@ -184,7 +184,7 @@ define("FORLAN_161", "Recalculate post / reply counts"); define("FORLAN_162", "Select to recalculate forum thread/reply counts"); define("FORLAN_163", "Recalculate user forum posts counts"); define("FORLAN_164", "Select to recalculate user forum counts"); -define("FORLAN_165", "Execute functions"); +// define("FORLAN_165", "Execute functions"); define("FORLAN_166", "Forum Tools"); define("FORLAN_167", "Counts updated for forum"); define("FORLAN_168", "Lastpost info updated for forum"); @@ -195,13 +195,13 @@ define("FORLAN_172", "Delete This Report"); define("FORLAN_173", "Thread title"); define("FORLAN_174", "Reported by user"); define("FORLAN_175", "Report submitted"); -define("FORLAN_176", "Report"); +// define("FORLAN_176", "Report"); define("FORLAN_177", "email notification ON by default"); define("FORLAN_178", "Tick this to allow make the email notification checkbox be on by default"); define("FORLAN_179", "Adding a * to the beginning of the forum name will make this forum a container for sub-forums only. The forum theme must support this option also."); -define("FORLAN_180", "Confirm delete operation"); +// define("FORLAN_180", "Confirm delete operation"); //define("FORLAN_181", "Confirm Delete"); define("FORLAN_182", "also recalculate replies for all threads in selected forum"); define("FORLAN_183", "(this function is not allowed when selecting 'all forums' due to the number of queries it will generate)"); diff --git a/e107_plugins/forum/languages/English/lan_forum_conf.php b/e107_plugins/forum/languages/English/lan_forum_conf.php index 2f8ad6ee4..8ba6d763f 100644 --- a/e107_plugins/forum/languages/English/lan_forum_conf.php +++ b/e107_plugins/forum/languages/English/lan_forum_conf.php @@ -12,36 +12,7 @@ // DEPRECATED, SUBJECT TO REMOVAL -define("FORCONF_5", "Poll deleted."); -define("FORCONF_6", "Thread deleted"); -define("FORCONF_7", "replies deleted"); -define("FORCONF_8", "Delete cancelled."); -define("FORCONF_9", "Thread moved."); -define("FORCONF_10", "Move cancelled."); -define("FORCONF_11", "Back To Forums"); -define("FORCONF_12", "Forum Configuration"); -define("FORCONF_13", "Are you absolutely certain you want to delete this poll?
Once deleted it cannot be retrieved."); -define("FORCONF_14", "Cancel"); -define("FORCONF_15", "Confirm Delete Forum Post"); -define("FORCONF_16", "Confirm Delete Poll"); -define("FORCONF_17", "posted by"); -define("FORCONF_18", "Are you absolutely certain you want to delete this forum"); -define("FORCONF_19", "thread and it's related posts?"); -define("FORCONF_20", "the poll will also be deleted"); -define("FORCONF_21", "Once deleted they"); -define("FORCONF_22", "post?
Once deleted it"); -define("FORCONF_23", "cannot be retrieved"); -define("FORCONF_24", "Move thread to forum"); -define("FORCONF_25", "Move Thread"); -define("FORCONF_26", "Reply deleted"); -define("FORCONF_27", "moved"); - -define("FORCONF_28", "Do not rename thread title"); -define("FORCONF_29", "Add"); -define("FORCONF_30", "to title"); -define("FORCONF_31", "Rename to:"); -define("FORCONF_32", "Rename thread options:"); diff --git a/e107_plugins/forum/languages/English/lan_forum_notify.php b/e107_plugins/forum/languages/English/lan_forum_notify.php index b61f66124..f2cf41351 100644 --- a/e107_plugins/forum/languages/English/lan_forum_notify.php +++ b/e107_plugins/forum/languages/English/lan_forum_notify.php @@ -17,7 +17,8 @@ // DEPRECATED FILE - NOTIFY LAN ARE NOW IN GLOBAL -/*define('FORUM_NT_1', 'Forum Events'); +/* +define('FORUM_NT_1', 'Forum Events'); define('FORUM_NT_2', 'Thread'); define('FORUM_NT_3', 'Post'); define('FORUM_NT_4', 'added by'); @@ -34,4 +35,5 @@ define('FORUM_NT_NEWTHREAD_PROB', 'New thread created by probationary member'); define('FORUM_NT_THREAD_DELETED', 'Thread deleted'); define('FORUM_NT_THREAD_SPLIT', 'Thread split'); define('FORUM_NT_POST_DELETED', 'Post deleted'); -define('FORUM_NT_POST_REPORTED', 'Post reported');*/ +define('FORUM_NT_POST_REPORTED', 'Post reported'); +*/ diff --git a/e107_plugins/forum/languages/English/lan_forum_search.php b/e107_plugins/forum/languages/English/lan_forum_search.php index 38994b732..e9ef5e8a6 100644 --- a/e107_plugins/forum/languages/English/lan_forum_search.php +++ b/e107_plugins/forum/languages/English/lan_forum_search.php @@ -10,9 +10,9 @@ +----------------------------------------------------------------------------+ */ -define("FOR_SCH_LAN_1", "Forum"); +// define("FOR_SCH_LAN_1", "Forum"); define("FOR_SCH_LAN_2", "Select forum"); -define("FOR_SCH_LAN_3", "All Forums"); +// define("FOR_SCH_LAN_3", "All Forums"); define("FOR_SCH_LAN_4", "Whole post"); define("FOR_SCH_LAN_5", "As part of thread"); diff --git a/e107_plugins/forum/languages/English/lan_forum_stats.php b/e107_plugins/forum/languages/English/lan_forum_stats.php index 071db0ece..589500124 100644 --- a/e107_plugins/forum/languages/English/lan_forum_stats.php +++ b/e107_plugins/forum/languages/English/lan_forum_stats.php @@ -15,22 +15,22 @@ define("FSLAN_1", "General"); define("FSLAN_2", "Forum opened"); define("FSLAN_3", "Open for"); define("FSLAN_4", "Total posts"); -define("FSLAN_5", "Forum topics"); +// define("FSLAN_5", "Forum topics"); define("FSLAN_6", "Forum replies"); define("FSLAN_7", "Forum thread views"); define("FSLAN_8", "Database size (forum tables only)"); define("FSLAN_9", "Average row length in forum table"); -define("FSLAN_10", "Most active topics"); +// define("FSLAN_10", "Most active topics"); define("FSLAN_11", "Rank"); -define("FSLAN_12", "Topic"); -define("FSLAN_13", "Replies"); +// define("FSLAN_12", "Topic"); +// define("FSLAN_13", "Replies"); define("FSLAN_14", "Started by"); -define("FSLAN_15", "Date"); +// define("FSLAN_15", "Date"); define("FSLAN_16", "Most viewed topics"); -define("FSLAN_17", "Views"); -define("FSLAN_18", "Top posters"); -define("FSLAN_19", "Name"); -define("FSLAN_20", "Posts"); +// define("FSLAN_17", "Views"); +// define("FSLAN_18", "Top posters"); +// define("FSLAN_19", "Name"); +// define("FSLAN_20", "Posts"); define("FSLAN_21", "Top topic starters"); define("FSLAN_22", "Top repliers"); define("FSLAN_23", "Forum Statistics"); diff --git a/e107_plugins/forum/languages/English/lan_forum_uploads.php b/e107_plugins/forum/languages/English/lan_forum_uploads.php index 9159d12a8..4bb759951 100644 --- a/e107_plugins/forum/languages/English/lan_forum_uploads.php +++ b/e107_plugins/forum/languages/English/lan_forum_uploads.php @@ -20,6 +20,6 @@ define('FRMUP_6','Result'); define('FRMUP_7','Found in thread'); define('FRMUP_8','NOT FOUND'); define('FRMUP_9','No uploaded files found'); -define('FRMUP_10','Delete'); +// define('FRMUP_10','Delete'); ?> \ No newline at end of file diff --git a/e107_plugins/forum/languages/English/lan_forum_url.php b/e107_plugins/forum/languages/English/lan_forum_url.php index 29e100c2d..23c3b1d76 100644 --- a/e107_plugins/forum/languages/English/lan_forum_url.php +++ b/e107_plugins/forum/languages/English/lan_forum_url.php @@ -5,7 +5,7 @@ * * URL configuration language file (adminsitration) */ -define("FORUM_LAN_URL_NAME", "Forum"); +// define("FORUM_LAN_URL_NAME", "Forum"); define("FORUM_LAN_URL_DEFAULT_LABEL", "Default Forum URLs"); define("FORUM_LAN_URL_DEFAULT_DESCR", "URLs of 'GET type' with no single entry point. Examples:
http://yoursite.com/e107_plugins/forum/forum.php (forum index)
http://yoursite.com/e107_plugins/forum/forum_viewtopic.php?id=2 (thread view)"); diff --git a/e107_plugins/forum/languages/English/lan_newforumposts_menu.php b/e107_plugins/forum/languages/English/lan_newforumposts_menu.php index 0c492b4d2..478d1dda6 100755 --- a/e107_plugins/forum/languages/English/lan_newforumposts_menu.php +++ b/e107_plugins/forum/languages/English/lan_newforumposts_menu.php @@ -24,7 +24,7 @@ define("NFP_7", "Postfix for too long posts?"); define("NFP_8", "Show original topics in menu?"); define("NFP_9", "Update menu Settings"); define("NFP_10", "New Forum Posts Menu Configuration"); -define("NFP_11", "Posted by"); +// define("NFP_11", "Posted by"); define("NFP_12", "Maximum age of displayed posts"); define("NFP_13", "Use zero on a quiet site; setting a value in days will reduce database time on a busy site"); diff --git a/e107_plugins/forum/newforumposts_menu.php b/e107_plugins/forum/newforumposts_menu.php index 2fe2d3e1f..eddf5e8b0 100755 --- a/e107_plugins/forum/newforumposts_menu.php +++ b/e107_plugins/forum/newforumposts_menu.php @@ -17,6 +17,7 @@ $tp = e107::getParser(); $sql = e107::getDb(); $gen = new convert; $pref = e107::getPref(); +e107::lan('forum','front'); include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_newforumposts_menu.php'); include_once(e_PLUGIN.'forum/forum_class.php'); @@ -76,11 +77,11 @@ if($results = $sql->gen($qry)) if ($menu_pref['newforumposts_title']) { - $text .= "{$topic}
{$post}
".NFP_11." {$poster} {$datestamp}"; + $text .= "{$topic}
{$post}
".LAN_FORUM_0074." {$poster} {$datestamp}"; } else { - $text .= "".NFP_11." {$poster} {$datestamp}
{$post}
"; + $text .= "".LAN_FORUM_0074." {$poster} {$datestamp}
{$post}
"; } $text .= ""; diff --git a/e107_plugins/forum/search/search_advanced.php b/e107_plugins/forum/search/search_advanced.php index d8ea84afb..fb01a78fd 100644 --- a/e107_plugins/forum/search/search_advanced.php +++ b/e107_plugins/forum/search/search_advanced.php @@ -18,15 +18,15 @@ if (!defined('e107_INIT')) { exit; } $advanced['forum']['type'] = 'dropdown'; $advanced['forum']['text'] = FOR_SCH_LAN_2.':'; -$advanced['forum']['list'][] = array('id' => 'all', 'title' => FOR_SCH_LAN_3); +$advanced['forum']['list'][] = array('id' => 'all', 'title' => LAN_PLUGIN_FORUM_ALLFORUMS); $advanced_caption['id'] = 'forum'; -$advanced_caption['title']['all'] = FOR_SCH_LAN_3; +$advanced_caption['title']['all'] = LAN_PLUGIN_FORUM_ALLFORUMS; if ($sql -> db_Select_gen("SELECT f.forum_id, f.forum_name FROM #forum AS f LEFT JOIN #forum AS fp ON fp.forum_id = f.forum_parent WHERE f.forum_parent != 0 AND fp.forum_class IN (".USERCLASS_LIST.") AND f.forum_class IN (".USERCLASS_LIST.")")) { while ($row = $sql -> db_Fetch()) { $advanced['forum']['list'][] = array('id' => $row['forum_id'], 'title' => $row['forum_name']); - $advanced_caption['title'][$row['forum_id']] = FOR_SCH_LAN_1.' -> '.$row['forum_name']; + $advanced_caption['title'][$row['forum_id']] = LAN_PLUGIN_FORUM_NAME.' -> '.$row['forum_name']; } } diff --git a/e107_plugins/forum/search/search_parser.php b/e107_plugins/forum/search/search_parser.php index 8ac56ac57..f99c0dbd1 100644 --- a/e107_plugins/forum/search/search_parser.php +++ b/e107_plugins/forum/search/search_parser.php @@ -66,7 +66,7 @@ function search_forum($row) $res['link'] = e_PLUGIN."forum/forum_viewtopic.php?".$link_id.".post"; $res['pre_title'] = $title ? FOR_SCH_LAN_5.": " : ""; $res['title'] = $title ? $title : LAN_SEARCH_9; - $res['pre_summary'] = "
".FOR_SCH_LAN_1." -> ".$row['forum_name']."
"; + $res['pre_summary'] = "
".LAN_PLUGIN_FORUM_NAME." -> ".$row['forum_name']."
"; $res['summary'] = $row['post_entry']; $res['detail'] = LAN_SEARCH_7."".$row['user_name']."".LAN_SEARCH_8.$datestamp; diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php index 084e15276..8665a0396 100644 --- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php @@ -492,7 +492,7 @@ class plugin_forum_view_shortcodes extends e_shortcode // Edit if ( (USER && $this->postInfo['post_user'] == USERID && $this->thread->threadInfo['thread_active'])) { - $text .= "
  • $this->postInfo['post_id']))."'>".LAN_FORUM_2039." ".$tp->toGlyph('edit')."
    • "; + $text .= "
  • $this->postInfo['post_id']))."'>".LAN_EDIT." ".$tp->toGlyph('edit')."
    • "; } @@ -509,13 +509,13 @@ class plugin_forum_view_shortcodes extends e_shortcode if ((USER && $this->postInfo['post_user'] != USERID && $this->thread->threadInfo['thread_active'])) { - $text .= "
  • $this->postInfo['post_id']))."'>".LAN_FORUM_2039." ".$tp->toGlyph('edit')."
    • "; + $text .= "
  • $this->postInfo['post_id']))."'>".LAN_EDIT." ".$tp->toGlyph('edit')."
    • "; } // only show delete button when post is not the initial post of the topic if(!$this->forum->threadDetermineInitialPost($this->postInfo['post_id'])) { - $text .= "
  • ".LAN_FORUM_2040." ".$tp->toGlyph('trash')."
    • "; + $text .= "
  • ".LAN_DELETE." ".$tp->toGlyph('trash')."
    • "; } if ($type == 'thread') diff --git a/e107_plugins/forum/templates/forum_icons_template.php b/e107_plugins/forum/templates/forum_icons_template.php index f0298671e..fca4b1551 100644 --- a/e107_plugins/forum/templates/forum_icons_template.php +++ b/e107_plugins/forum/templates/forum_icons_template.php @@ -38,11 +38,11 @@ define('IMAGE_profile', ''.LAN_FORUM // action define('IMAGE_pm', '<img src='); -define('IMAGE_edit', ''.LAN_FORUM_2039.''); +define('IMAGE_edit', ''.LAN_EDIT.''); define('IMAGE_quote', ''.LAN_FORUM_2041.''); define('IMAGE_track', ''.LAN_FORUM_4009.''); define('IMAGE_untrack', ''.LAN_FORUM_4010.''); -define('IMAGE_admin_edit', ''.LAN_FORUM_2039.''); +define('IMAGE_admin_edit', ''.LAN_EDIT.''); define('IMAGE_admin_move', ''.LAN_FORUM_2042.''); define('IMAGE_admin_split', ''.LAN_FORUM_2043.''); define('IMAGE_admin_move2', ''.LAN_FORUM_2042.''); @@ -52,7 +52,7 @@ define('IMAGE_post', ''); define('IMAGE_post2', ''); // Admin Icons -define('IMAGE_admin_delete', 'src="'.img_path('admin_delete.png').'" alt="'.LAN_FORUM_2040.'" title="'.LAN_FORUM_2040.'" '); +define('IMAGE_admin_delete', 'src="'.img_path('admin_delete.png').'" alt="'.LAN_DELETE.'" title="'.LAN_DELETE.'" '); define('IMAGE_admin_stick', 'src="'.img_path('admin_stick.png').'" alt="'.LAN_FORUM_4011.'" title="'.LAN_FORUM_4011.'" '); define('IMAGE_admin_unstick', 'src="'.img_path('admin_unstick.png').'" alt="'.LAN_FORUM_4012.'" title="'.LAN_FORUM_4012.'" '); define('IMAGE_admin_lock', 'src="'.img_path('admin_lock.png').'" alt="'.LAN_FORUM_4013.'" title="'.LAN_FORUM_4013.'" '); diff --git a/e107_plugins/forum/url/rewrite_url.php b/e107_plugins/forum/url/rewrite_url.php index 10e373bb3..b933f1f94 100644 --- a/e107_plugins/forum/url/rewrite_url.php +++ b/e107_plugins/forum/url/rewrite_url.php @@ -157,7 +157,7 @@ class plugin_forum_rewrite_url extends eUrlConfig e107::plugLan('forum', 'lan_forum_url'); static $admin = array( 'labels' => array( - 'name' => FORUM_LAN_URL_NAME, // Module name + 'name' => LAN_PLUGIN_FORUM_NAME, // Module name 'label' => FORUM_LAN_URL_REWRITE_LABEL, // Current profile name 'description' => FORUM_LAN_URL_REWRITE_DESCR, // 'examples' => array("{e_PLUGIN_ABS}forum/forum.php") diff --git a/e107_plugins/forum/url/url.php b/e107_plugins/forum/url/url.php index 8f7aecd2c..3c7baa719 100644 --- a/e107_plugins/forum/url/url.php +++ b/e107_plugins/forum/url/url.php @@ -158,7 +158,7 @@ class plugin_forum_url extends eUrlConfig e107::plugLan('forum', 'lan_forum_url'); static $admin = array( 'labels' => array( - 'name' => FORUM_LAN_URL_NAME, // Module name + 'name' => LAN_PLUGIN_FORUM_NAME, // Module name 'label' => FORUM_LAN_URL_DEFAULT_LABEL, // Current profile name 'description' => FORUM_LAN_URL_DEFAULT_DESCR, // 'examples' => array("{e_PLUGIN_ABS}forum/forum_viewtopic.php?id=3&p=2") diff --git a/e107_plugins/poll/languages/English.php b/e107_plugins/poll/languages/English.php index 42d77ce0d..c7c73cfec 100644 --- a/e107_plugins/poll/languages/English.php +++ b/e107_plugins/poll/languages/English.php @@ -72,3 +72,15 @@ define("POLLAN_44", "Delete this poll?"); define("POLLAN_45", "Poll successfully updated"); //define("POLLAN_46", "Field(s) left blank"); + +// TODO NEED TO BE RENAMED! + +// define("LAN_FORUM_3029", "If you do not wish to add a poll to your topic, leave the fields blank."); // LAN_386 +define("LAN_FORUM_3030", "Poll question"); // LAN_5 +define("LAN_FORUM_3031", "Poll answer"); // LAN_391 +define("LAN_FORUM_3032", "Add another answer"); // LAN_6 +define("LAN_FORUM_3033", "Allow multiple choices?"); // LAN_506 +define("LAN_FORUM_3034", "Vote storage method"); // POLLAN_16 +define("LAN_FORUM_3035", "Cookie"); // POLLAN_17 +define("LAN_FORUM_3036", "IP address"); // POLLAN_18 +define("LAN_FORUM_3037", "User ID (only members can vote)"); // POLLAN_19