diff options
| -rw-r--r-- | phpBB/common.php | 11 | ||||
| -rwxr-xr-x | phpBB/language/lang_english.php | 296 |
2 files changed, 3 insertions, 304 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 1340bbadd0..2a7a3e0b0d 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -112,6 +112,7 @@ else $board_config['board_email'] = stripslashes(str_replace("<br />", "\n", $config['email_sig'])); $board_config['board_email_from'] = stripslashes($config['email_from']); $board_config['flood_interval'] = $config['flood_interval']; + $board_config['post_mod_time'] = $config['post_mod_time']; $board_config['avatar_filesize'] = $config['avatar_filesize']; $board_config['avatar_max_width'] = $config['avatar_max_width']; $board_config['avatar_max_height'] = $config['avatar_max_height']; @@ -122,16 +123,10 @@ else $board_config['smtp_host'] = $config['smtp_host']; } -// -// This doesn't need to be here, it's only neccesary -// for the following if... loop because a language file -// will be loaded post-session initialisation (or the default -// English one will load if a CRITICAL_ERROR occurs) -// -include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '.'.$phpEx); - if($board_config['board_disable']) { + include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '.'.$phpEx); + message_die(GENERAL_MESSAGE, $lang['Board_disable'], $lang['Information']); } diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index 50b2bd4cf8..38f499ea4b 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -588,206 +588,13 @@ $lang[12] = "GMT + 12" . " " . $lang['Hours']; // // Old format ... _DON'T_add_any_ new entries here!! // -$l_forum = "Forum"; -$l_forums = "Forums"; -$l_topic = "Topic"; -$l_topics = "Topics"; -$l_replies = "Replies"; -$l_poster = "Poster"; -$l_author = "Author"; -$l_views = "Views"; -$l_post = "Post"; -$l_posts = "Posts"; -$l_message = "Message"; -$l_messages = "Messages"; -$l_subject = "Subject"; -$l_body = "$l_message Body"; -$l_from = "From"; // Message from -$l_moderator = "Moderator/s"; -$l_username = "Username"; -$l_password = "Password"; -$l_email = "Email"; -$l_emailaddress = "Email Address"; -$l_preferences = "Preferences"; -$l_welcometo = "Welcome to"; -$l_There = "There"; -$l_is = "is"; -$l_are = "are"; -$l_Registered = "Registered"; -$l_online = "online"; -$l_users = "users"; -$l_user = "user"; -$l_and = "and"; -$l_None = "None"; -$l_log_me_in = "Log me in automatically"; -$l_all_times = "All times are"; -$l_hours = "hours"; - -$l_All_Topics = "All Topics"; -$l_Day = "Day"; -$l_Days = "Days"; -$l_Week = "Week"; -$l_Weeks = "Weeks"; -$l_Month = "Month"; -$l_Months = "Months"; -$l_Year = "Year"; - -$l_anonymous = "Anonymous"; // Post -$l_guest = "Guest"; // Whosonline -$l_noposts = "No $l_posts"; -$l_joined = "Joined"; -$l_gotopage = "Goto page"; -$l_nextpage = "Next Page"; -$l_prevpage = "Previous Page"; -$l_go = "Go"; -$l_selectforum = "Select a $l_forum"; - -$l_date = "Date"; -$l_number = "Number"; -$l_name = "Name"; -$l_options = "Options"; -$l_submit = "Submit"; -$l_confirm = "Confirm"; -$l_enter = "Enter"; -$l_by = "by"; // Posted by -$l_ondate = "on"; // This message is edited by: $username on $date -$l_new = "New"; - -$l_html = "HTML"; -$l_bbcode = "BBcode"; -$l_smilies = "Smilies"; -$l_on = "On"; -$l_off = "Off"; -$l_yes = "Yes"; -$l_no = "No"; - -$l_click = "Click"; -$l_here = "here"; -$l_toreturn = "to return"; -$l_returnindex = "$l_toreturn to the forum index"; -$l_returntopic = "$l_toreturn to the forum topic list."; - -$l_error = "Error"; -$l_dberror = "A database error occured, please try again later."; -$l_tryagain = "Please go back and try again."; -$l_mismatch = "Passwords do not match."; -$l_userremoved = "This user has been removed from the User database"; -$l_wrongpass = "You entered the wrong password."; -$l_userpass = "Please enter your username and password."; -$l_banned = "You have been banned from this forum. Contact the system administrator if you have any questions."; -$l_enterpassword= "You must enter your password."; - -$l_nopost = "You do not have access to post to this forum."; -$l_noread = "You do not have access to read this forum."; - -$l_lastpost = "Last $l_post"; -$l_sincelast = "since your last visit"; -$l_newposts = "New $l_posts $l_sincelast"; -$l_nonewposts = "No New $l_posts $l_sincelast"; - // Index page -$l_indextitle = "Forum Index"; - // Members and profile -$l_reginfo = "Registration Information"; -$l_profile_info = "Profile Information"; -$l_profile_info_notice = "This information will be publicly viewable"; -$l_profile = "Profile"; -$l_register = "Register"; -$l_onlyreq = "Only requried if being changed"; -$l_location = "From"; -$l_view_users_posts = "View posts by this user"; -$l_per_day = "$l_messages per day"; -$l_of_total = "of total"; -$l_url = "URL"; -$l_icq = "ICQ"; -$l_icq_number = "ICQ Number"; -$l_icqadd = "Add"; -$l_icqpager = "Pager"; -$l_aim = "AIM"; -$l_yim = "YIM"; -$l_yahoo = "Yahoo Messenger"; -$l_msn = "MSN"; -$l_messenger = "MSN Messenger"; -$l_website = "Web Site Address"; -$l_occupation = "Occupation"; -$l_interests = "Interests"; -$l_signature = "Signature"; -$l_sigexplain = ""; -$l_usertaken = "The $l_username you picked has been taken."; -$l_userdisallowed= "The $l_username you picked has been disallowed by the administrator. $l_tryagain"; -$l_infoupdated = "Your Information has been updated"; -$l_publicmail = "Allow other users to view my $l_emailaddress"; -$l_itemsreq = "Items marked with a * are required unless stated otherwise"; -$l_nouserid = "You must supply a user ID number in order to view profile data."; -$l_viewingprofile = "Viewing profile of "; -$l_hidden = "hidden"; -$l_boardtemplate = "Select Template"; -$l_date_format = "Date format"; - - -$l_date_format_explanation = ""; -$l_password_if_changed = "You only need to supply a password if you want to change it."; -$l_password_confirm_if_changed = "You only need to confirm your password if you changed it above."; - -$l_top10 = "Top 10 Posters"; -$l_alpha = "Sorta Alphabetical"; - // Viewforum -$l_viewforum = "View Forum"; -$l_notopics = "There are no topics for this forum. You can post one."; -$l_hotthres = "More then $hot_threshold $l_posts"; -$l_islocked = "$l_topic is Locked (No new $l_posts may be made in it)"; -$l_moderatedby = "Moderated by"; - -$l_Days = "Day/s"; -$l_All_posts = "All posts"; - // Private forums -$l_privateforum = "This is a <b>Private Forum</b>."; -$l_private = "$l_privateforum<br>Note: you must have cookies enabled in order to use private forums."; -$l_noprivatepost = "$l_privateforum You do not have access to post to this forum."; - // Viewtopic -$l_topictitle = "View $l_topic"; -$l_unregistered = "Unregistered User"; -$l_posted = "Posted"; -$l_profileof = "View Profile of"; -$l_viewsite = "Goto the website of"; -$l_icqstatus = "$l_icq status"; // ICQ status -$l_editdelete = "Edit/Delete This $l_post"; -$l_replyquote = "Reply with quote"; -$l_viewip = "View Posters IP (Moderators/Admins Only)"; -$l_locktopic = "Lock this $l_topic"; -$l_unlocktopic = "Unlock this $l_topic"; -$l_movetopic = "Move this $l_topic"; -$l_deletetopic = "Delete this $l_topic"; -$l_nomoretopics = "There are no more topics in this view."; - // Functions -$l_loggedinas = "Logged in as"; -$l_notloggedin = "Not logged in"; -$l_logout = "Logout"; -$l_login = "Login"; - // Page_header -$l_separator = "» »"; // Included here because some languages have - // problems with high ASCII (Big-5 and the like). -$l_editprofile = "Edit Profile"; -$l_editprefs = "Edit $l_preferences"; -$l_search = "Search"; -$l_memberslist = "Memberslist"; -$l_faq = "FAQ"; -$l_privmsgs = "Private $l_messages"; -$l_sendpmsg = "Send a Private Message"; -$l_postedtotal = -$l_wehave = "We have"; -$l_regedusers = "registered users."; -$l_newestuser = "The newest Registered User is"; -$l_browsing = "browsing"; -$l_arecurrently = "There are currently"; -$l_theforums = "the forums."; - $l_statsblock = '$statsblock = "Our users have posted a total of -$total_posts- $l_messages.<br> We have -$total_users- Registered Users.<br> The newest Registered User is -<a href=\"$profile_url\">$newest_user</a>-.<br> @@ -795,18 +602,9 @@ The newest Registered User is -<a href=\"$profile_url\">$newest_user</a>-.<br> $l_privnotify = '$privnotify = "<br>You have $new_message <a href=\"$privmsg_url\">new private ".($new_message>1?"messages":"message")."</a>.";'; // Page_tail -$l_adminpanel = "Administration Panel"; -$l_poweredby = "Powered by"; -$l_version = "Version"; - // Auth // Register -$l_acountadded = "Thank you for registering with $sitename. Your account has been successfully created."; -$l_nowactive = "Your account is now been activated. You may login and post with this account. Thank you for using $sitename forums."; -$l_notfilledin = "Error - you did not fill in all the required fields."; -$l_invalidname = "The username you chose \"$username\" has been taken or has been disallowed by the administrator."; - $l_mailingaddress = " James Atkinson<br> @@ -845,83 +643,8 @@ Thank you for registering. "; - -$l_beenadded = "You have been added to the database."; -$l_thankregister= "Thank you for registering!"; -$l_useruniq = "Must be unique. No two users can have the same Username."; -$l_storecookie = "Store my username in a cookie for 1 year"; - -// Prefs -$l_prefupdated = "$l_preferences updated. $l_click <a href=\"index.$phpEx\">$l_here</a> $l_returnindex"; -$l_editprefs = "Edit Your $l_preferences"; -$l_alwayssig = "Always attach my signature"; -$l_alwayssmile = "Always enable $l_smilies"; -$l_alwayshtml = "Always enable $l_html"; -$l_alwaysbbcode = "Always enable $l_bbcode"; -$l_boardtheme = "Board Theme"; -$l_boardlang = "Board Language"; -$l_nothemes = "No Themes In database"; -$l_saveprefs = "Save $l_preferences"; -$l_timezone = "Timezone"; - -// Viewonline -$l_whosonline = "Who is Online"; -$l_nousers = "No Users are currently browsing the forums"; -$l_forum_location = "Location in the forum"; -$l_last_updated = "Last Updated"; -$l_forum_index = "Forum Index"; -$l_loggin_on = "Logging on"; -$l_searching = "Searching the forum"; -$l_registering = "Registering"; -$l_viewing_profiles = "Viewing member profiles"; -$l_viewing_members = "Viewing member list"; -$l_altering_profile = "Altering their profile"; -$l_viewing_online = "Viewing who is online"; -$l_viewing_faq = "Viewing the board FAQ"; - // Editpost -$l_editpost = "Edit Post"; -$l_editpostin = "Editing post in:"; -$l_notedit = "You can't edit a post that isn't yours."; -$l_permdeny = "You did not supply the correct $l_password or do not have permission to edit this post. $l_tryagain"; -$l_editedby = "This $l_message was edited by:"; -$l_stored = "Your $l_message has been stored in the database."; -$l_viewmsg = "to view your $l_message."; -$l_deleted = "Your $l_post has been deleted."; -$l_nouser = "That $l_username doesn't exist."; -$l_passwdlost = "I forgot my password!"; -$l_delete = "Delete this Post"; - -$l_disable = "Disable"; -$l_onthispost = "on this Post"; - -$l_htmlis = "$l_html is"; -$l_bbcodeis = "$l_bbcode is"; - -$l_notify = "Notify by email when replies are posted"; - -$l_flooderror = "Your last post was less then ".$board_config['flood_interval']." seconds ago. You must wait befor you post again!"; - - // Newtopic -$l_postnew = "Post New Topic"; -$l_postnewin = "Post New Topic in:"; -$l_emptymsg = "You must type a $l_message to post. You cannot post an empty $l_message."; -$l_emptysubj = "You must enter a $l_subject to post a new topic. You cannot post a new topic without a subject."; -$l_aboutpost = "About Posting"; -$l_regusers = "All <b>Registered</b> users"; -$l_anonusers = "<b>Anonymous</b> users"; -$l_modusers = "Only <B>Moderators and Administrators</b>"; -$l_anonhint = "<br>(To post anonymously simply do not enter a username and password)"; -$l_inthisforum = "can post new topics and replies to this forum"; -$l_attachsig = "Show signature (This can be altered or added in your profile)"; -$l_cancelpost = "Cancel Post"; -$l_preview = "Preview Post"; -// Reply -$l_postreplyto = "Post reply in:"; -$l_nopostlock = "You cannot post a reply to this topic, it has been locked."; -$l_topicreview = "Topic Review"; -$l_notifysubj = "A reply to your topic has been posted."; $l_notifybody = 'Dear $m[username]\r\nYou are receiving this Email because a message you posted on $sitename forums has been replied to, and you selected to be notified on this event. @@ -941,21 +664,6 @@ Have a nice day. '; -$l_quotemsg = '[quote]\nOn $m[post_time], $m[username] wrote:\n$text\n[/quote]'; - -// Sendpmsg -$l_norecipient = "You must enter the username you want to send the $l_message to."; -$l_sendothermsg = "Send another Private Message"; -$l_cansend = "can send $l_privmsgs"; // All registered users can send PM's -$l_yourname = "Your $l_username"; -$l_recptname = "Recipient $l_username"; - -// Replypmsg -$l_pmposted = "Reply Posted, you can click <a href=\"viewpmsg.$phpEx\">here</a> to view your $l_privmsgs"; - -// Delpmsg -$l_deletesucces = "Deletion successful."; - // Smilies $l_smilesym = "What to type"; $l_smileemotion = "Emotion"; @@ -992,8 +700,4 @@ $l_emailpass = "Email Lost Password"; $l_passexplain = "Please fill out the form, a new password will be sent to your Email address"; $l_sendpass = "Send Password"; -// Full page login -$l_autologin = "Log me on automatically each visit"; -$l_resend_password = "I have forgotten my password"; - ?>
\ No newline at end of file |