diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-10-30 22:43:25 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-10-30 22:43:25 +0530 |
| commit | a9524d6e08d67a1388412f87a69abeec8a0585c6 (patch) | |
| tree | 7aabfd0f5cf73eaa7e456c2a5ed8e15ae4e8da1d /phpBB/includes | |
| parent | 2f1cf0d287f416f1c3b388d5d3e68d897f226aaf (diff) | |
| parent | ce487aad09a617a66f5e92fa64deacbc3ff76e51 (diff) | |
| download | forums-a9524d6e08d67a1388412f87a69abeec8a0585c6.tar forums-a9524d6e08d67a1388412f87a69abeec8a0585c6.tar.gz forums-a9524d6e08d67a1388412f87a69abeec8a0585c6.tar.bz2 forums-a9524d6e08d67a1388412f87a69abeec8a0585c6.tar.xz forums-a9524d6e08d67a1388412f87a69abeec8a0585c6.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/11974' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11974:
[ticket/11974] Fix timezone names with underscores
[ticket/11974] Translate all timezones
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 510f46fcb4..f6f1c96ac7 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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) { |