diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-03 21:49:01 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-11-03 21:49:01 +0000 |
| commit | 68795b03d5f29d0851cac3bd3688f5479ac7c171 (patch) | |
| tree | c302c85752feb4423b36bb72ec8e2b84f1640dde /phpBB/includes | |
| parent | cf8456ab61908746c937d565462939126d23c339 (diff) | |
| download | forums-68795b03d5f29d0851cac3bd3688f5479ac7c171.tar forums-68795b03d5f29d0851cac3bd3688f5479ac7c171.tar.gz forums-68795b03d5f29d0851cac3bd3688f5479ac7c171.tar.bz2 forums-68795b03d5f29d0851cac3bd3688f5479ac7c171.tar.xz forums-68795b03d5f29d0851cac3bd3688f5479ac7c171.zip | |
Fixed bug #477831 + some minor alterations
git-svn-id: file:///svn/phpbb/trunk@1270 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 32 | ||||
| -rw-r--r-- | phpBB/includes/page_header.php | 4 |
2 files changed, 19 insertions, 17 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 237bd48982..af7ecf716c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -786,22 +786,22 @@ function tz_select($default, $select_name = 'timezone') "-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"); + "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) ) { diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index b0310be5ea..c6173792c2 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -75,7 +75,7 @@ else if($userdata['session_logged_in']) { $u_login_logout = "login.$phpEx?logout=true"; - $l_login_logout = $lang['Logout'] . " : " . $userdata["username"] . ""; + $l_login_logout = $lang['Logout'] . " [ " . $userdata["username"] . " ]"; } else { @@ -245,6 +245,8 @@ $template->assign_vars(array( "S_CONTENT_DIRECTION" => $lang['DIRECTION'], "S_CONTENT_ENCODING" => $lang['ENCODING'], + "S_CONTENT_DIR_LEFT" => $lang['LEFT'], + "S_CONTENT_DIR_RIGHT" => $lang['RIGHT'], "S_TIMEZONE" => $lang['All_times'] . " " . $lang[$board_config['board_timezone']], "S_LOGIN_ACTION" => append_sid("login.$phpEx"), "S_CURRENT_TIME" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']), |