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

[feature/new-tz-handling] Remove additional marking of selected items

Browse source 
PHPBB3-9558
This commit is contained in:
Joas Schilling 2012-07-18 18:59:25 +02:00
parent 14a07b1193
commit 81627e2888
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions.php
View file

@ -1207,7 +1207,7 @@ function phpbb_timezone_select($default = '', $truncate = false)
$opt_group = $timezone['offest']; $opt_group = $timezone['offest'];
$selected = ($default_offset == $timezone['offest']) ? ' selected="selected"' : ''; $selected = ($default_offset == $timezone['offest']) ? ' selected="selected"' : '';
$tz_dates .= '<option value="' . $timezone['offest'] . ' - ' . $timezone['current'] . '"' . $selected . '>' . $timezone['offest'] . ' - ' . $timezone['current'] . ($selected ? ' ' . $user->lang['TIMEZONE_SELECTED'] : '') . '</option>'; $tz_dates .= '<option value="' . $timezone['offest'] . ' - ' . $timezone['current'] . '"' . $selected . '>' . $timezone['offest'] . ' - ' . $timezone['current'] . '</option>';
} }
if (isset($user->lang['timezones'][$timezone['tz']])) if (isset($user->lang['timezones'][$timezone['tz']]))
@ -1229,7 +1229,7 @@ function phpbb_timezone_select($default = '', $truncate = false)
} }
$selected = ($timezone['tz'] === $default) ? ' selected="selected"' : ''; $selected = ($timezone['tz'] === $default) ? ' selected="selected"' : '';
$tz_select .= '<option title="' . $title . '" value="' . $timezone['tz'] . '"' . $selected . '>' . $label . ($selected ? ' ' . $user->lang['TIMEZONE_SELECTED'] : '') . '</option>'; $tz_select .= '<option title="' . $title . '" value="' . $timezone['tz'] . '"' . $selected . '>' . $label . '</option>';
} }
$tz_select .= '</optgroup>'; $tz_select .= '</optgroup>';

1
phpBB/language/en/ucp.php
View file

@ -431,7 +431,6 @@ $lang = array_merge($lang, array(
'TIMEZONE' => 'Timezone', 'TIMEZONE' => 'Timezone',
'TIMEZONE_DATE_SUGGESTION' => 'Suggestion: %s', 'TIMEZONE_DATE_SUGGESTION' => 'Suggestion: %s',
'TIMEZONE_INVALID' => 'The timezone you selected is invalid.', 'TIMEZONE_INVALID' => 'The timezone you selected is invalid.',
'TIMEZONE_SELECTED' => '(currently selected)',
'TO' => 'To', 'TO' => 'To',
'TOO_MANY_RECIPIENTS' => 'You tried to send a private message to too many recipients.', 'TOO_MANY_RECIPIENTS' => 'You tried to send a private message to too many recipients.',
'TOO_MANY_REGISTERS' => 'You have exceeded the maximum number of registration attempts for this session. Please try again later.', 'TOO_MANY_REGISTERS' => 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',