diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-06-12 00:54:15 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-06-12 00:54:15 +0000 |
| commit | f8ad3c0c2cf65f73a0416700e5832cc4c8885021 (patch) | |
| tree | 00750f336e15278f8a16db0ee9263fdfe0f65661 /phpBB | |
| parent | 89f08f53cb39857cff059a730eedee480766342f (diff) | |
| download | forums-f8ad3c0c2cf65f73a0416700e5832cc4c8885021.tar forums-f8ad3c0c2cf65f73a0416700e5832cc4c8885021.tar.gz forums-f8ad3c0c2cf65f73a0416700e5832cc4c8885021.tar.bz2 forums-f8ad3c0c2cf65f73a0416700e5832cc4c8885021.tar.xz forums-f8ad3c0c2cf65f73a0416700e5832cc4c8885021.zip | |
Final updates for tonight
git-svn-id: file:///svn/phpbb/trunk@477 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rwxr-xr-x | phpBB/language/lang_english.php | 12 | ||||
| -rw-r--r-- | phpBB/privmsg.php | 10 |
2 files changed, 15 insertions, 7 deletions
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index a5d26ca349..c9ab6e2bdc 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -6,7 +6,11 @@ * copyright : (C) 2001 The phpBB Group * email : support@phpbb.com * +<<<<<<< lang_english.php * $Id$ +======= + * $Id$ +>>>>>>> 1.42 * * ***************************************************************************/ @@ -160,12 +164,14 @@ $lang['Edit_Post'] = "Edit Post"; // $lang['Inbox'] = "Inbox"; $lang['Sent'] = "Sent"; +$lang['Outbox'] = "Outbox"; +$lang['Saved'] = "Saved"; $lang['Flag'] = "Flag"; $lang['Subject'] = "Subject"; $lang['From'] = "From"; $lang['To'] = "To"; -$lang['Date'] = "Date"; - +$lang['Date'] = "Date"; +$lang['Mark'] = "Mark"; // // Profiles/Registration @@ -174,6 +180,8 @@ $lang['Website'] = "Website"; $lang['From'] = "From"; $lang['Wrong_Profile'] = "You cannot modify a profile that is not your own."; $lang['Bad_username'] = "The username you choose has been taken or is disallowed by the administrator."; +$lang['Sorry_banned_email'] = "Sorry but the email address you gave has been banned from registering on this system."; + // // Memberslist diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index 933b5f83c1..5f9a1454a8 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -134,6 +134,8 @@ if($mode == "read") $post_new_mesg_url = "<a href=\"privmsg.$phpEx?mode=post\"><img src=\"templates/PSO/images/post.gif\" border=\"1\"></a>"; $post_reply_mesg_url = ($folder == "inbox") ? "<a href=\"privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsgs_id\"><img src=\"templates/PSO/images/reply.gif\" border=\"1\"></a>" : ""; + $s_hidden_fields = "<input type=\"hidden\" name=\"mark[]\" value=\"$privmsgs_id\">"; + $template->assign_vars(array( "INBOX" => $inbox_url, "SENTBOX" => $sentbox_url, @@ -145,6 +147,8 @@ if($mode == "read") "L_DATE" => $lang['Date'], "L_FROM_OR_TO" => (($folder == "inbox" || $folder == "savebox") ? $lang['From'] : $lang['To']), + "S_PRIVMSGS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"), + "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_POST_NEW_MSG" => $post_new_mesg_url, "S_POST_REPLY_MSG" => $post_reply_mesg_url) ); @@ -218,8 +222,6 @@ if($mode == "read") "YIM_IMG" => $yim_img, "QUOTE_IMG" => $quote_img, - "S_PRIVMSGS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"), - "L_FROM" => $lang['From']) ); @@ -426,15 +428,13 @@ $savebox_url .= ($folder != "savebox") ? "<a href=\"" . append_sid("privmsg.$php $post_new_mesg_url = "<a href=\"privmsg.$phpEx?mode=post\"><img src=\"templates/PSO/images/post.gif\" border=\"1\"></a>"; -//$s_hidden_folder = "<input type=\"hidden\" name=\"folder\" value=\"$folder\">"; - $template->assign_vars(array( "INBOX" => $inbox_url, "SENTBOX" => $sentbox_url, "OUTBOX" => $outbox_url, "SAVEBOX" => $savebox_url, - "L_MARK" => "Mark", + "L_MARK" => $lang['Mark'], "L_FLAG" => $lang['Flag'], "L_SUBJECT" => $lang['Subject'], "L_DATE" => $lang['Date'], |