Started translation implemenation, added 1.2 english lang file

git-svn-id: file:///svn/phpbb/trunk@73 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/common.php

@@ -68,7 +68,7 @@ else
 	$default_lang = $config[0]["default_lang"];
 	$sys_lang = $default_lang;            
 }
-
+include('language/lang_'.$default_lang.'.'.$phpEx);
 // Check if user is banned
 if(!auth("ip ban", $db, "", USER_IP))
 {
@@ -99,7 +99,7 @@ if (!$user_logged_in)
 	if(isset($HTTP_COOKIE_VARS[$cookie_name]))
 	{
 		$userdata = get_userdata_from_id($HTTP_COOKIE_VARS["$cookie_name"], $db);
-		if(!auth("username ban", $db, $userdata["user_id"], "", "", "", "", "", "", "", ""))
+		if(!auth("username ban", $db, $userdata["user_id"]))
 		{
 			error_die($db, BANNED);
 		}

phpBB/language/lang_english.php

@@ -0,0 +1,364 @@
+<?
+/***************************************************************************
+ *                           lang_english.php  -  description
+ *                              -------------------
+ *     begin                : Sat Dec 16 2000
+ *     copyright            : (C) 2001 The phpBB Group
+ *     email                : support@phpbb.com
+ *
+ *     $Id$
+ *
+ *  ***************************************************************************/
+
+/***************************************************************************
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ ***************************************************************************/
+ 
+$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";
+$l_username 	= "Username";
+$l_password 	= "Password";
+$l_email 	= "Email";
+$l_emailaddress	= "Email Address";
+$l_preferences	= "Preferences";
+$l_welcometo    = "Welcome to";
+
+$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_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_profile	= "Profile";
+$l_register	= "Register";
+$l_onlyreq 	= "Only requried if being changed";
+$l_location 	= "From";
+$l_viewpostuser	= "View posts by this user";
+$l_perday       = "$l_messages per day";
+$l_oftotal      = "of total";
+$l_url 		= "URL";
+$l_icq 		= "ICQ";
+$l_icqnumber	= "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 	= "This is a block of text that can be added to posts you make.<BR>255 characters max!";
+$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";
+
+// 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";
+
+// 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";
+
+// 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  = "Our users have posted a total of";
+$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>
+-$users_online- ". ($users_online==1?"user is":"users are") ." <a href=\"$online_url\">currently browsing</a> the forums.<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_notfilledin	= "Error - you did not fill in all the required fields.";
+$l_invalidname	= "The username you chose \"$username\" has been taken.";
+$l_disallowname	= "The username you chose, \"$username\" has been disallowed by the administrator.";
+
+$l_welcomesubj	= "Welcome to $sitename Forums";
+$l_welcomemail	= 
+"
+$l_welcomesubj,
+
+Please keep this email for your records.
+
+
+Your account information is as follows:
+
+----------------------------
+Username: $username
+Password: $password
+----------------------------
+
+Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you.
+However, should you forget your password we provide an easy to use script to generate and email a new, random, password.
+
+Thank you for registering.
+
+$email_sig
+";
+$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_themecookie	= "NOTE: In order to use themes you MUST have cookies enabled.";
+$l_alwayssig	= "Always attach my signature";
+$l_alwaysdisable= "Always disable"; // Only used for next three strings
+$l_alwayssmile	= "$l_alwaysdisable $l_smilies";
+$l_alwayshtml	= "$l_alwaysdisable $l_html";
+$l_alwaysbbcode	= "$l_alwaysdisable $l_bbcode";
+$l_boardtheme	= "Board Theme";
+$l_boardlang    = "Board Language";
+$l_nothemes	= "No Themes In database";
+$l_saveprefs	= "Save $l_preferences";
+
+// Search
+$l_searchterms	= "Keywords";
+$l_searchany	= "Search for ANY of the terms (Default)";
+$l_searchall	= "Search for ALL of the terms";
+$l_searchallfrm	= "Search All Forums";
+$l_sortby	= "Sort by";
+$l_searchin	= "Search in";
+$l_titletext	= "Title & Text";
+$l_search	= "Search";
+$l_nomatches	= "No records match that query. Please broaden your search.";
+
+// Whosonline
+$l_whosonline	= "Who's online?";
+$l_nousers	= "No Users are currently browsing the forums";
+
+
+// Editpost
+$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";
+
+// Newtopic
+$l_emptymsg	= "You must type a $l_message to post. You cannot post an empty $l_message.";
+$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 <font size=-2>(This can be altered or added in your profile)</font>";
+$l_cancelpost	= "Cancel Post";
+
+// Reply
+$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.
+
+You may view the topic at:
+		                
+http://$SERVER_NAME$url_phpbb/viewtopic.$phpEx?topic=$topic&forum=$forum
+
+Or view the $sitename forum index at
+
+http://$SERVER_NAME$url_phpbb
+
+Thank you for using $sitename forums.
+
+Have a nice day.
+
+$email_sig';
+
+
+$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";
+
+// Viewpmsg
+$l_nopmsgs	= "You don't have any $l_privmsgs.";
+$l_reply	= "Reply";
+
+// Delpmsg
+$l_deletesucces	= "Deletion successful.";
+
+// Smilies
+$l_smilesym	= "What to type";
+$l_smileemotion	= "Emotion";
+$l_smilepict	= "Picture";
+
+// Sendpasswd
+$l_wrongactiv	= "The activation key you provided is not correct. Please check email $l_message you recived and make sure you have copied the activation key exactly.";
+$l_passchange	= "Your password has been successfully changed. You may now goto your <a href=\"bb_profile.$phpEx?mode=edit\">profile</a> and change your password to a more suitable one.";
+$l_wrongmail	= "The email address you entered does not match the one stored in our database.";
+
+$l_passsubj	= "$sitename Forums Password Change";
+
+$l_pwdmessage	= 'Dear $checkinfo[username],
+You are receiving this email because you (or someone pretending to be you) 
+has requested a passwordchange on $sitename forums. If you believe you have 
+received this message in error simply delete it and your password will remain 
+the same.
+
+Your new password as generated by the forums is: $newpw
+
+In order for this change to take effect you must visit this page: 
+
+   http://$SERVER_NAME$PHP_SELF?actkey=$key
+
+Once you have visited the page your password will be changed in our database, 
+and you may login to the profile section and change it as desired.
+
+Thank you for using $sitename Forums
+
+$email_sig';
+
+$l_passsent	= "Your password has changed to a new, random, password. Please check your email on how to complete the password change procedure.";
+$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";
+
+
+?>

phpBB/login.php

@@ -53,5 +53,5 @@ else if($logout)
      }
    header("Location: index.$phpEx");
 }
-
+   
 ?>

phpBB/page_header.php

@@ -39,7 +39,34 @@ $template->set_var(array("SITENAME" => $sitename,
 			"PHPEX" => $phpEx,
 			 "PAGE_TITLE" => $page_title,
 			 "LOGIN_STATUS" => $logged_in_status,
-			 "META_INFO" => $meta_tags));
+			 "META_INFO" => $meta_tags,
+			 "L_USERNAME" => $l_username,
+			 "L_PASSWORD" => $l_password,
+			 "L_WELCOMETO" => $l_welcometo,
+			 "L_REGISTER" => $l_register,
+			 "L_PROFILE" => $l_profile,
+			 "L_SEARCH" => $l_search,
+			 "L_PRIVATEMSGS" => $l_privmsgs,
+			 "L_MEMBERLIST" => $l_memberslist,
+			 "L_FAQ" => $l_faq,
+			 "L_FORUM" => $l_forum,
+			 "L_TOPICS" => $l_topics,
+			 "L_REPLIES" => $l_replies,
+			 "L_VIEWS" => $l_views,
+			 "L_POSTS" => $l_posts,
+			 "L_LASTPOST" => $l_lastpost,
+			 "L_MODERATOR" => $l_moderator,
+			 "L_MESSAGES" => $l_messages,
+			 "L_POSTEDTOTAL" => $l_postedtotal,
+			 "L_WEHAVE" => $l_wehave,
+			 "L_REGUSERS" => $l_regedusers,
+			 "L_NEWESTUSER" => $l_newestuser,
+			 "L_BROWSING" => $l_browsing,
+			 "L_ARECURRENTLY" => $l_arecurrently,
+			 "L_THEFORUMS" => $l_theforums,
+			 "L_NONEWPOSTS" => $l_nonewposts,
+			 "L_NEWPOSTS" => $l_newposts));
+
 $template->pparse("output", "overall_header");
 
 // Do a switch on page type, this way we only load the templates that we need at the time

phpBB/templates/Default/index_body.tpl

@@ -6,11 +6,11 @@
 	      <table border="0" width="100%" cellpadding="0" cellspacing="1">
 	        <tr class="tableheader">
 	           <td width="5%">&nbsp;</td>
-	           <td>Forum</td>
+	           <td>{L_FORUM}</td>
-	           <td align="center" width="5%">Topics</td>
+	           <td align="center" width="5%">{L_TOPICS}</td>
-	           <td align="center" width="5%">Posts</td>
+	           <td align="center" width="5%">{L_POSTS}</td>
-	           <td align="center" width="15%">Last Post</td>
+	           <td align="center" width="15%">{L_LASTPOST}</td>
-	           <td align="center" width="5%">Moderator</td>
+	           <td align="center" width="5%">{L_MODERATOR}</td>
 	        </tr>
 	        <!-- BEGIN catrow -->
 	        <tr class="catheader">

phpBB/templates/Default/index_footer.tpl

@@ -2,8 +2,8 @@
 	  <td>
 	   <table border="0" align="center" width="100%" bgcolor="#FFFFFF" cellpadding="0" cellspacing="1">
 	    <tr align="left">
-	      <td style="{font-size: 8pt;}"><img src="images/folder.gif"> = New Posts since your last visit.<br>
+	      <td style="{font-size: 8pt;}"><img src="images/folder.gif"> = {L_NEWPOSTS}.<br>
-	          <img src="images/red_folder.gif"> = No new Posts since your last visit.<br>
+	          <img src="images/red_folder.gif"> = {L_NONEWPOSTS}.<br>
 	      </td>
 	    </tr>
 	    </table>

phpBB/templates/Default/index_header.tpl

@@ -5,10 +5,10 @@
 	  <td>
 	    <table border="0" width="100%" bgcolor="#CCCCCC" cellpadding="1" cellspacing="1">
         <tr>
-	        <td align="right" style="{font-size: 8pt;}">Our users have posted a total of -<b>{TOTAL_POSTS}</b>- messages.<br>
+	        <td align="right" style="{font-size: 8pt;}">{L_POSTEDTOTAL} -<b>{TOTAL_POSTS}</b>- {L_MESSAGES}.<br>
-	          We have <b>{TOTAL_USERS}</b> total registered users.<br>
+	          {L_WEHAVE} <b>{TOTAL_USERS}</b> {L_REGUSERS}.<br>
-	          The newest registered user is <b><a href="profile.php?mode=viewprofile&user_id={NEWEST_UID}">{NEWEST_USER}</a></b><br>
+	          {L_NEWESTUSER} <b><a href="profile.php?mode=viewprofile&user_id={NEWEST_UID}">{NEWEST_USER}</a></b><br>
-	          There are currently <a href="whosonline.php"><b>{USERS_BROWSING}</b> browsing</a> the forums<br>
+	          {L_ARECURRENTLY} <a href="whosonline.php"><b>{USERS_BROWSING}</b> {L_BROWSING}</a> {L_THEFORUMS}<br>
 	        </td>
 	      </tr>
 	    </table>

phpBB/templates/Default/overall_header.tpl

@@ -1,11 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<!-- The variables that are available in this file are:
-     SITENAME - Site name set in admin panel
-     PAGE_TITLE - Specific title of the page, 'Forum Index', 'View Topic' etc etc.
-     USERNAME - The current logged in users username (if the user is logged in)
-     USERID - The current logged in users ID number (if the user is logged in)
-//-->		 
 <head>
 <title>{SITENAME} - {PAGE_TITLE}</title>
 {META_INFO}
@@ -51,13 +45,18 @@ A:Hover {
 				<td bgcolor="#CCCCCC"><table width="100%" cellspacing="1" cellpadding="3" border="0">
 					<tr class="tablebody"><form method="POST" action="login.{PHPEX}">
 						<td align="left" valign="top"><a href="index.php"><img src="images/title.jpg" height="55" width="450" border="0"></a></td>
-						<td align="right">Username : <input type="text" name="username"><br>Password : <input type="password" name="password"><br><input type="submit" name="submit" value="Login"></td>
+						<td align="right">{L_USERNAME} : <input type="text" name="username"><br>{L_PASSWORD} : <input type="password" name="password"><br><input type="submit" name="submit" value="Login"></td>
 					</tr></form>
 					<tr class="tablebody">
 						<td colspan="2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 							<tr>
-								<td align="left" valign="bottom">Welcome to {SITENAME}<br>{LOGIN_STATUS}</td>
+								<td align="left" valign="bottom">{L_WELCOMETO} {SITENAME}<br>{LOGIN_STATUS}</td>
-								<td align="right" valign="bottom">[<a href="profile.{PHPEX}?mode=register">Register</a>]&nbsp;[<a href="profile.{PHPEX}?mode=editprofile">Edit Profile</a>]&nbsp;[<a href="search.{PHPEX}">Search</a>]&nbsp;[<a href="priv_msg.{PHPEX}?mode=read">Private Messages</a>]&nbsp;[<a href="memberlist.{PHPEX}">Memberslist</a>]&nbsp;[<a href="faq.{PHPEX}">FAQ</a>]</td>
+								<td align="right" valign="bottom">[<a href="profile.{PHPEX}?mode=register">{L_REGISTER}</a>]&nbsp;
+								[<a href="profile.{PHPEX}?mode=editprofile">{L_PROFILE}</a>]&nbsp;
+								[<a href="search.{PHPEX}">{L_SEARCH}</a>]&nbsp;
+								[<a href="priv_msg.{PHPEX}?mode=read">{L_PRIVATEMSGS}</a>]&nbsp;
+								[<a href="memberlist.{PHPEX}">{L_MEMBERLIST}</a>]&nbsp;
+								[<a href="faq.{PHPEX}">{L_FAQ}</a>]</td>
 							</tr>
 						</table></td>
 					</tr>