diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-10-26 10:33:02 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-10-27 00:21:17 +0200 |
| commit | 2086db0d7ab87aa5e71366cf36ca6344fdd9bd29 (patch) | |
| tree | af8b2945094e729934787647093d225f279f472a /phpBB/includes | |
| parent | b0e0834637172c86f3a152034d77d558e95b2e61 (diff) | |
| download | forums-2086db0d7ab87aa5e71366cf36ca6344fdd9bd29.tar forums-2086db0d7ab87aa5e71366cf36ca6344fdd9bd29.tar.gz forums-2086db0d7ab87aa5e71366cf36ca6344fdd9bd29.tar.bz2 forums-2086db0d7ab87aa5e71366cf36ca6344fdd9bd29.tar.xz forums-2086db0d7ab87aa5e71366cf36ca6344fdd9bd29.zip | |
[ticket/11974] Translate all timezones
PHPBB3-11974
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 ad5e3c05ce..cf8ae3a997 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) { |