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

Merge pull request #2844 from marc1706/ticket/12858

Browse Source 
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
This commit is contained in:
Joas Schilling
2014-09-24 13:47:59 +02:00
parent f3fef8934e 457e13634e
commit 85bc9b69ae
11 changed files with 109 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
phpBB/language/en/common.php
View File

@@ -937,32 +937,34 @@ $lang = array_merge($lang, array(
// Timezones can be translated. We use this for the Etc/GMT timezones here,
// because they are named invers to their offset.
'timezones' => array(
'UTC' => 'UTC',
'UTC' => 'UTC',
'UTC_OFFSET' => 'UTC%1$s',
'UTC_OFFSET_CURRENT' => 'UTC%1$s - %2$s',
'Etc/GMT-12' => 'GMT+12',
'Etc/GMT-11' => 'GMT+11',
'Etc/GMT-10' => 'GMT+10',
'Etc/GMT-9' => 'GMT+9',
'Etc/GMT-8' => 'GMT+8',
'Etc/GMT-7' => 'GMT+7',
'Etc/GMT-6' => 'GMT+6',
'Etc/GMT-5' => 'GMT+5',
'Etc/GMT-4' => 'GMT+4',
'Etc/GMT-3' => 'GMT+3',
'Etc/GMT-2' => 'GMT+2',
'Etc/GMT-1' => 'GMT+1',
'Etc/GMT+1' => 'GMT-1',
'Etc/GMT+2' => 'GMT-2',
'Etc/GMT+3' => 'GMT-3',
'Etc/GMT+4' => 'GMT-4',
'Etc/GMT+5' => 'GMT-5',
'Etc/GMT+6' => 'GMT-6',
'Etc/GMT+7' => 'GMT-7',
'Etc/GMT+8' => 'GMT-8',
'Etc/GMT+9' => 'GMT-9',
'Etc/GMT+10' => 'GMT-10',
'Etc/GMT+11' => 'GMT-11',
'Etc/GMT+12' => 'GMT-12',
'Etc/GMT-12' => 'UTC+12',
'Etc/GMT-11' => 'UTC+11',
'Etc/GMT-10' => 'UTC+10',
'Etc/GMT-9' => 'UTC+9',
'Etc/GMT-8' => 'UTC+8',
'Etc/GMT-7' => 'UTC+7',
'Etc/GMT-6' => 'UTC+6',
'Etc/GMT-5' => 'UTC+5',
'Etc/GMT-4' => 'UTC+4',
'Etc/GMT-3' => 'UTC+3',
'Etc/GMT-2' => 'UTC+2',
'Etc/GMT-1' => 'UTC+1',
'Etc/GMT+1' => 'UTC-1',
'Etc/GMT+2' => 'UTC-2',
'Etc/GMT+3' => 'UTC-3',
'Etc/GMT+4' => 'UTC-4',
'Etc/GMT+5' => 'UTC-5',
'Etc/GMT+6' => 'UTC-6',
'Etc/GMT+7' => 'UTC-7',
'Etc/GMT+8' => 'UTC-8',
'Etc/GMT+9' => 'UTC-9',
'Etc/GMT+10' => 'UTC-10',
'Etc/GMT+11' => 'UTC-11',
'Etc/GMT+12' => 'UTC-12',
'Africa/Abidjan' => 'Africa/Abidjan',
'Africa/Accra' => 'Africa/Accra',