diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 959f0d5c20..a198b1dcf8 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -497,15 +497,10 @@ function generate_smilies($mode) { $template->assign_vars(array( 'S_SHOW_EMOTICON_LINK' => true, - 'L_MORE_SMILIES' => $user->lang['More_emoticons'], + 'U_MORE_SMILIES' => "posting.$phpEx$SID&mode=smilies") ); } - - $template->assign_vars(array( - 'L_EMOTICONS' => $user->lang['Emoticons'], - 'L_CLOSE_WINDOW' => $user->lang['Close_window']) - ); } if ($mode == 'window') diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php index 6750e4d8af..4a8a5265f9 100644 --- a/phpBB/language/en/lang_main.php +++ b/phpBB/language/en/lang_main.php @@ -38,8 +38,8 @@ $lang = array_merge($lang, array( 'Posts' => 'Posts', 'Posted' => 'Posted', 'Rating' => 'Rating', - 'Username' => 'Username', - 'Password' => 'Password', + 'USERNAME' => 'Username', + 'PASSWORD' => 'Password', 'Email' => 'Email', 'Poster' => 'Poster', 'Author' => 'Author', @@ -60,7 +60,7 @@ $lang = array_merge($lang, array( 'Jump_to' => 'Jump to', 'SUBMIT' => 'Submit', 'Reset' => 'Reset', - 'Cancel' => 'Cancel', + 'CANCEL' => 'Cancel', 'PREVIEW' => 'Preview', 'Confirm' => 'Confirm', 'Delete' => 'Delete', @@ -97,12 +97,12 @@ $lang = array_merge($lang, array( 'Admin_panel' => 'Go to Administration Panel', 'Board_disable' => 'Sorry but this board is currently unavailable', 'Board_unavailable' => 'Sorry but the board is temporarily unavailable, please try again in a few minutes', - 'ADMINISTRATORS' => 'ADMINISTRATORS', - 'SUPER_MODERATORS' => 'SUPER MODERATORS', - 'MODERATORS' => 'MODERATORS', - 'REGISTERED' => 'REGISTERED USERS', - 'INACTIVE' => 'INACTIVE USERS', - 'GUESTS' => 'GUESTS', + 'G_ADMINISTRATORS' => 'ADMINISTRATORS', + 'G_SUPER_MODERATORS'=> 'SUPER MODERATORS', + 'G_MODERATORS' => 'MODERATORS', + 'G_REGISTERED' => 'REGISTERED USERS', + 'G_INACTIVE' => 'INACTIVE USERS', + 'G_GUESTS' => 'GUESTS', 'Registered_users' => 'Registered Users:', 'Browsing_forum_guest' => 'Users browsing this forum: %s and %d guest', 'Browsing_forum_guests' => 'Users browsing this forum: %s and %d guests', @@ -125,9 +125,9 @@ $lang = array_merge($lang, array( 'User_online_color' => '%sUser%s', 'You_last_visit' => 'You last visited on %s', 'Current_time' => 'The time now is %s', - 'Search_new' => 'View posts since last visit', - 'Search_your_posts' => 'View your posts', - 'Search_unanswered' => 'View unanswered posts', + 'SEARCH_NEW' => 'View posts since last visit', + 'SEARCH_SELF' => 'View your posts', + 'SEARCH_UNANSWERED' => 'View unanswered posts', 'Register' => 'Register', 'Profile' => 'Control Panel', 'Edit_profile' => 'Edit your profile', @@ -138,9 +138,8 @@ $lang = array_merge($lang, array( 'Usergroups' => 'Groups', 'Last_Post' => 'Last Post', 'Moderator' => 'Moderator', - 'Moderators' => 'Moderators', + 'MODERATORS' => 'Moderators', 'VIEW_MODERATORS' => 'List forum moderators', - 'Login_check_pm' => 'Login to check your private messages', 'New_pms' => '%d new messages', 'New_pm' => '%d new message', 'No_new_pm' => 'No new messages', @@ -167,10 +166,10 @@ $lang = array_merge($lang, array( 'New_posts_locked' => 'New posts [ Locked ]', 'Forum_is_locked' => 'Forum is locked', 'Enter_password' => 'Please enter your username and password to login', - 'Login' => 'Login', - 'Logout' => 'Logout', + 'LOGIN' => 'Login', + 'LOGOUT' => 'Logout', 'Forgotten_password' => 'I forgot my password', - 'Log_me_in' => 'Log me on automatically each visit', + 'LOG_ME_IN' => 'Log me on automatically each visit', 'Error_login' => 'You have specified an incorrect or inactive username or an invalid password', 'Index' => 'Index', 'No_Posts' => 'No Posts', @@ -214,7 +213,7 @@ $lang = array_merge($lang, array( 'You_are_watching_forum' => 'You are now watching this forum', 'View_topic' => 'View topic', 'Guest' => 'Guest', - 'Post_subject' => 'Post subject', + 'POST_SUBJECT' => 'Post subject', 'View_next_topic' => 'View next topic', 'View_previous_topic' => 'View previous topic', 'Submit_vote' => 'Submit Vote', @@ -257,23 +256,24 @@ $lang = array_merge($lang, array( 'Quite_good' => 'Quite Good', 'Very_good' => 'Very Good', 'Total_votes' => 'Total Votes', - 'MESSAGE_BODY' => 'Message body', - 'Message_body_explain' => 'Enter your message here, it may contain no more than %d characters.', - 'Topic_review' => 'Topic review', - 'Topic_icon' => 'Topic icon', - 'No_post_mode' => 'No post mode specified', - 'Post_a_new_topic' => 'Post a new topic', - 'Post_a_reply' => 'Post a reply', - 'Post_topic_as' => 'Post topic as', - 'Edit_Post' => 'Edit post', - 'OPTIONS' => 'Options', - 'Post_Announcement' => 'Announcement', - 'Post_Sticky' => 'Sticky', - 'Post_Normal' => 'Normal', - 'Confirm_delete' => 'Are you sure you want to delete this post?', + + 'MESSAGE_BODY' => 'Message body', + 'MESSAGE_BODY_EXPLAIN' => 'Enter your message here, it may contain no more than %d characters.', + 'Topic_review' => 'Topic review', + 'TOPIC_ICON' => 'Topic icon', + 'No_post_mode' => 'No post mode specified', + 'POST_TOPIC' => 'Post a new topic', + 'POST_REPLY' => 'Post a reply', + 'POST_TOPIC_AS' => 'Post topic as', + 'EDIT_POST' => 'Edit post', + 'OPTIONS' => 'Options', + 'POST_NORMAL' => 'Normal', + 'POST_STICKY' => 'Sticky', + 'POST_ANNOUNCEMENT' => 'Announcement', + 'CONFIRM_DELETE' => 'Are you sure you want to delete this post?', 'Confirm_delete_poll' => 'Are you sure you want to delete this poll?', 'Cannot_edit_time' => 'You can no longer edit or delete that post', - 'Flood_Error' => 'You cannot make another post so soon after your last, please try again in a short while', + 'FLOOD_ERROR' => 'You cannot make another post so soon after your last, please try again in a short while', 'Empty_subject' => 'You must specify a subject when posting a new topic', 'To_long_subject' => 'The subject is too long it must be 60 characters or less', 'EMPTY_MESSAGE' => 'You must enter a message when posting', @@ -302,42 +302,42 @@ $lang = array_merge($lang, array( 'Post_has_no_poll' => 'This post has no poll', 'Already_voted' => 'You have already voted in this poll', 'No_vote_option' => 'You must specify an option when voting', - 'Add_poll' => 'Add a Poll', - 'Add_poll_explain' => 'If you do not want to add a poll to your topic leave the fields blank', - 'Poll_question' => 'Poll question', - 'Poll_options' => 'Poll options', - 'Poll_options_explain' => 'Place each option on a new line. You may enter up to %d options', - 'Poll_for' => 'Run poll for', - 'Days' => 'Days', - 'Poll_for_explain' => '[ Enter 0 or leave blank for a never ending poll ]', - 'Delete_poll' => 'Delete Poll', - 'Add_attach' => 'Add an Attachment', - 'Add_attach_explain' => 'If you wish to attach ...', - 'Add_file' => 'Add File', - 'Filename' => 'Filename', - 'File_comment' => 'File comment', - 'Disable_HTML_post' => 'Disable HTML in this post', - 'Disable_BBCode_post' => 'Disable BBCode in this post', - 'Disable_Smilies_post' => 'Disable Smilies in this post', - 'Disable_magic_url' => 'Disable Magic urls', - 'HTML_is_ON' => 'HTML is ON', - 'HTML_is_OFF' => 'HTML is OFF', - 'BBCode_is_ON' => '%sBBCode%s is ON', + 'ADD_POLL' => 'Add a Poll', + 'ADD_POLL_EXPLAIN' => 'If you do not want to add a poll to your topic leave the fields blank', + 'POLL_QUESTION' => 'Poll question', + 'POLL_OPTIONS' => 'Poll options', + 'POLL_OPTIONS_EXPLAIN' => 'Place each option on a new line. You may enter up to %d options', + 'POLL_FOR_EXPLAIN' => '[ Enter 0 or leave blank for a never ending poll ]', + 'POLL_FOR' => 'Run poll for', + 'DAYS' => 'Days', + 'POLL_DELETE' => 'Delete Poll', + 'ADD_ATTACHMENT' => 'Add an Attachment', + 'ADD_ATTACHMENT_EXPLAIN' => 'If you wish to attach one or more files enter the details below', + 'ADD_FILE' => 'Add File', + 'FILENAME' => 'Filename', + 'FILE_COMMENT' => 'File comment', + 'DISABLE_HTML' => 'Disable HTML', + 'DISABLE_BBCODE' => 'Disable BBCode', + 'DISABLE_SMILIES' => 'Disable Smilies', + 'DISABLE_MAGIC_URL' => 'Do not automatically parse URLs', + 'HTML_is_ON' => 'HTML is ON', + 'HTML_is_OFF' => 'HTML is OFF', + 'BBCode_is_ON' => '%sBBCode%s is ON', 'BBCode_is_OFF' => '%sBBCode%s is OFF', - 'Smilies_are_ON' => 'Smilies are ON', - 'Smilies_are_OFF' => 'Smilies are OFF', + 'Smilies_are_ON'=> 'Smilies are ON', + 'Smilies_are_OFF'=> 'Smilies are OFF', 'Images_are_ON' => '[img] is ON', - 'Images_are_OFF' => '[img] is OFF', - 'Flash_is_ON' => '[flash] is ON', - 'Flash_is_OFF' => '[flash] is ON', - 'ATTACH_SIG' => 'Attach signature (signatures can be changed in profile)', - 'NOTIFY_REPLY' => 'Notify me when a reply is posted', - 'SAVE' => 'Save', - 'Stored' => 'Your message has been entered successfully', - 'Deleted' => 'Your message has been deleted successfully', - 'Poll_delete' => 'Your poll has been deleted successfully', - 'Vote_cast' => 'Your vote has been cast', - 'Topic_reply_notification' => 'Topic Reply Notification', + 'Images_are_OFF'=> '[img] is OFF', + 'Flash_is_ON' => '[flash] is ON', + 'Flash_is_OFF' => '[flash] is ON', + 'ATTACH_SIG' => 'Attach a signature (signatures can be altered via the UCP)', + 'NOTIFY_REPLY' => 'Send me an email when a reply is posted', + 'SAVE' => 'Save', + 'POST_STORED' => 'Your message has been entered successfully', + 'POST_STORED_MOD' => 'Your message has been saved but requires approval', + 'Deleted' => 'Your message has been deleted successfully', + 'Poll_delete' => 'Your poll has been deleted successfully', + 'Vote_cast' => 'Your vote has been cast', 'BBCODE_B_HELP' => 'Bold text: [b]text[/b] (alt+b)', 'BBCODE_I_HELP' => 'Italic text: [i]text[/i] (alt+i)', 'BBCODE_U_HELP' => 'Underline text: [u]text[/u] (alt+u)', @@ -350,17 +350,20 @@ $lang = array_merge($lang, array( 'BBCODE_A_HELP' => 'Close all open bbCode tags', 'BBCODE_S_HELP' => 'Font color: [color=red]text[/color] Tip: you can also use color=#FF0000', 'BBCODE_F_HELP' => 'Font size: [size=x-small]small text[/size]', - 'Emoticons' => 'Emoticons', - 'More_emoticons' => 'View more Emoticons', - 'FONT_COLOR' => 'Font color', - 'FONT_SIZE' => 'Font size', - 'FONT_TINY' => 'Tiny', - 'FONT_SMALL' => 'Small', - 'FONT_NORMAL' => 'Normal', - 'FONT_LARGE' => 'Large', - 'FONT_HUGE' => 'Huge', - 'CLOSE_TAGS' => 'Close Tags', - 'STYLES_TIP' => 'Tip: Styles can be applied quickly to selected text', + 'EMOTICONS' => 'Emoticons', + 'MORE_EMOTICONS'=> 'View more Emoticons', + 'FONT_COLOR' => 'Font color', + 'FONT_SIZE' => 'Font size', + 'FONT_TINY' => 'Tiny', + 'FONT_SMALL' => 'Small', + 'FONT_NORMAL' => 'Normal', + 'FONT_LARGE' => 'Large', + 'FONT_HUGE' => 'Huge', + 'CLOSE_TAGS' => 'Close Tags', + 'STYLES_TIP' => 'Tip: Styles can be applied quickly to selected text', + 'CLOSE_WINDOW' => 'Close Window', + 'Topic_reply_notification' => 'Topic Reply Notification', + 'Private_Messaging' => 'Private Messaging', 'Unread_message' => 'Unread message', 'Read_message' => 'Read message', @@ -637,7 +640,6 @@ $lang = array_merge($lang, array( 'No_search_match' => 'No topics or posts met your search criteria', 'Found_search_match' => 'Search found %d match', 'Found_search_matches' => 'Search found %d matches', - 'Close_window' => 'Close Window', 'Sorry_auth_announce' => 'Sorry but only %s can post announcements in this forum', 'Sorry_auth_sticky' => 'Sorry but only %s can post sticky messages in this forum', 'Sorry_auth_read' => 'Sorry but only %s can read topics in this forum', diff --git a/phpBB/posting.php b/phpBB/posting.php index 8d02f31963..d0417931d0 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -208,7 +208,7 @@ if (isset($post)) { if (intval($row['last_post_time']) && ($current_time - intval($row['last_post_time'])) < intval($config['flood_interval'])) { - $err_msg .= ((!empty($err_msg)) ? '
' : '') . $user->lang['Flood_Error']; + $err_msg .= ((!empty($err_msg)) ? '
' : '') . $user->lang['FLOOD_ERROR']; } } } @@ -476,7 +476,9 @@ if (isset($post)) $template->assign_vars(array( 'META' => '') ); - trigger_error($user->lang['Stored']); + + $message = (!empty($forum_moderated)) ? 'POST_STORED_MOD' : 'POST_STORED'; + trigger_error($user->lang[$message]); } // Houston, we have an error ... @@ -565,29 +567,29 @@ if ($row = $db->sql_fetchrow($result)) $topic_type_toggle = ''; if ($mode == 'post' || $mode == 'edit') { - if ($auth->acl_gets('f_sticky', 'm_sticky', 'a_', intval($forum_id))) + if ($auth->acl_gets('f_sticky', 'm_', 'a_', intval($forum_id))) { $topic_type_toggle .= 'lang['Post_Sticky'] . '  '; + $topic_type_toggle .= ' /> ' . $user->lang['POST_STICKY'] . '  '; } - if ($auth->acl_gets('f_announce', 'm_announce', 'a_', intval($forum_id))) + if ($auth->acl_gets('f_announce', 'm_', 'a_', intval($forum_id))) { $topic_type_toggle .= 'lang['Post_Announcement'] . '  '; + $topic_type_toggle .= ' /> ' . $user->lang['POST_ANNOUNCEMENT'] . '  '; } if ($topic_type_toggle != '') { - $topic_type_toggle = $user->lang['Post_topic_as'] . ': ' . $user->lang['Post_Normal'] . '  ' . $topic_type_toggle; + $topic_type_toggle = $user->lang['POST_TOPIC_AS'] . ': ' . $user->lang['POST_NORMAL'] . '  ' . $topic_type_toggle; } } @@ -610,11 +612,11 @@ $s_action = "posting.$phpEx$SID&mode=$mode&f=" . intval($forum_id); switch ($mode) { case 'post': - $page_title = $user->lang['Post_a_new_topic']; + $page_title = $user->lang['POST_TOPIC']; break; case 'reply': - $page_title = $user->lang['Post_a_reply']; + $page_title = $user->lang['POST_REPLY']; $s_action .= '&t=' . intval($topic_id); break; @@ -655,18 +657,8 @@ $template->assign_vars(array( 'MODERATORS' => (sizeof($moderators)) ? implode(', ', $moderators[$forum_id]) : $user->lang['None'], 'L_POST_A' => $page_title, - 'L_MODERATORS' => $user->lang['Moderators'], - 'L_POST_SUBJECT' => $user->lang['Post_subject'], - 'L_TOPIC_ICON' => $user->lang['Topic_icon'], 'L_SUBJECT' => $user->lang['Subject'], - 'L_MESSAGE_BODY_EXPLAIN'=> (intval($config['max_post_chars'])) ? sprintf($user->lang['Message_body_explain'], intval($config['max_post_chars'])) : '', - 'L_EMOTICONS' => $user->lang['Emoticons'], - 'L_CANCEL' => $user->lang['Cancel'], - 'L_CONFIRM_DELETE' => $user->lang['Confirm_delete'], - 'L_DISABLE_HTML' => $user->lang['Disable_HTML_post'], - 'L_DISABLE_BBCODE' => $user->lang['Disable_BBCode_post'], - 'L_DISABLE_SMILIES' => $user->lang['Disable_Smilies_post'], - 'L_DISABLE_MAGIC_URL' => $user->lang['Disable_magic_url'], + 'L_MESSAGE_BODY_EXPLAIN'=> (intval($config['max_post_chars'])) ? sprintf($user->lang['MESSAGE_BODY_EXPLAIN'], intval($config['max_post_chars'])) : '', 'L_NONE' => $user->lang['None'], 'U_VIEW_FORUM' => "viewforum.$phpEx$SID&f=" . intval($forum_id), @@ -703,18 +695,7 @@ if ((($mode == 'post' || ($mode == 'edit' && intval($post_id) == intval($topic_f 'S_SHOW_POLL_BOX' => true, 'S_POLL_DELETE' => ($mode = 'edit' && !empty($poll_options) && ((empty($poll_last_vote) && $poster_id == $user->data['user_id'] && $auth->acl_get('f_delete', intval($forum_id))) || $auth->acl_gets('m_delete', 'a_', intval($forum_id)))) ? true : false, - 'L_ADD_A_POLL' => $user->lang['Add_poll'], - 'L_ADD_POLL_EXPLAIN' => $user->lang['Add_poll_explain'], - 'L_POLL_QUESTION' => $user->lang['Poll_question'], - 'L_POLL_OPTIONS' => $user->lang['Poll_options'], - 'L_POLL_OPTIONS_EXPLAIN'=> sprintf($user->lang['Poll_options_explain'], $config['max_poll_options']), - 'L_ADD_OPTION' => $user->lang['Add_option'], - 'L_UPDATE_OPTION' => $user->lang['Update'], - 'L_DELETE_OPTION' => $user->lang['Delete'], - 'L_POLL_LENGTH' => $user->lang['Poll_for'], - 'L_DAYS' => $user->lang['Days'], - 'L_POLL_LENGTH_EXPLAIN' => $user->lang['Poll_for_explain'], - 'L_POLL_DELETE' => $user->lang['Delete_poll'], + 'L_POLL_OPTIONS_EXPLAIN'=> sprintf($user->lang['POLL_OPTIONS_EXPLAIN'], $config['max_poll_options']), 'POLL_TITLE' => $poll_title, 'POLL_OPTIONS' => (!empty($poll_options)) ? implode("\n", $poll_options) : '', @@ -726,13 +707,7 @@ if ((($mode == 'post' || ($mode == 'edit' && intval($post_id) == intval($topic_f if ($auth->acl_gets('f_attach', 'm_edit', 'a_', $forum_id)) { $template->assign_vars(array( - 'S_SHOW_ATTACH_BOX' => true, - 'L_ADD_ATTACHMENT' => $user->lang['Add_attach'], - 'L_ADD_ATTACHMENT_EXPLAIN' => $user->lang['Add_attach_explain'], - - 'L_ADD_FILE' => $user->lang['Add_file'], - 'L_FILE_NAME' => $user->lang['Filename'], - 'L_FILE_COMMENT'=> $user->lang['File_comment'],) + 'S_SHOW_ATTACH_BOX' => true,) ); }