mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 07:08:09 +01:00
Code Issues Releases Wiki Activity

More language updates

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@1368 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-11-19 14:12:09 +00:00
parent 4f387057ca
commit 37daf8a717
7 changed files with 83 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/groupcp.php
View File

@ -689,7 +689,7 @@ else if( $group_id )
"L_PM" => $lang['Private_Message'],
"L_EMAIL" => $lang['Email'],
"L_WEBSITE" => $lang['Website'],
"L_FROM" => $lang['From'],
"L_FROM" => $lang['Location'],
"L_ORDER" => $lang['Order'],
"L_SORT" => $lang['Sort'],
"L_SUBMIT" => $lang['Sort'],

39
phpBB/includes/functions.php
View File

@ -773,48 +773,17 @@ function style_select($default_style, $select_name = "style", $dirname = "templa
//
function tz_select($default, $select_name = 'timezone')
{
global $sys_timezone;
global $sys_timezone, $lang;
if(!isset($default))
if( !isset($default) )
{
$default == $sys_timezone;
}
$tz_select = "<select name=\"$select_name\">";
$tz_array = array(
"-12" => "(GMT -12:00 hours) Eniwetok, Kwajalein",
"-11" => "(GMT -11:00 hours) Midway Island, Samoa",
"-10" => "(GMT -10:00 hours) Hawaii",
"-9" => "(GMT -9:00 hours) Alaska",
"-8" => "(GMT -8:00 hours) Pacific Time (US &amp; Canada)",
"-7" => "(GMT -7:00 hours) Mountain Time (US &amp; Canada)",
"-6" => "(GMT -6:00 hours) Central Time (US &amp; Canada), Mexico City",
"-5" => "(GMT -5:00 hours) Eastern Time (US &amp; Canada), Bogota, Lima, Quito",
"-4" => "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz",
"-3.5" => "(GMT -3:30 hours) Newfoundland",
"-3" => "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown",
"-2" => "(GMT -2:00 hours) Mid-Atlantic, Ascension Is., St. Helena, ",
"-1" => "(GMT -1:00 hours) Azores, Cape Verde Islands",
"0" => "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia",
"1" => "(GMT +1:00 hours) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome",
"2" => "(GMT +2:00 hours) Kaliningrad, South Africa, Warsaw",
"3" => "(GMT +3:00 hours) Baghdad, Riyadh, Moscow, Nairobi",
"3.5" => "(GMT +3:30 hours) Tehran",
"4" => "(GMT +4:00 hours) Abu Dhabi, Baku, Muscat, Tbilisi",
"4.5" => "(GMT +4:30 hours) Kabul",
"5" => "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent",
"5.5" => "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi",
"6" => "(GMT +6:00 hours) Almaty, Colombo, Dhaka",
"7" => "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta",
"8" => "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei",
"9" => "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk",
"9.5" => "(GMT +9:30 hours) Adelaide, Darwin",
"10" => "(GMT +10:00 hours) Melbourne, Papua New Guinea, Sydney, Vladivostok",
"11" => "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands",
"12" => "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island");
while( list($offset, $zone) = each($tz_array) )
while( list($offset, $zone) = each($lang['tz']) )
{
$selected = ($offset == $default) ? " selected=\"selected\"" : "";
$selected = ( $offset == $default ) ? " selected=\"selected\"" : "";
$tz_select .= "\t<option value=\"$offset\"$selected>$zone</option>";
}
$tz_select .= "</select>";

47
phpBB/language/lang_english/lang_main.php
View File

@ -37,6 +37,7 @@ $lang['DIRECTION'] = "LTR";
$lang['LEFT'] = "LEFT";
$lang['RIGHT'] = "RIGHT";
//
// Common, these terms are used
// extensively on several pages
@ -126,6 +127,7 @@ $lang['Guest_users_total'] = "%d Guests";
$lang['Guest_user_total'] = "%d Guests";
$lang['You_last_visit'] = "You last visited on %s"; // %s replaced by date/time
$lang['Search_new'] = "View posts since last visit";
$lang['Search_your_posts'] = "View your posts";
$lang['Search_unanswered'] = "View unanswered posts";
$lang['Register'] = "Register";
@ -217,6 +219,7 @@ $lang['Rules_vote_can'] = "You <b>can</b> vote in polls in this forum";
$lang['Rules_vote_cannot'] = "You <b>cannot</b> vote in polls in this forum";
$lang['Rules_moderate'] = "You <b>can</b> %smoderate this forum%s"; // %s replaced by a href links, do not remove!
//
// Viewtopic
//
@ -632,15 +635,18 @@ $lang['Subscribe'] = "Subscribe";
$lang['Unsubscribe'] = "Unsubscribe";
$lang['View_Information'] = "View Information";
//
// Search
//
$lang['Search_query'] = "Search Query";
$lang['Search_options'] = "Search Options";
$lang['Search_keywords'] = "Search for Keywords";
$lang['Search_keywords_explain'] = "You can use <u>AND</u> to define words which must be in the results, <u>OR</u> to define words which may be in the result and <u>NOT</u> to define words which should not be in the result. Use * as a wildcard for partial matches. To define a phrase enclose it within &quot;&quot;";
$lang['Search_author'] = "Search for Author";
$lang['Search_author_explain'] = "Use * as a wildcard for partial matches";
$lang['Search_for_any'] = "Search for any terms or use query as entered";
$lang['Search_for_all'] = "Search for all terms";
$lang['Search_author'] = "Search for Author";
@ -650,13 +656,14 @@ $lang['Search_previous'] = "Search previous"; // followed by days, weeks, months
$lang['Sort_by'] = "Sort by";
$lang['Display_results'] = "Display results as";
$lang['All'] = "All";
$lang['No_search_match'] = "No topics or posts met your search criteria";
$lang['found'] = "found"; // this precedes the number of matches found and follows Search
$lang['match'] = "Match"; // this and the following entry proceed the number of matches found
$lang['matches'] = "Matches";
$lang['Search_new'] = "View posts since last visit";
$lang['Found_search_match'] = "Search found %d match"; // eg. Search found 1 match
$lang['Found_search_matches'] = "Search found %d matches"; // eg. Search found 24 matches
$lang['Close_window'] = "Close Window";
//
// Auth related entries
//
@ -786,6 +793,38 @@ $lang['10'] = "EST (Australia)";
$lang['11'] = "GMT + 11 Hours";
$lang['12'] = "GMT + 12 Hours";
// These are displayed in the timezone select box
$lang['tz']['-12'] = "(GMT -12:00 hours) Eniwetok, Kwajalein";
$lang['tz']['-11'] = "(GMT -11:00 hours) Midway Island, Samoa";
$lang['tz']['10'] = "(GMT -10:00 hours) Hawaii";
$lang['tz']['-9'] = "(GMT -9:00 hours) Alaska";
$lang['tz']['-8'] = "(GMT -8:00 hours) Pacific Time (US &amp; Canada)";
$lang['tz']['-7'] = "(GMT -7:00 hours) Mountain Time (US &amp; Canada)";
$lang['tz']['-6'] = "(GMT -6:00 hours) Central Time (US &amp; Canada), Mexico City";
$lang['tz']['-5'] = "(GMT -5:00 hours) Eastern Time (US &amp; Canada), Bogota, Lima, Quito";
$lang['tz']['-4'] = "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz";
$lang['tz']['-3.5'] = "(GMT -3:30 hours) Newfoundland";
$lang['tz']['-3'] = "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown, Falkland Is";
$lang['tz']['-2'] = "(GMT -2:00 hours) Mid-Atlantic, Ascension Is., St. Helena";
$lang['tz']['-1'] = "(GMT -1:00 hours) Azores, Cape Verde Islands";
$lang['tz']['0'] = "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
$lang['tz']['1'] = "(GMT +1:00 hours) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome";
$lang['tz']['2'] = "(GMT +2:00 hours) Kaliningrad, South Africa, Warsaw";
$lang['tz']['3'] = "(GMT +3:00 hours) Baghdad, Riyadh, Moscow, Nairobi";
$lang['tz']['3.5'] = "(GMT +3:30 hours) Tehran";
$lang['tz']['4'] = "(GMT +4:00 hours) Abu Dhabi, Baku, Muscat, Tbilisi";
$lang['tz']['4.5'] = "(GMT +4:30 hours) Kabul";
$lang['tz']['5'] = "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent";
$lang['tz']['5.5'] = "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi";
$lang['tz']['6'] = "(GMT +6:00 hours) Almaty, Colombo, Dhaka";
$lang['tz']['7'] = "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta";
$lang['tz']['8'] = "(GMT +8:00 hours) Beijing, Hong Kong, Perth, Singapore, Taipei";
$lang['tz']['9'] = "(GMT +9:00 hours) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
$lang['tz']['9.5'] = "(GMT +9:30 hours) Adelaide, Darwin";
$lang['tz']['10'] = "(GMT +10:00 hours) Melbourne, Papua New Guinea, Sydney, Vladivostok";
$lang['tz']['11'] = "(GMT +11:00 hours) Magadan, New Caledonia, Solomon Islands";
$lang['tz']['12'] = "(GMT +12:00 hours) Auckland, Wellington, Fiji, Marshall Island";
//
// Errors (not related to a

37
phpBB/search.php
View File

@ -738,11 +738,10 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
);
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
$template->assign_vars(array(
"SEARCH_MATCHES" => $total_match_count,
$l_search_matches = ( $total_match_count == 1 ) ? sprintf($lang['Found_search_match'], $total_match_count) : sprintf($lang['Found_search_matches'], $total_match_count);
"L_FOUND" => $lang['found'],
"L_MATCHES" => (count($searchset) == 1) ? $lang['match'] : $lang['matches'],
$template->assign_vars(array(
"L_SEARCH_MATCHES" => $l_search_matches,
"L_TOPIC" => $lang['Topic'])
);
@ -958,6 +957,9 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
{
$topic_type = $lang['Topic_Moved'] . " ";
$topic_id = $searchset[$i]['topic_moved_id'];
$folder_image = "<img src=\"" . $images['folder'] . "\" alt=\"" . $lang['No_new_posts'] . "\" />";
$newest_post_img = "";
}
else
{
@ -993,30 +995,35 @@ else if( $query_keywords != "" || $query_author != "" || $search_id )
if( empty($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) && $searchset[$i]['post_time'] > $userdata['session_last_visit'] )
{
$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />";
$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> ";
}
else
{
if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) )
{
$folder_image = ($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $searchset[$i]['post_time'] ) ? "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />" : "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />";
if( $HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $searchset[$i]['post_time'] )
{
$folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />";
$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> ";
}
else
{
$folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" />";
$newest_post_img = "";
}
}
else
{
$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" />";
$newest_post_img = "";
}
}
}
if( $searchset[$i]['post_time'] >= $userdata['session_last_visit'] )
{
$newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> ";
}
else
{
$newest_post_img = "";
}
$topic_poster = $searchset[$i]['username'];
$last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);

2
phpBB/templates/subSilver/privmsgs_body.tpl
View File

@ -64,7 +64,7 @@
<td align="right" nowrap="nowrap"><span class="gensmall">{L_DISPLAY_MESSAGES}:
<select name="msgdays">{S_MSG_DAYS_OPTIONS}
</select>
<input type="submit" value="Go" name="submit_msgdays" class="liteoption" />
<input type="submit" value="{L_GO}" name="submit_msgdays" class="liteoption" />
</span></td>
</tr>
</table>

10
phpBB/templates/subSilver/search_results_posts.tpl
View File

@ -1,17 +1,17 @@
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="left" valign="bottom" colspan="3"><span class="maintitle">{L_SEARCH}
- {SEARCH_MATCHES} Matches</span><br />
</td>
<td align="left" valign="bottom"><span class="maintitle">{L_SEARCH_MATCHES}</span><br /></td>
</tr>
</table>
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
</tr>
</table>
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center">
<tr>
<th width="22%" height="25" class="thCornerL">{L_AUTHOR}</th>
<th class="thCornerR">{L_MESSAGE}</th>
@ -37,12 +37,14 @@
<td class="catBottom" colspan="2" height="28" align="center">&nbsp; </td>
</tr>
</table>
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
<td align="left" valign="top"><span class="nav">{PAGE_NUMBER}</span></td>
<td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><br /><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
</table>
<table width="100%" cellspacing="2" border="0" align="center">
<tr>
<td valign="top" align="right">{JUMPBOX}</td>

10
phpBB/templates/subSilver/search_results_topics.tpl
View File

@ -1,17 +1,17 @@
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="left" valign="bottom" colspan="3"><span class="maintitle">{L_SEARCH}
- {SEARCH_MATCHES} Matches</span><br />
</td>
<td align="left" valign="bottom"><span class="maintitle">{L_SEARCH_MATCHES}</span><br /></td>
</tr>
</table>
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
</tr>
</table>
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center">
<tr>
<th width="4%" height="25" class="thCornerL">&nbsp;</th>
<th class="thTop">&nbsp;{L_FORUM}&nbsp;</th>
@ -41,12 +41,14 @@
<td class="catBottom" colspan="7" height="28" valign="middle">&nbsp; </td>
</tr>
</table>
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
<td align="left" valign="top"><span class="nav">{PAGE_NUMBER}</span></td>
<td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><br /><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
</table>
<table width="100%" cellspacing="2" border="0" align="center">
<tr>
<td valign="top" align="right">{JUMPBOX}</td>