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

Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling

Browse Source 
Conflicts:
	phpBB/includes/functions_profile_fields.php
	phpBB/includes/session.php
	phpBB/install/database_update.php
This commit is contained in:
Joas Schilling
2012-06-04 18:09:35 +02:00
parent 4af503e11b b672fc7ae1
commit 8f027b68d6
26 changed files with 395 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/language/en/acp/board.php
View File

@@ -50,7 +50,6 @@ $lang = array_merge($lang, array(
'OVERRIDE_STYLE_EXPLAIN' => 'Replaces user’s style with the default.',
'SITE_DESC' => 'Site description',
'SITE_NAME' => 'Site name',
'SYSTEM_DST' => 'Enable Summer Time/<abbr title="Daylight Saving Time">DST</abbr>',
'SYSTEM_TIMEZONE' => 'Guest timezone',
'SYSTEM_TIMEZONE_EXPLAIN' => 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.',
'WARNINGS_EXPIRE' => 'Warning duration',

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

@@ -835,93 +835,6 @@ $lang = array_merge($lang, array(
'Dec' => 'Dec',
),
'tz' => array(
'-12' => 'UTC - 12 hours',
'-11' => 'UTC - 11 hours',
'-10' => 'UTC - 10 hours',
'-9.5' => 'UTC - 9:30 hours',
'-9' => 'UTC - 9 hours',
'-8' => 'UTC - 8 hours',
'-7' => 'UTC - 7 hours',
'-6' => 'UTC - 6 hours',
'-5' => 'UTC - 5 hours',
'-4.5' => 'UTC - 4:30 hours',
'-4' => 'UTC - 4 hours',
'-3.5' => 'UTC - 3:30 hours',
'-3' => 'UTC - 3 hours',
'-2' => 'UTC - 2 hours',
'-1' => 'UTC - 1 hour',
'0' => 'UTC',
'1' => 'UTC + 1 hour',
'2' => 'UTC + 2 hours',
'3' => 'UTC + 3 hours',
'3.5' => 'UTC + 3:30 hours',
'4' => 'UTC + 4 hours',
'4.5' => 'UTC + 4:30 hours',
'5' => 'UTC + 5 hours',
'5.5' => 'UTC + 5:30 hours',
'5.75' => 'UTC + 5:45 hours',
'6' => 'UTC + 6 hours',
'6.5' => 'UTC + 6:30 hours',
'7' => 'UTC + 7 hours',
'8' => 'UTC + 8 hours',
'8.75' => 'UTC + 8:45 hours',
'9' => 'UTC + 9 hours',
'9.5' => 'UTC + 9:30 hours',
'10' => 'UTC + 10 hours',
'10.5' => 'UTC + 10:30 hours',
'11' => 'UTC + 11 hours',
'11.5' => 'UTC + 11:30 hours',
'12' => 'UTC + 12 hours',
'12.75' => 'UTC + 12:45 hours',
'13' => 'UTC + 13 hours',
'14' => 'UTC + 14 hours',
'dst' => '[ <abbr title="Daylight Saving Time">DST</abbr> ]',
),
'tz_zones' => array(
'-12' => '[UTC - 12] Baker Island Time',
'-11' => '[UTC - 11] Niue Time, Samoa Standard Time',
'-10' => '[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time',
'-9.5' => '[UTC - 9:30] Marquesas Islands Time',
'-9' => '[UTC - 9] Alaska Standard Time, Gambier Island Time',
'-8' => '[UTC - 8] Pacific Standard Time',
'-7' => '[UTC - 7] Mountain Standard Time',
'-6' => '[UTC - 6] Central Standard Time',
'-5' => '[UTC - 5] Eastern Standard Time',
'-4.5' => '[UTC - 4:30] Venezuelan Standard Time',
'-4' => '[UTC - 4] Atlantic Standard Time',
'-3.5' => '[UTC - 3:30] Newfoundland Standard Time',
'-3' => '[UTC - 3] Amazon Standard Time, Central Greenland Time',
'-2' => '[UTC - 2] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time',
'-1' => '[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time',
'0' => '[UTC] Western European Time, Greenwich Mean Time',
'1' => '[UTC + 1] Central European Time, West African Time',
'2' => '[UTC + 2] Eastern European Time, Central African Time',
'3' => '[UTC + 3] Moscow Standard Time, Eastern African Time',
'3.5' => '[UTC + 3:30] Iran Standard Time',
'4' => '[UTC + 4] Gulf Standard Time, Samara Standard Time',
'4.5' => '[UTC + 4:30] Afghanistan Time',
'5' => '[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time',
'5.5' => '[UTC + 5:30] Indian Standard Time, Sri Lanka Time',
'5.75' => '[UTC + 5:45] Nepal Time',
'6' => '[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time',
'6.5' => '[UTC + 6:30] Cocos Islands Time, Myanmar Time',
'7' => '[UTC + 7] Indochina Time, Krasnoyarsk Standard Time',
'8' => '[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time',
'8.75' => '[UTC + 8:45] Southeastern Western Australia Standard Time',
'9' => '[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time',
'9.5' => '[UTC + 9:30] Australian Central Standard Time',
'10' => '[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time',
'10.5' => '[UTC + 10:30] Lord Howe Standard Time',
'11' => '[UTC + 11] Solomon Island Time, Magadan Standard Time',
'11.5' => '[UTC + 11:30] Norfolk Island Time',
'12' => '[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time',
'12.75' => '[UTC + 12:45] Chatham Islands Time',
'13' => '[UTC + 13] Tonga Time, Phoenix Islands Time',
'14' => '[UTC + 14] Line Island Time',
),
// The value is only an example and will get replaced by the current time on view
'dateformats' => array(
'd M Y, H:i' => '01 Jan 2007, 13:37',

2
phpBB/language/en/help_faq.php
View File

@@ -87,7 +87,7 @@ $help = array(
),
array(
0 => 'I changed the timezone and the time is still wrong!',
1 => 'If you are sure you have set the timezone and Summer Time/DST correctly and the time is still incorrect, then the time stored on the server clock is incorrect. Please notify an administrator to correct the problem.'
1 => 'If you are sure you have set the timezone correctly and the time is still incorrect, then the time stored on the server clock is incorrect. Please notify an administrator to correct the problem.'
),
array(
0 => 'My language is not in the list!',

2
phpBB/language/en/ucp.php
View File

@@ -102,7 +102,6 @@ $lang = array_merge($lang, array(
'BIRTHDAY_EXPLAIN' => 'Setting a year will list your age when it is your birthday.',
'BOARD_DATE_FORMAT' => 'My date format',
'BOARD_DATE_FORMAT_EXPLAIN' => 'The syntax used is identical to the PHP <a href="http://www.php.net/date">date()</a> function.',
'BOARD_DST' => 'Summer Time/<abbr title="Daylight Saving Time">DST</abbr> is in effect',
'BOARD_LANGUAGE' => 'My language',
'BOARD_STYLE' => 'My board style',
'BOARD_TIMEZONE' => 'My timezone',
@@ -413,6 +412,7 @@ $lang = array_merge($lang, array(
'SIGNATURE_EXPLAIN' => 'This is a block of text that can be added to posts you make. There is a %d character limit.',
'SIGNATURE_PREVIEW' => 'Your signature will appear like this in posts',
'SIGNATURE_TOO_LONG' => 'Your signature is too long.',
'SELECT_TIMEZONE' => 'Select timezone',
'SORT' => 'Sort',
'SORT_COMMENT' => 'File comment',
'SORT_DOWNLOADS' => 'Downloads',