-
New Thread
+
'.LAN_FORUM_1018.'
@@ -791,7 +785,7 @@ function newthreadjump($url)
foreach($jumpList as $key => $val)
{
- $text .= '
Go to: '.$val.'';
+ $text .= '
'.LAN_FORUM_1017.': '.$val.'';
}
$text .= '
diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php
index df08e80d4..8234623b7 100644
--- a/e107_plugins/forum/forum_viewtopic.php
+++ b/e107_plugins/forum/forum_viewtopic.php
@@ -38,8 +38,6 @@ if (!e_QUERY)
-
-// include_lan(e_PLUGIN . 'forum/languages/'.e_LANGUAGE.'/lan_forum_viewtopic.php');
include_once (e_PLUGIN . 'forum/forum_class.php');
@@ -108,7 +106,7 @@ if (USER && (USERID != $thread->threadInfo['thread_user'] || $thread->threadInfo
$forum->threadIncview($thread->threadInfo['thread_id']);
}
-define('e_PAGETITLE', strip_tags($tp->toHTML($thread->threadInfo['thread_name'], true, 'no_hook, emotes_off')).' / '.$tp->toHTML($thread->threadInfo['forum_name'], true, 'no_hook, emotes_off').' / '.LAN_01);
+define('e_PAGETITLE', strip_tags($tp->toHTML($thread->threadInfo['thread_name'], true, 'no_hook, emotes_off')).' / '.$tp->toHTML($thread->threadInfo['forum_name'], true, 'no_hook, emotes_off').' / '.LAN_FORUM_1001);
$forum->modArray = $forum->forumGetMods($thread->threadInfo['forum_moderators']);
define('MODERATOR', (USER && $forum->isModerator(USERID)));
@@ -119,7 +117,7 @@ e107::getScBatch('view', 'forum')->setScVar('forum', $forum);
if (MODERATOR && isset($_POST['mod']))
{
- require_once (e_PLUGIN . 'forum/forum_mod.php');
+ require_once(e_PLUGIN."forum/forum_mod.php");
$thread->message = forum_thread_moderate($_POST);
$thread->threadInfo = $forum->threadGet($thread->threadId);
}
@@ -200,9 +198,9 @@ $forum->set_crumb(true, '', $tVars); // Set $BREADCRUMB (and BACKLINK)
//$tVars->BACKLINK = $tVars->BREADCRUMB;
//$tVars->FORUM_CRUMB = $crumbs['forum_crumb'];
$tVars->THREADNAME = $tp->toHTML($thread->threadInfo['thread_name'], true, 'no_hook, emotes_off');
-$tVars->NEXTPREV = "
$thread->threadId)) . "'>« " . LAN_389 . "";
-// $tVars->NEXTPREV .= ' | ';
-$tVars->NEXTPREV .= "
$thread->threadId)) . "'>" . LAN_390 . " »";
+$tVars->NEXTPREV = "
$thread->threadId)) . "'>« " . LAN_FORUM_2001 . "";
+$tVars->NEXTPREV .= ' | '; // enabled to make it look better on v1 templates
+$tVars->NEXTPREV .= "
$thread->threadId)) . "'>" . LAN_FORUM_2002 . " »";
if ($forum->prefs->get('track') && USER)
{
@@ -230,9 +228,9 @@ if ($forum->prefs->get('track') && USER)
}
-$tVars->MODERATORS = LAN_321 . implode(', ', $forum->modArray);
+$tVars->MODERATORS = LAN_FORUM_2003.": ". implode(', ', $forum->modArray);
-$tVars->THREADSTATUS = (!$thread->threadInfo['thread_active'] ? LAN_66 : '');
+$tVars->THREADSTATUS = (!$thread->threadInfo['thread_active'] ? LAN_FORUM_2004 : '');
if ($thread->pages > 1)
{
@@ -268,15 +266,15 @@ function forumbuttons($thread)
if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread->threadInfo['thread_active'])
{
- $replyUrl = "
$thread->threadId)) . "'>Post a Reply";
+ $replyUrl = "
$thread->threadId))."'>".LAN_FORUM_2006."";
}
if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'thread'))
{
- $options[] = "
$thread->threadInfo['thread_forum_id'])) . "'>Create New Thread";
+ $options[] = "
$thread->threadInfo['thread_forum_id']))."'>".LAN_FORUM_2005."";
}
- $options[] = "
$thread->threadId)) . "'>Go to " . LAN_389 . ""; //FIXME LAN
- $options[] = "
$thread->threadId)) . "'>Go to " . LAN_390 . ""; //FIXME LAN
+ $options[] = "
$thread->threadId)) . "'>".LAN_FORUM_1017." ".LAN_FORUM_2001."";
+ $options[] = "
$thread->threadId)) . "'>".LAN_FORUM_1017." ".LAN_FORUM_2002."";
@@ -300,7 +298,7 @@ function forumbuttons($thread)
foreach($jumpList as $key=>$val)
{
- $text .= '
Go to '.$val.'';
+ $text .= '
'.LAN_FORUM_1017." ".$val.'';
}
$text .= '
@@ -341,7 +339,7 @@ foreach ($postList as $postInfo)
//TODO: Look into fixing this, to limit to a single query per pageload
$threadId = $thread->threadInfo['thread_id'];
$e_hide_query = "SELECT post_id FROM `#forum_post` WHERE (`post_thread` = {$threadId} AND post_user= " . USERID . ' LIMIT 1';
- $e_hide_hidden = FORLAN_HIDDEN;
+ $e_hide_hidden = LAN_FORUM_2008;
$e_hide_allowed = USER;
if ($tnum > 1)
@@ -381,14 +379,14 @@ if ($forum->checkPerm($thread->threadInfo['thread_forum_id'], 'post') && $thread
$tVars->QUICKREPLY = "
";
- // Preview should be reserved for the full 'Post reply' page.
+ // Preview should be reserved for the full 'Post reply' page.
}
else
{
@@ -414,7 +412,7 @@ require_once (HEADERF);
if ($forum->prefs->get('enclose'))
{
- $ns->tablerender(LAN_01, $forumstring, $mes->render(). array('forum_viewtopic', 'main'));
+ $ns->tablerender(LAN_FORUM_1001, $forumstring, $mes->render(). array('forum_viewtopic', 'main'));
}
else
{
@@ -426,9 +424,9 @@ else
echo "";
@@ -479,12 +477,12 @@ function forumjump()
{
global $forum;
$jumpList = $forum->forumGetAllowed();
- $text = "
";
return $text;
}
@@ -699,7 +697,7 @@ class e107ForumThread
header("location: {$url}");
exit;
}
- $this->message = LAN_405;
+ $this->message = LAN_FORUM_2013;
break;
case 'prev': // FIXME - nextprev thread detection not working
@@ -710,7 +708,7 @@ class e107ForumThread
header("location: {$url}");
exit;
}
- $this->message = LAN_404;
+ $this->message = LAN_FORUM_2012;
break;
case 'report':
@@ -724,51 +722,45 @@ class e107ForumThread
if ($forum->prefs->get('reported_post_email'))
{
require_once (e_HANDLER . 'mail.php');
- $report = LAN_422 . SITENAME . " : " . (substr(SITEURL, -1) == "/" ? SITEURL : SITEURL . "/") . $e107->getFolder('plugins') . "forum/forum_viewtopic.php?" . $this->threadId . ".post\n" . LAN_425 . USERNAME . "\n" . $report_add;
- $subject = LAN_421 . " " . SITENAME;
+ $report = LAN_FORUM_2018." ".SITENAME." : ".(substr(SITEURL, -1) == "/" ? SITEURL : SITEURL."/") . $e107->getFolder('plugins') . "forum/forum_viewtopic.php?" . $this->threadId . ".post\n
+ ".LAN_FORUM_2019.": ".USERNAME. "\n" . $report_add;
+ $subject = LAN_FORUM_2020." ". SITENAME;
sendemail(SITEADMINEMAIL, $subject, $report);
}
// no reference of 'head' $threadInfo['head']['thread_name']
$sql->insert('generic', "0, 'reported_post', " . time() . ", '" . USERID . "', '{$this->threadInfo['thread_name']}', " . intval($this->threadId) . ", '{$report_add}'");
- define('e_PAGETITLE', LAN_01 . " / " . LAN_428);
+ define('e_PAGETITLE', LAN_FORUM_1001 . " / " . LAN_FORUM_2021);
$url = $e107->url->create('forum/thread/post', array('id' => $postId, 'name' => $postInfo['thread_name'], 'thread' => $threadId)); // both post info and thread info contain thread name
- $text = LAN_424 . "
" . LAN_429 . '';
- return $ns->tablerender(LAN_414, $text, array('forum_viewtopic', 'report'), true);
+ $text = LAN_FORUM_2021 . "
".LAN_FORUM_2022.'';
+ return $ns->tablerender(LAN_FORUM_2023, $text, array('forum_viewtopic', 'report'), true);
}
else
{
$thread_name = e107::getParser()->toHTML($postInfo['thread_name'], true, 'no_hook, emotes_off');
- define('e_PAGETITLE', LAN_01 . ' / ' . LAN_426 . ' ' . $thread_name);
+ define('e_PAGETITLE', LAN_FORUM_1001.' / '.LAN_FORUM_2024.': '.$thread_name);
$url = $e107->url->create('forum/thread/post', array('id' => $postId, 'name' => $postInfo['thread_name'], 'thread' => $threadId));
$actionUrl = $e107->url->create('forum/thread/report', "id={$threadId}&post={$postId}");
$text = "