aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-04-01 00:50:06 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-04-01 00:50:06 +0000
commit823a484e77ba9e1ce51451054fa120b6201dd298 (patch)
tree6d0d1ba2e1df1485e12e9c548b90e1cb7d714a22 /phpBB
parent5231006c03848f7e35ef53b0548a4ed5b5732a5e (diff)
downloadforums-823a484e77ba9e1ce51451054fa120b6201dd298.tar
forums-823a484e77ba9e1ce51451054fa120b6201dd298.tar.gz
forums-823a484e77ba9e1ce51451054fa120b6201dd298.tar.bz2
forums-823a484e77ba9e1ce51451054fa120b6201dd298.tar.xz
forums-823a484e77ba9e1ce51451054fa120b6201dd298.zip
Lang string name changes for topic title prefixes
git-svn-id: file:///svn/phpbb/trunk@3773 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/lang_main.php10
-rw-r--r--phpBB/viewforum.php10
2 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php
index 869a8c600a..fad299b059 100644
--- a/phpBB/language/en/lang_main.php
+++ b/phpBB/language/en/lang_main.php
@@ -232,11 +232,11 @@ $lang = array(
'DISPLAY_TOPICS' => 'Display topics from previous',
'ALL_TOPICS' => 'All Topics',
- 'TOPIC_ANNOUNCEMENT'=> '<b>Announcement:</b>',
- 'TOPIC_STICKY' => '<b>Sticky:</b>',
- 'TOPIC_MOVED' => '<b>Moved:</b>',
- 'TOPIC_POLL' => '<b>Poll:</b>',
- 'TOPIC_LOCKED' => '<b>Locked:</b>',
+ 'VIEW_TOPIC_ANNOUNCEMENT'=> '<b>Announcement:</b>',
+ 'VIEW_TOPIC_STICKY' => '<b>Sticky:</b>',
+ 'VIEW_TOPIC_MOVED' => '<b>Moved:</b>',
+ 'VIEW_TOPIC_POLL' => '<b>Poll:</b>',
+ 'VIEW_TOPIC_LOCKED' => '<b>Locked:</b>',
'MARK_TOPICS_READ' => 'Mark all topics read',
'Topics_marked_read' => 'The topics for this forum have now been marked read',
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 067955751d..147583472c 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -318,7 +318,7 @@ if ($forum_data['forum_postable'])
$topic_type = '';
if ($row['topic_status'] == ITEM_MOVED)
{
- $topic_type = $user->lang['TOPIC_MOVED'] . ' ';
+ $topic_type = $user->lang['VIEW_TOPIC_MOVED'] . ' ';
$topic_id = $row['topic_moved_id'];
$folder_image = 'folder';
@@ -330,13 +330,13 @@ if ($forum_data['forum_postable'])
switch ($row['topic_type'])
{
case POST_ANNOUNCE:
- $topic_type = $user->lang['TOPIC_ANNOUNCEMENT'] . ' ';
+ $topic_type = $user->lang['VIEW_TOPIC_ANNOUNCEMENT'] . ' ';
$folder = 'folder_announce';
$folder_new = 'folder_announce_new';
break;
case POST_STICKY:
- $topic_type = $user->lang['TOPIC_STICKY'] . ' ';
+ $topic_type = $user->lang['VIEW_TOPIC_STICKY'] . ' ';
$folder = 'folder_sticky';
$folder_new = 'folder_sticky_new';
break;
@@ -357,7 +357,7 @@ if ($forum_data['forum_postable'])
if ($row['topic_status'] == ITEM_LOCKED)
{
- $topic_type = $user->lang['TOPIC_LOCKED'] . ' ';
+ $topic_type = $user->lang['VIEW_TOPIC_LOCKED'] . ' ';
$folder = 'folder_locked';
$folder_new = 'folder_locked_new';
}
@@ -387,7 +387,7 @@ if ($forum_data['forum_postable'])
if (intval($row['poll_start']))
{
- $topic_type .= $user->lang['Topic_Poll'] . ' ';
+ $topic_type .= $user->lang['VIEW_TOPIC_POLL'] . ' ';
}