mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-28 12:30:42 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'nickvergessen/ticket/11974' into develop

Browse Source 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11974:
  [ticket/11974] Fix timezone names with underscores
  [ticket/11974] Translate all timezones
This commit is contained in:
Dhruv
2013-10-30 22:43:25 +05:30
parent 2f1cf0d287 ce487aad09
commit a9524d6e08
2 changed files with 436 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/includes/functions.php
View File

@@ -1318,18 +1318,12 @@ function phpbb_timezone_select($user, $default = '', $truncate = false)
$tz_dates .= '<option value="' . $timezone['offest'] . ' - ' . $timezone['current'] . '"' . $selected . '>' . $timezone['offest'] . ' - ' . $timezone['current'] . '</option>';
}
if (isset($user->lang['timezones'][$timezone['tz']]))
$label = $timezone['tz'];
if (isset($user->lang['timezones'][$label]))
{
$title = $label = $user->lang['timezones'][$timezone['tz']];
}
else
{
// No label, we'll figure one out
$bits = explode('/', str_replace('_', ' ', $timezone['tz']));
$label = implode(' - ', $bits);
$title = $timezone['offest'] . ' - ' . $label;
$label = $user->lang['timezones'][$label];
}
$title = $timezone['offest'] . ' - ' . $label;
if ($truncate)
{