aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-06-11 00:10:54 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-06-11 00:10:54 +0000
commitd2b4b4dc515deec822f22e69f47763d8e11a31a4 (patch)
treefbbf4519e83ef8768354d84ec7b1429a3df77ccf
parent23f0178fd126b16f1431221220e8f271fe9b42f5 (diff)
downloadforums-d2b4b4dc515deec822f22e69f47763d8e11a31a4.tar
forums-d2b4b4dc515deec822f22e69f47763d8e11a31a4.tar.gz
forums-d2b4b4dc515deec822f22e69f47763d8e11a31a4.tar.bz2
forums-d2b4b4dc515deec822f22e69f47763d8e11a31a4.tar.xz
forums-d2b4b4dc515deec822f22e69f47763d8e11a31a4.zip
Some privmsg updates
git-svn-id: file:///svn/phpbb/trunk@453 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/constants.php9
-rwxr-xr-xphpBB/language/lang_english.php17
2 files changed, 22 insertions, 4 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 5dbe9960f7..265d4794b6 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -63,6 +63,11 @@ define(NO_TOPICS, 5);
define(GENERAL_ERROR, 6);
define(LOGIN_FAILED, 7);
+// Private messaging
+define(PRIVMSGS_READ_MAIL, 0);
+define(PRIVMSGS_NEW_MAIL, 1);
+define(PRIVMSGS_SENT_MAIL, 2);
+
// URL PARAMETERS
define(POST_TOPIC_URL, 't');
define(POST_FORUM_URL, 'f');
@@ -84,6 +89,7 @@ define(PAGE_VIEWONLINE, -6);
define(PAGE_VIEWMEMBERS, -7);
define(PAGE_FAQ, -8);
define(PAGE_POSTING, -9);
+define(PAGE_PRIVMSGS, -10);
// Auth settings
define(AUTH_ALL, 0);
@@ -120,7 +126,8 @@ define('FORUMS_TABLE', $table_prefix.'forums');
define('GROUPS_TABLE', $table_prefix.'groups');
define('POSTS_TABLE', $table_prefix.'posts');
define('POSTS_TEXT_TABLE', $table_prefix.'posts_text');
-define('PRIV_MSGS_TABLE', $table_prefix.'priv_msgs');
+define('PRIVMSGS_TABLE', $table_prefix.'privmsgs');
+define('PRIVMSGS_TEXT_TABLE', $table_prefix.'privmsgs_text');
define('RANKS_TABLE', $table_prefix.'ranks');
define('SESSIONS_TABLE', $table_prefix.'session');
define('THEMES_TABLE', $table_prefix.'themes');
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index 18d057c021..40571e68c6 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -71,11 +71,12 @@ $lang['Years'] = "Years";
$lang['All_times'] = "All times are"; // This is followed by GMT and the timezone offset
$lang['GMT'] = "GMT";
+$lang['Next'] = "Next Page";
+$lang['Previous'] = "Previous Page";
$lang['Goto_page'] = "Goto page";
$lang['Page'] = "Page"; // Followed by the current page number then 'of x' where x is total pages
$lang['of'] = "of"; // See Page above
-
-$lang['You_last_visit'] = "You last visited on";
+$lang['Go'] = "Go";
//
// Global Header strings
@@ -83,6 +84,8 @@ $lang['You_last_visit'] = "You last visited on";
$lang['Registered'] = "Registered";
$lang['None'] = "None";
+$lang['You_last_visit'] = "You last visited on";
+
$lang['Welcome_to'] = "Welcome to"; // Followed by site name
$lang['Register'] = "Register";
$lang['Profile'] = "Profile";
@@ -148,8 +151,16 @@ $lang['Annouce_and_sticky'] = "You cannot post a topic that is both an annouceme
//
-// Private Messageing <= Should be blank for now
+// Private Messaging
//
+$lang['Inbox'] = "Inbox";
+$lang['Sent'] = "Sent";
+$lang['Flag'] = "Flag";
+$lang['Subject'] = "Subject";
+$lang['From'] = "From";
+$lang['To'] = "To";
+$lang['Date'] = "Date";
+
//
// Profiles/Registration