diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-17 14:30:08 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-17 14:30:08 +0000 |
| commit | 0199a23afdafb33d48635d0a1a6025044f1ad404 (patch) | |
| tree | 6b5de84ff9b45ef09a0c0e3251943cc8f9bde470 /phpBB | |
| parent | 931fd9d64293ebd1dc48aeef25039ce50251aec8 (diff) | |
| download | forums-0199a23afdafb33d48635d0a1a6025044f1ad404.tar forums-0199a23afdafb33d48635d0a1a6025044f1ad404.tar.gz forums-0199a23afdafb33d48635d0a1a6025044f1ad404.tar.bz2 forums-0199a23afdafb33d48635d0a1a6025044f1ad404.tar.xz forums-0199a23afdafb33d48635d0a1a6025044f1ad404.zip | |
Changed page timezone output to lang file based var setup
git-svn-id: file:///svn/phpbb/trunk@684 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/page_header.php | 34 | ||||
| -rwxr-xr-x | phpBB/language/lang_english.php | 38 |
2 files changed, 39 insertions, 33 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index e7a676ba2f..c3a50efa78 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -83,22 +83,6 @@ $l_last_visit = $lang['You_last_visit']; $s_last_visit = create_date($board_config['default_dateformat'], $userdata['session_last_visit'], $board_config['default_timezone']); // -// Do timezone text output -// -if($board_config['default_timezone'] < 0) -{ - $s_timezone = $lang['All_times'] . " " .$lang['GMT'] . " - " . (-$board_config['default_timezone']) . " " . $lang['Hours']; -} -else if($board_config['default_timezone'] == 0) -{ - $s_timezone = $lang['All_times'] . " " . $lang['GMT']; -} -else -{ - $s_timezone = $lang['All_times'] . " " . $lang['GMT'] ." + " . $board_config['default_timezone'] . " " . $lang['Hours']; -} - -// // Get basic (usernames + totals) online // situation // @@ -181,11 +165,9 @@ else } // -// The following assigns all _common_ -// variables that may be used at any point -// in a template. Note that all URL's should -// be wrapped in append_sid, as should all -// S_x_ACTIONS for forms. +// The following assigns all _common_ variables that may be used at any point +// in a template. Note that all URL's should be wrapped in append_sid, as +// should all S_x_ACTIONS for forms. // $template->assign_vars(array( "SITENAME" => $board_config['sitename'], @@ -215,14 +197,6 @@ $template->assign_vars(array( "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'], @@ -247,7 +221,7 @@ $template->assign_vars(array( "U_MEMBERSLIST" => append_sid("memberlist.".$phpEx), "U_GROUP_CP" => append_sid("groupcp.".$phpEx), - "S_TIMEZONE" => $s_timezone, + "S_TIMEZONE" => $lang['All_times'] . " " . $lang[$board_config['default_timezone']], "S_LOGIN_ACTION" => append_sid("login.$phpEx"), "S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"), "S_LAST_VISIT_DATE" => $s_last_visit, diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index 3248628f91..76ad8f7741 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -73,9 +73,6 @@ $lang['Months'] = "Months"; $lang['Year'] = "Year"; $lang['Years'] = "Years"; -$lang['All_times'] = "All times are"; // This is followed by GMT and the timezone offset -$lang['GMT'] = "GMT"; - $lang['Next'] = "Next"; $lang['Previous'] = "Previous"; $lang['Goto_page'] = "Goto page"; @@ -509,6 +506,41 @@ $lang['Split_after'] = "Split Posts Beyond Selected"; $lang['Topic_split'] = "The selected topic has been split successfully"; $lang['Too_many_error'] = "You have selected too many posts. You can only select one post to split a topic after!"; +// +// Timezones ... for display on each page +// +$lang['All_times'] = "All times are"; // This is followed by GMT and the timezone offset + +$lang[-12] = "GMT - 12" . " " . $lang['Hours']; +$lang[-11] = "GMT - 11" . " " . $lang['Hours']; +$lang[-10] = "HST (Hawaii)"; +$lang[-9] = "GMT - 9" . " " . $lang['Hours']; +$lang[-8] = "PST (U.S./Canada)"; +$lang[-7] = "MST (U.S./Canada)"; +$lang[-6] = "CST (U.S./Canada)"; +$lang[-5] = "EST (U.S./Canada)"; +$lang[-4] = "GMT - 4" . " " . $lang['Hours']; +$lang[-3.5] = "GMT - 3.5" . " " . $lang['Hours']; +$lang[-3] = "GMT - 3" . " " . $lang['Hours']; +$lang[-2] = "Mid-Atlantic"; +$lang[-1] = "GMT - 1" . " " . $lang['Hour']; +$lang[0] = "GMT"; +$lang[1] = "CET (Europe)"; +$lang[2] = "EET (Europe)"; +$lang[3] = "GMT + 3" . " " . $lang['Hours']; +$lang[3.5] = "GMT + 3.5" . " " . $lang['Hours']; +$lang[4] = "GMT + 4" . " " . $lang['Hours']; +$lang[4.5] = "GMT + 4.5" . " " . $lang['Hours']; +$lang[5] = "GMT + 5" . " " . $lang['Hours']; +$lang[5.5] = "GMT + 5.5" . " " . $lang['Hours']; +$lang[6] = "GMT + 6" . " " . $lang['Hours']; +$lang[7] = "GMT + 7" . " " . $lang['Hours']; +$lang[8] = "WST (Australia)"; +$lang[9] = "GMT + 9" . " " . $lang['Hours']; +$lang[9.5] = "CST (Australia)"; +$lang[10] = "EST (Australia)"; +$lang[11] = "GMT + 11" . " " . $lang['Hours']; +$lang[12] = "GMT + 12" . " " . $lang['Hours']; // // Old format ... _DON'T_add_any_ new entries here!! |