makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Final updates for tonight

Browse source 
git-svn-id: file:///svn/phpbb/trunk@477 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-06-12 00:54:15 +00:00
parent 89f08f53cb
commit f8ad3c0c2c
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/language/lang_english.php
View file

@ -6,7 +6,11 @@
* copyright : (C) 2001 The phpBB Group * copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com * email : support@phpbb.com
* *
<<<<<<< lang_english.php
* $Id$ * $Id$
=======
* $Id$
>>>>>>> 1.42
* *
* ***************************************************************************/ * ***************************************************************************/
@ -160,12 +164,14 @@ $lang['Edit_Post'] = "Edit Post";
// //
$lang['Inbox'] = "Inbox"; $lang['Inbox'] = "Inbox";
$lang['Sent'] = "Sent"; $lang['Sent'] = "Sent";
$lang['Outbox'] = "Outbox";
$lang['Saved'] = "Saved";
$lang['Flag'] = "Flag"; $lang['Flag'] = "Flag";
$lang['Subject'] = "Subject"; $lang['Subject'] = "Subject";
$lang['From'] = "From"; $lang['From'] = "From";
$lang['To'] = "To"; $lang['To'] = "To";
$lang['Date'] = "Date"; $lang['Date'] = "Date";
$lang['Mark'] = "Mark";
// //
// Profiles/Registration // Profiles/Registration
@ -174,6 +180,8 @@ $lang['Website'] = "Website";
$lang['From'] = "From"; $lang['From'] = "From";
$lang['Wrong_Profile'] = "You cannot modify a profile that is not your own."; $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['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 // Memberslist

10
phpBB/privmsg.php
View file

@ -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_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>" : ""; $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( $template->assign_vars(array(
"INBOX" => $inbox_url, "INBOX" => $inbox_url,
"SENTBOX" => $sentbox_url, "SENTBOX" => $sentbox_url,
@ -145,6 +147,8 @@ if($mode == "read")
"L_DATE" => $lang['Date'], "L_DATE" => $lang['Date'],
"L_FROM_OR_TO" => (($folder == "inbox" || $folder == "savebox") ? $lang['From'] : $lang['To']), "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_NEW_MSG" => $post_new_mesg_url,
"S_POST_REPLY_MSG" => $post_reply_mesg_url) "S_POST_REPLY_MSG" => $post_reply_mesg_url)
); );
@ -218,8 +222,6 @@ if($mode == "read")
"YIM_IMG" => $yim_img, "YIM_IMG" => $yim_img,
"QUOTE_IMG" => $quote_img, "QUOTE_IMG" => $quote_img,
"S_PRIVMSGS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"),
"L_FROM" => $lang['From']) "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>"; $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( $template->assign_vars(array(
"INBOX" => $inbox_url, "INBOX" => $inbox_url,
"SENTBOX" => $sentbox_url, "SENTBOX" => $sentbox_url,
"OUTBOX" => $outbox_url, "OUTBOX" => $outbox_url,
"SAVEBOX" => $savebox_url, "SAVEBOX" => $savebox_url,
"L_MARK" => "Mark", "L_MARK" => $lang['Mark'],
"L_FLAG" => $lang['Flag'], "L_FLAG" => $lang['Flag'],
"L_SUBJECT" => $lang['Subject'], "L_SUBJECT" => $lang['Subject'],
"L_DATE" => $lang['Date'], "L_DATE" => $lang['Date'],