Did some work converting lang file stuff to new format

git-svn-id: file:///svn/phpbb/trunk@366 89ea8834-ac86-4346-8a33-228a782c2dd0
author: James Atkinson <thefinn@users.sourceforge.net> 2001-05-28 20:23:16 +0000
committer: James Atkinson <thefinn@users.sourceforge.net> 2001-05-28 20:23:16 +0000
commit: 943901d9160cf7aaf1b845ea00f61d7e6b1d4d6b (patch)
tree: 43cd3f3a5ec5a9932db9ebd431a3a4114c96693d
parent: 61d2ea4b290a47936a790b3ca2919b3272e46df9 (diff)
download: forums-943901d9160cf7aaf1b845ea00f61d7e6b1d4d6b.tar
forums-943901d9160cf7aaf1b845ea00f61d7e6b1d4d6b.tar.gz
forums-943901d9160cf7aaf1b845ea00f61d7e6b1d4d6b.tar.bz2
forums-943901d9160cf7aaf1b845ea00f61d7e6b1d4d6b.tar.xz
forums-943901d9160cf7aaf1b845ea00f61d7e6b1d4d6b.zip
5 files changed, 102 insertions, 54 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php
index 535535d60d..1a46eae2ae 100644
--- a/phpBB/includes/page_header.php
+++ b/phpBB/includes/page_header.php
@@ -102,10 +102,10 @@ for($i = 0; $i < $logged_online; $i++)
 	$userlist .= ($i < $logged_online - 2) ? ", " : "";
 }
 
-$l_r_user_s = ($logged_online == 1) ? $l_user : $l_users;
-$l_g_user_s = ($guests_online == 1) ? $l_user : $l_users;
-$l_is_are = ($logged_online == 1) ? $l_is : $l_are;
-$userlist = ($logged_online > 0) ? "$l_Registered $l_r_user_s: " . $userlist : "$l_Registered $l_r_user_s: $l_None";
+$l_r_user_s = ($logged_online == 1) ? $lang['User'] : $lang['Users'];
+$l_g_user_s = ($guests_online == 1) ? $lang['User'] : $lang['Users'];
+$l_is_are = ($logged_online == 1) ? $lang['is'] : $lang['are'];
+$userlist = ($logged_online > 0) ? $lang['Registered'] ." $l_r_user_s: " . $userlist : $lang['Registered'] . " $l_r_user_s: ".$lang['None'];
 
 //
 // The following assigns all _common_
@@ -122,41 +122,41 @@ $template->assign_vars(array(
 	"TOTAL_USERS_ONLINE" => "$l_There $l_is_are $logged_online $l_Registered $l_r_user_s $l_and $guests_online $l_guest $l_g_user_s $l_online",
 	"LOGGED_IN_USER_LIST" => $userlist,
 
-	"L_USERNAME" => $l_username,
-	"L_PASSWORD" => $l_password,
-	"L_LOGIN" => $l_login,
-	"L_LOG_ME_IN" => $l_log_me_in,
-	"L_WELCOMETO" => $l_welcometo,
-	"L_INDEX" => $l_indextitle,
-	"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,
-	"L_POSTED" => $l_posted,
-	"L_JOINED" => $l_joined,
-	"L_AUTO_LOGIN" => $l_autologin,
-	"L_AUTHOR" => $l_author,
-	"L_MESSAGE" => $l_message,
-	"L_BY" => $l_by,
+	"L_USERNAME" => $lang['Username'],
+	"L_PASSWORD" => $lang['Password'],
+	"L_LOGIN" => $lang['Login'],
+	"L_LOG_ME_IN" => $lang['Log_me_in'],
+	"L_WELCOMETO" => $lang['Welcome_to'],
+	"L_INDEX" => $lang['Forum_Index'],
+	"L_REGISTER" => $lang['Register'],
+	"L_PROFILE" => $lang['Profile'],
+	"L_SEARCH" => $lang['Search'],
+	"L_PRIVATEMSGS" => $lang['Private_msgs'],
+	"L_MEMBERLIST" => $lang['Memberlist'],
+	"L_FAQ" => $lang['FAQ'],
+	"L_FORUM" => $lang['Forum'],
+	"L_TOPICS" => $lang['Topics'], 
+	"L_REPLIES" => $lang['Replies'],
+	"L_VIEWS" => $lang['Views'],
+	"L_POSTS" => $lang['Posts'],
+	"L_LASTPOST" => $lang['Last_Post'],
+	"L_MODERATOR" => $lang['Moderator'],
+	"L_MESSAGES" => $lang['Messages'],
+	"L_POSTEDTOTAL" => $lang['Posted_Total'],
+	"L_WEHAVE" => $lang['We_have'],
+	"L_REGUSERS" => $lang['Regedusers'],
+	"L_NEWESTUSER" => $lang['newestuser'],
+	"L_BROWSING" => $lang['browsing'],
+	"L_ARECURRENTLY" => $lang['arecurrently'],
+	"L_THEFORUMS" => $lang['theforums'],
+	"L_NONEWPOSTS" => $lang['No_new_posts'],
+	"L_NEWPOSTS" => $lang['New_posts'],
+	"L_POSTED" => $lang['Posted'],
+	"L_JOINED" => $lang['Joined'],
+	"L_AUTO_LOGIN" => $lang['Log_me_in'],
+	"L_AUTHOR" => $lang['Author'],
+	"L_MESSAGE" => $lang['Message'],
+	"L_BY" => $lang['by'],
 	"L_LOGIN_LOGOUT" => $l_login_logout,
 
 	"U_INDEX" => append_sid("index.".$phpEx),
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index a2eafb7d44..66a474f978 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -39,15 +39,22 @@ $lang['Topic'] = "Topic";
 $lang['Topics'] = "Topics";
 $lang['Reply'] = "Reply";
 $lang['Replies'] = "Replies";
+$lang['Views'] = "Views";
 $lang['Post'] = "Post";
 $lang['Posts'] = "Posts";
+$lang['Posted'] = "Posted";
 $lang['Message'] = "Message";
 $lang['Messages'] = "Messages";
 $lang['User'] = "User";
 $lang['Users'] = "Users";
+$lang['Username'] = "Username";
+$lang['Password'] = "Password";
+$lang['Email'] = "Email";
 $lang['Poster'] = "Poster";
 $lang['Author'] = "Author";
-
+$lang['is'] = "is";
+$lang['are'] = "are";
+$lang['by'] = "by";
 $lang['All_Topics'] = "All Topics";
 $lang['Hour'] = "Hour";
 $lang['Hours'] = "Hours";
@@ -68,6 +75,36 @@ $lang['Page'] = "Page"; // Followed by the current page number then 'of x' where
 $lang['of'] = "of"; // See Page above
 
 //
+// Global Header strings
+//
+$lang['Registered'] = "Registered";
+$lang['None'] = "None";
+
+$lang['Welcome_to'] = "Welcome to"; // Followed by site name
+$lang['Register'] = "Register";
+$lang['Profile'] = "Profile";
+$lang['Search'] = "Search";
+$lang['Private_msgs'] = "Private Messages";
+$lang['Memberlist'] = "Memberlist";
+$lang['FAQ'] = "FAQ";
+$lang['Last_Post'] = "Last Post";
+$lang['Moderator'] = "Moderator(s)";
+
+// Stats block text
+$lang['Posted_Total'] = "Our users have posted a total of"; // Number of posts
+$lang['We_have'] = "We have"; // # registered users
+$lang['Regedusers'] = "Registered users";
+$lang['newestuser'] = "The newest Registered User is"; // username
+$lang['browsing'] = "browsing";
+$lang['arecurrently'] = "There are currently"; // # users browsing
+$lang['theforums'] = "the forums";
+
+
+$lang['No_new_posts'] = "No new posts";
+$lang['New_posts'] = "New posts";
+$lang['Joined'] = "Joined";
+
+//
 // Login
 //
 $lang['Login'] = "Login";
@@ -75,12 +112,13 @@ $lang['Logout'] = "Logout";
 $lang['You_are_logged_in'] = "You are logged in as"; // This is followed by the username
 $lang['You_are_not_logged_in'] = "You are not logged in";
 $lang['Forgotten_password'] = "I forgot my password";
+$lang['Log_me_in'] = "Log me on automatically each visit";
 
 //
 // Index page
 //
 $lang['No_Posts'] = "No Posts";
-
+$lang['Forum_Index'] = "Forum Index";
 //
 // Viewforum
 //
@@ -93,6 +131,12 @@ $lang['No_Posts'] = "No Posts";
 // Posting/Replying (Not private
 // messaging!)
 //
+$lang['Flood_Error'] = "Your last post was less then ".$board_config['flood_interval']." seconds ago. You must wait befor you post again!";
+$lang['Empty_subj'] = "You must specifiy a subject when posting a new topic.";
+$lang['Empty_msg'] = "You must enter a message when posting!";
+$lang['Postnew'] = "Post New Topic";
+$lang['Post_new_in'] = "Post New Topic in:"; // Followed by forum name
+
 
 //
 // Private Messageing <= Should be blank for now
@@ -101,10 +145,14 @@ $lang['No_Posts'] = "No Posts";
 //
 // Profiles/Registration
 //
+$lang['Website'] = "Web Site";
+$lang['From'] = "From";
 
 //
 // Memberslist
 //
+$lang['Top10'] = "Top 10 Posters";
+$lang['Alphabetical'] = "Sorta Alphabetical";
 
 //
 // Search <= Should be blank for now
@@ -320,7 +368,7 @@ $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_postedtotal  = 
 $l_wehave	= "We have";
 $l_regedusers	= "registered users.";
 $l_newestuser	= "The newest Registered User is";
diff --git a/phpBB/login.php b/phpBB/login.php
index 85dfd50812..ef6487e601 100644
--- a/phpBB/login.php
+++ b/phpBB/login.php
@@ -131,7 +131,7 @@ else
 	$username = ($userdata['user_id'] != ANONYMOUS) ? $userdata['username'] : "";
 
 	$template->assign_vars(array(
-		"L_SEND_PASSWORD" => $l_resend_password,
+		"L_SEND_PASSWORD" => $lang['Forgotten_password'],
 
 		"FORWARD_PAGE" => $forward_page,
 		"USERNAME" => $username,
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index e77dae7cd1..fa01f19b17 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -22,7 +22,7 @@ include('extension.inc');
 include('common.'.$phpEx);
 
 $pagetype = "memberlist";
-$page_title = $l_memberslist;
+$page_title = $lang['Memberlist'];
 
 //
 // Start session management
@@ -105,11 +105,11 @@ if(($selected_members = $db->sql_numrows($result)) > 0)
 	$template->assign_vars(array(
 		"U_VIEW_TOP10" => append_sid("memberlist.$phpEx?mode=topten"),
 		"U_SORTALPHA" => append_sid("memberlist.$phpEx?mode=alpha"),
-		"L_VIEW_TOP10" => $l_top10,
-		"L_SORTALPHA" => $l_alpha,
-		"L_EMAIL" => $l_email,
-		"L_WEBSITE" => $l_website,
-		"L_FROM" => $l_from));
+		"L_VIEW_TOP10" => $lang['Top10'],
+		"L_SORTALPHA" => $lang['Alphabetical'],
+		"L_EMAIL" => $lang['Email'],
+		"L_WEBSITE" => $lang['Website'],
+		"L_FROM" => $lang['From']));
 											
 	$members = $db->sql_fetchrowset($result);
 
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 5d4b0fc6c7..fff1bf7426 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -117,7 +117,7 @@ if(isset($HTTP_POST_VARS['submit']))
 			if(($current_time - $last_post_time) < $board_config['flood_interval'])
 			{
 				$error = TRUE;
-				$error_msg = $l_flooderror;
+				$error_msg = $lang['Flood_Error'];
 			}
 		}
 	}
@@ -133,7 +133,7 @@ if(isset($HTTP_POST_VARS['submit']))
 		{
 			$error_msg .= "<br />";
 		}
-		$error_msg .= $l_emptysubj;
+		$error_msg .= $lang['Empty_subj'];
 	}
 
 	if(!empty($HTTP_POST_VARS['message']))
@@ -188,15 +188,15 @@ if(isset($HTTP_POST_VARS['submit']))
 		{
 			$error_msg .= "<br />";
 		}
-		$error_msg .= $l_emptymsg;
+		$error_msg .= $lang['Empty_msg'];
 	}
 }
 
 switch($mode)
 {
 	case 'newtopic':
-		$page_title = " $l_postnew";
-		$section_title = $l_postnewin;
+		$page_title = " ".$lang['Postnew'];
+		$section_title = $lang['Post_new_in'];
 
 		if(isset($HTTP_POST_VARS['submit']) && !$error)
 		{
author	James Atkinson <thefinn@users.sourceforge.net>	2001-05-28 20:23:16 +0000
committer	James Atkinson <thefinn@users.sourceforge.net>	2001-05-28 20:23:16 +0000
commit	943901d9160cf7aaf1b845ea00f61d7e6b1d4d6b (patch)
tree	43cd3f3a5ec5a9932db9ebd431a3a4114c96693d
parent	61d2ea4b290a47936a790b3ca2919b3272e46df9 (diff)
download	forums-943901d9160cf7aaf1b845ea00f61d7e6b1d4d6b.tar forums-943901d9160cf7aaf1b845ea00f61d7e6b1d4d6b.tar.gz forums-943901d9160cf7aaf1b845ea00f61d7e6b1d4d6b.tar.bz2 forums-943901d9160cf7aaf1b845ea00f61d7e6b1d4d6b.tar.xz forums-943901d9160cf7aaf1b845ea00f61d7e6b1d4d6b.zip