diff --git a/upload/includes/page_header.php b/upload/includes/page_header.php index fb30f8cf8..77183659c 100644 --- a/upload/includes/page_header.php +++ b/upload/includes/page_header.php @@ -190,7 +190,7 @@ $template->assign_vars(array( 'FULL_URL' => FULL_URL, 'CURRENT_TIME' => sprintf($lang['CURRENT_TIME'], bb_date(TIMENOW, $bb_cfg['last_visit_date_format'], false)), - 'S_TIMEZONE' => sprintf($lang['ALL_TIMES'], $lang[''.str_replace(',', '.', floatval($bb_cfg['board_timezone'])).'']), + 'S_TIMEZONE' => preg_replace('/\(.*?\)/', '', sprintf($lang['ALL_TIMES'], $lang['TZ'][str_replace(',', '.', floatval($bb_cfg['board_timezone']))])), 'PM_INFO' => $pm_info, 'PRIVMSG_IMG' => $icon_pm, diff --git a/upload/language/en/main.php b/upload/language/en/main.php index 5d1cb75db..e4601652f 100644 --- a/upload/language/en/main.php +++ b/upload/language/en/main.php @@ -902,40 +902,7 @@ $lang['LOOKUP_IP'] = 'Look up IP address'; // // Timezones ... for display on each page // -$lang['ALL_TIMES'] = 'All times are %s'; // eg. All times are UTC - 12 Hours (times from next block) - -$lang['-12'] = 'UTC - 12'; -$lang['-11'] = 'UTC - 11'; -$lang['-10'] = 'UTC - 10'; -$lang['-9'] = 'UTC - 9'; -$lang['-8'] = 'UTC - 8'; -$lang['-7'] = 'UTC - 7'; -$lang['-6'] = 'UTC - 6'; -$lang['-5'] = 'UTC - 5'; -$lang['-4'] = 'UTC - 4'; -$lang['-3.5'] = 'UTC - 3.5'; -$lang['-3'] = 'UTC - 3'; -$lang['-2'] = 'UTC - 2'; -$lang['-1'] = 'UTC - 1'; -$lang['0'] = 'UTC ± 0'; -$lang['1'] = 'UTC + 1'; -$lang['2'] = 'UTC + 2'; -$lang['3'] = 'UTC + 3'; -$lang['3.5'] = 'UTC + 3.5'; -$lang['4'] = 'UTC + 4'; -$lang['4.5'] = 'UTC + 4.5'; -$lang['5'] = 'UTC + 5'; -$lang['5.5'] = 'UTC + 5.5'; -$lang['6'] = 'UTC + 6'; -$lang['6.5'] = 'UTC + 6.5'; -$lang['7'] = 'UTC + 7'; -$lang['8'] = 'UTC + 8'; -$lang['9'] = 'UTC + 9'; -$lang['9.5'] = 'UTC + 9.5'; -$lang['10'] = 'UTC + 10'; -$lang['11'] = 'UTC + 11'; -$lang['12'] = 'UTC + 12'; -$lang['13'] = 'UTC + 13'; +$lang['ALL_TIMES'] = 'All times are %s'; // This is followed by UTC and the timezone offset // These are displayed in the timezone select box $lang['TZ']['-12'] = 'UTC - 12'; diff --git a/upload/language/ru/main.php b/upload/language/ru/main.php index 0a19d4f7f..6c72b05c4 100644 --- a/upload/language/ru/main.php +++ b/upload/language/ru/main.php @@ -904,39 +904,6 @@ $lang['LOOKUP_IP'] = 'Посмотреть хост для IP'; // $lang['ALL_TIMES'] = 'Часовой пояс: %s'; // This is followed by UTC and the timezone offset -$lang['-12'] = 'UTC - 12'; -$lang['-11'] = 'UTC - 11'; -$lang['-10'] = 'UTC - 10'; -$lang['-9'] = 'UTC - 9'; -$lang['-8'] = 'UTC - 8'; -$lang['-7'] = 'UTC - 7'; -$lang['-6'] = 'UTC - 6'; -$lang['-5'] = 'UTC - 5'; -$lang['-4'] = 'UTC - 4'; -$lang['-3.5'] = 'UTC - 3:30'; -$lang['-3'] = 'UTC - 3'; -$lang['-2'] = 'UTC - 2'; -$lang['-1'] = 'UTC - 1'; -$lang['0'] = 'UTC ± 0'; -$lang['1'] = 'UTC + 1'; -$lang['2'] = 'UTC + 2'; -$lang['3'] = 'UTC + 3'; -$lang['3.5'] = 'UTC + 3:30'; -$lang['4'] = 'UTC + 4'; -$lang['4.5'] = 'UTC + 4:30'; -$lang['5'] = 'UTC + 5'; -$lang['5.5'] = 'UTC + 5:30'; -$lang['6'] = 'UTC + 6'; -$lang['6.5'] = 'UTC + 6:30'; -$lang['7'] = 'UTC + 7'; -$lang['8'] = 'UTC + 8'; -$lang['9'] = 'UTC + 9'; -$lang['9.5'] = 'UTC + 9:30'; -$lang['10'] = 'UTC + 10'; -$lang['11'] = 'UTC + 11'; -$lang['12'] = 'UTC + 12'; -$lang['13'] = 'UTC + 13'; - // это для выпадающего меню, раньше тут еще были города $lang['TZ']['-12'] = 'UTC - 12'; $lang['TZ']['-11'] = 'UTC - 11'; diff --git a/upload/language/ua/main.php b/upload/language/ua/main.php index 966e2cfcb..cb36b1801 100644 --- a/upload/language/ua/main.php +++ b/upload/language/ua/main.php @@ -904,39 +904,6 @@ $lang['LOOKUP_IP'] = 'Показати хост для IP'; // $lang['ALL_TIMES'] = 'Часовий пояс: %s'; // This is followed by UTC and the timezone offset -$lang['-12'] = 'UTC - 12'; -$lang['-11'] = 'UTC - 11'; -$lang['-10'] = 'UTC - 10'; -$lang['-9'] = 'UTC - 9'; -$lang['-8'] = 'UTC - 8'; -$lang['-7'] = 'UTC - 7'; -$lang['-6'] = 'UTC - 6'; -$lang['-5'] = 'UTC - 5'; -$lang['-4'] = 'UTC - 4'; -$lang['-3.5'] = 'UTC - 3:30'; -$lang['-3'] = 'UTC - 3'; -$lang['-2'] = 'UTC - 2'; -$lang['-1'] = 'UTC - 1'; -$lang['0'] = 'UTC ± 0'; -$lang['1'] = 'UTC + 1'; -$lang['2'] = 'UTC + 2'; -$lang['3'] = 'UTC + 3'; -$lang['3.5'] = 'UTC + 3:30'; -$lang['4'] = 'UTC + 4'; -$lang['4.5'] = 'UTC + 4:30'; -$lang['5'] = 'UTC + 5'; -$lang['5.5'] = 'UTC + 5:30'; -$lang['6'] = 'UTC + 6'; -$lang['6.5'] = 'UTC + 6:30'; -$lang['7'] = 'UTC + 7'; -$lang['8'] = 'UTC + 8'; -$lang['9'] = 'UTC + 9'; -$lang['9.5'] = 'UTC + 9:30'; -$lang['10'] = 'UTC + 10'; -$lang['11'] = 'UTC + 11'; -$lang['12'] = 'UTC + 12'; -$lang['13'] = 'UTC + 13'; - // це для випадного меню, раніше тут ще були міста $lang['TZ']['-12'] = 'UTC - 12'; $lang['TZ']['-11'] = 'UTC - 11';