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

Did some work converting lang file stuff to new format

Browse source 
git-svn-id: file:///svn/phpbb/trunk@366 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
James Atkinson 2001-05-28 20:23:16 +00:00
parent 61d2ea4b29
commit 943901d916
5 changed files with 102 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
phpBB/includes/page_header.php
View file

@ -102,10 +102,10 @@ for($i = 0; $i < $logged_online; $i++)
$userlist .= ($i < $logged_online - 2) ? ", " : ""; $userlist .= ($i < $logged_online - 2) ? ", " : "";
} }
$l_r_user_s = ($logged_online == 1) ? $l_user : $l_users; $l_r_user_s = ($logged_online == 1) ? $lang['User'] : $lang['Users'];
$l_g_user_s = ($guests_online == 1) ? $l_user : $l_users; $l_g_user_s = ($guests_online == 1) ? $lang['User'] : $lang['Users'];
$l_is_are = ($logged_online == 1) ? $l_is : $l_are; $l_is_are = ($logged_online == 1) ? $lang['is'] : $lang['are'];
$userlist = ($logged_online > 0) ? "$l_Registered $l_r_user_s: " . $userlist : "$l_Registered $l_r_user_s: $l_None"; $userlist = ($logged_online > 0) ? $lang['Registered'] ." $l_r_user_s: " . $userlist : $lang['Registered'] . " $l_r_user_s: ".$lang['None'];
// //
// The following assigns all _common_ // 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", "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, "LOGGED_IN_USER_LIST" => $userlist,
"L_USERNAME" => $l_username, "L_USERNAME" => $lang['Username'],
"L_PASSWORD" => $l_password, "L_PASSWORD" => $lang['Password'],
"L_LOGIN" => $l_login, "L_LOGIN" => $lang['Login'],
"L_LOG_ME_IN" => $l_log_me_in, "L_LOG_ME_IN" => $lang['Log_me_in'],
"L_WELCOMETO" => $l_welcometo, "L_WELCOMETO" => $lang['Welcome_to'],
"L_INDEX" => $l_indextitle, "L_INDEX" => $lang['Forum_Index'],
"L_REGISTER" => $l_register, "L_REGISTER" => $lang['Register'],
"L_PROFILE" => $l_profile, "L_PROFILE" => $lang['Profile'],
"L_SEARCH" => $l_search, "L_SEARCH" => $lang['Search'],
"L_PRIVATEMSGS" => $l_privmsgs, "L_PRIVATEMSGS" => $lang['Private_msgs'],
"L_MEMBERLIST" => $l_memberslist, "L_MEMBERLIST" => $lang['Memberlist'],
"L_FAQ" => $l_faq, "L_FAQ" => $lang['FAQ'],
"L_FORUM" => $l_forum, "L_FORUM" => $lang['Forum'],
"L_TOPICS" => $l_topics, "L_TOPICS" => $lang['Topics'],
"L_REPLIES" => $l_replies, "L_REPLIES" => $lang['Replies'],
"L_VIEWS" => $l_views, "L_VIEWS" => $lang['Views'],
"L_POSTS" => $l_posts, "L_POSTS" => $lang['Posts'],
"L_LASTPOST" => $l_lastpost, "L_LASTPOST" => $lang['Last_Post'],
"L_MODERATOR" => $l_moderator, "L_MODERATOR" => $lang['Moderator'],
"L_MESSAGES" => $l_messages, "L_MESSAGES" => $lang['Messages'],
"L_POSTEDTOTAL" => $l_postedtotal, "L_POSTEDTOTAL" => $lang['Posted_Total'],
"L_WEHAVE" => $l_wehave, "L_WEHAVE" => $lang['We_have'],
"L_REGUSERS" => $l_regedusers, "L_REGUSERS" => $lang['Regedusers'],
"L_NEWESTUSER" => $l_newestuser, "L_NEWESTUSER" => $lang['newestuser'],
"L_BROWSING" => $l_browsing, "L_BROWSING" => $lang['browsing'],
"L_ARECURRENTLY" => $l_arecurrently, "L_ARECURRENTLY" => $lang['arecurrently'],
"L_THEFORUMS" => $l_theforums, "L_THEFORUMS" => $lang['theforums'],
"L_NONEWPOSTS" => $l_nonewposts, "L_NONEWPOSTS" => $lang['No_new_posts'],
"L_NEWPOSTS" => $l_newposts, "L_NEWPOSTS" => $lang['New_posts'],
"L_POSTED" => $l_posted, "L_POSTED" => $lang['Posted'],
"L_JOINED" => $l_joined, "L_JOINED" => $lang['Joined'],
"L_AUTO_LOGIN" => $l_autologin, "L_AUTO_LOGIN" => $lang['Log_me_in'],
"L_AUTHOR" => $l_author, "L_AUTHOR" => $lang['Author'],
"L_MESSAGE" => $l_message, "L_MESSAGE" => $lang['Message'],
"L_BY" => $l_by, "L_BY" => $lang['by'],
"L_LOGIN_LOGOUT" => $l_login_logout, "L_LOGIN_LOGOUT" => $l_login_logout,
"U_INDEX" => append_sid("index.".$phpEx), "U_INDEX" => append_sid("index.".$phpEx),

54
phpBB/language/lang_english.php
View file

@ -39,15 +39,22 @@ $lang['Topic'] = "Topic";
$lang['Topics'] = "Topics"; $lang['Topics'] = "Topics";
$lang['Reply'] = "Reply"; $lang['Reply'] = "Reply";
$lang['Replies'] = "Replies"; $lang['Replies'] = "Replies";
$lang['Views'] = "Views";
$lang['Post'] = "Post"; $lang['Post'] = "Post";
$lang['Posts'] = "Posts"; $lang['Posts'] = "Posts";
$lang['Posted'] = "Posted";
$lang['Message'] = "Message"; $lang['Message'] = "Message";
$lang['Messages'] = "Messages"; $lang['Messages'] = "Messages";
$lang['User'] = "User"; $lang['User'] = "User";
$lang['Users'] = "Users"; $lang['Users'] = "Users";
$lang['Username'] = "Username";
$lang['Password'] = "Password";
$lang['Email'] = "Email";
$lang['Poster'] = "Poster"; $lang['Poster'] = "Poster";
$lang['Author'] = "Author"; $lang['Author'] = "Author";
$lang['is'] = "is";
$lang['are'] = "are";
$lang['by'] = "by";
$lang['All_Topics'] = "All Topics"; $lang['All_Topics'] = "All Topics";
$lang['Hour'] = "Hour"; $lang['Hour'] = "Hour";
$lang['Hours'] = "Hours"; $lang['Hours'] = "Hours";
@ -67,6 +74,36 @@ $lang['Goto_page'] = "Goto page";
$lang['Page'] = "Page"; // Followed by the current page number then 'of x' where x is total pages $lang['Page'] = "Page"; // Followed by the current page number then 'of x' where x is total pages
$lang['of'] = "of"; // See Page above $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 // 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_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['You_are_not_logged_in'] = "You are not logged in";
$lang['Forgotten_password'] = "I forgot my password"; $lang['Forgotten_password'] = "I forgot my password";
$lang['Log_me_in'] = "Log me on automatically each visit";
// //
// Index page // Index page
// //
$lang['No_Posts'] = "No Posts"; $lang['No_Posts'] = "No Posts";
$lang['Forum_Index'] = "Forum Index";
// //
// Viewforum // Viewforum
// //
@ -93,6 +131,12 @@ $lang['No_Posts'] = "No Posts";
// Posting/Replying (Not private // Posting/Replying (Not private
// messaging!) // 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 // Private Messageing <= Should be blank for now
@ -101,10 +145,14 @@ $lang['No_Posts'] = "No Posts";
// //
// Profiles/Registration // Profiles/Registration
// //
$lang['Website'] = "Web Site";
$lang['From'] = "From";
// //
// Memberslist // Memberslist
// //
$lang['Top10'] = "Top 10 Posters";
$lang['Alphabetical'] = "Sorta Alphabetical";
// //
// Search <= Should be blank for now // Search <= Should be blank for now
@ -320,7 +368,7 @@ $l_memberslist = "Memberslist";
$l_faq = "FAQ"; $l_faq = "FAQ";
$l_privmsgs = "Private $l_messages"; $l_privmsgs = "Private $l_messages";
$l_sendpmsg = "Send a Private Message"; $l_sendpmsg = "Send a Private Message";
$l_postedtotal = "Our users have posted a total of"; $l_postedtotal =
$l_wehave = "We have"; $l_wehave = "We have";
$l_regedusers = "registered users."; $l_regedusers = "registered users.";
$l_newestuser = "The newest Registered User is"; $l_newestuser = "The newest Registered User is";

2
phpBB/login.php
View file

@ -131,7 +131,7 @@ else
$username = ($userdata['user_id'] != ANONYMOUS) ? $userdata['username'] : ""; $username = ($userdata['user_id'] != ANONYMOUS) ? $userdata['username'] : "";
$template->assign_vars(array( $template->assign_vars(array(
"L_SEND_PASSWORD" => $l_resend_password, "L_SEND_PASSWORD" => $lang['Forgotten_password'],
"FORWARD_PAGE" => $forward_page, "FORWARD_PAGE" => $forward_page,
"USERNAME" => $username, "USERNAME" => $username,

12
phpBB/memberlist.php
View file

@ -22,7 +22,7 @@ include('extension.inc');
include('common.'.$phpEx); include('common.'.$phpEx);
$pagetype = "memberlist"; $pagetype = "memberlist";
$page_title = $l_memberslist; $page_title = $lang['Memberlist'];
// //
// Start session management // Start session management
@ -105,11 +105,11 @@ if(($selected_members = $db->sql_numrows($result)) > 0)
$template->assign_vars(array( $template->assign_vars(array(
"U_VIEW_TOP10" => append_sid("memberlist.$phpEx?mode=topten"), "U_VIEW_TOP10" => append_sid("memberlist.$phpEx?mode=topten"),
"U_SORTALPHA" => append_sid("memberlist.$phpEx?mode=alpha"), "U_SORTALPHA" => append_sid("memberlist.$phpEx?mode=alpha"),
"L_VIEW_TOP10" => $l_top10, "L_VIEW_TOP10" => $lang['Top10'],
"L_SORTALPHA" => $l_alpha, "L_SORTALPHA" => $lang['Alphabetical'],
"L_EMAIL" => $l_email, "L_EMAIL" => $lang['Email'],
"L_WEBSITE" => $l_website, "L_WEBSITE" => $lang['Website'],
"L_FROM" => $l_from)); "L_FROM" => $lang['From']));
$members = $db->sql_fetchrowset($result); $members = $db->sql_fetchrowset($result);

10
phpBB/posting.php
View file

@ -117,7 +117,7 @@ if(isset($HTTP_POST_VARS['submit']))
if(($current_time - $last_post_time) < $board_config['flood_interval']) if(($current_time - $last_post_time) < $board_config['flood_interval'])
{ {
$error = TRUE; $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 .= "<br />";
} }
$error_msg .= $l_emptysubj; $error_msg .= $lang['Empty_subj'];
} }
if(!empty($HTTP_POST_VARS['message'])) if(!empty($HTTP_POST_VARS['message']))
@ -188,15 +188,15 @@ if(isset($HTTP_POST_VARS['submit']))
{ {
$error_msg .= "<br />"; $error_msg .= "<br />";
} }
$error_msg .= $l_emptymsg; $error_msg .= $lang['Empty_msg'];
} }
} }
switch($mode) switch($mode)
{ {
case 'newtopic': case 'newtopic':
$page_title = " $l_postnew"; $page_title = " ".$lang['Postnew'];
$section_title = $l_postnewin; $section_title = $lang['Post_new_in'];
if(isset($HTTP_POST_VARS['submit']) && !$error) if(isset($HTTP_POST_VARS['submit']) && !$error)
{ {