summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/helpers/date_helper.php72
-rw-r--r--system/language/english/date_lang.php73
-rw-r--r--user_guide/changelog.html1
3 files changed, 83 insertions, 63 deletions
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index a82450aa1..401d64306 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -551,37 +551,47 @@ if ( ! function_exists('timezones'))
// Note: Don't change the order of these even though
// some items appear to be in the wrong order
- $zones = array(
- 'UM12' => -12,
- 'UM11' => -11,
- 'UM10' => -10,
- 'UM9' => -9,
- 'UM8' => -8,
- 'UM7' => -7,
- 'UM6' => -6,
- 'UM5' => -5,
- 'UM4' => -4,
- 'UM25' => -2.5,
- 'UM3' => -3,
- 'UM2' => -2,
- 'UM1' => -1,
- 'UTC' => 0,
- 'UP1' => +1,
- 'UP2' => +2,
- 'UP3' => +3,
- 'UP25' => +2.5,
- 'UP4' => +4,
- 'UP35' => +3.5,
- 'UP5' => +5,
- 'UP45' => +4.5,
- 'UP6' => +6,
- 'UP7' => +7,
- 'UP8' => +8,
- 'UP9' => +9,
- 'UP85' => +8.5,
- 'UP10' => +10,
- 'UP11' => +11,
- 'UP12' => +12
+ $zones = array(
+ 'UM12' => -12,
+ 'UM11' => -11,
+ 'UM10' => -10,
+ 'UM95' => -9.5,
+ 'UM9' => -9,
+ 'UM8' => -8,
+ 'UM7' => -7,
+ 'UM6' => -6,
+ 'UM5' => -5,
+ 'UM45' => -4.5,
+ 'UM4' => -4,
+ 'UM35' => -3.5,
+ 'UM3' => -3,
+ 'UM2' => -2,
+ 'UM1' => -1,
+ 'UTC' => 0,
+ 'UP1' => +1,
+ 'UP2' => +2,
+ 'UP3' => +3,
+ 'UP35' => +3.5,
+ 'UP4' => +4,
+ 'UP45' => +4.5,
+ 'UP5' => +5,
+ 'UP55' => +5.5,
+ 'UP575' => +5.75,
+ 'UP6' => +6,
+ 'UP65' => +6.5,
+ 'UP7' => +7,
+ 'UP8' => +8,
+ 'UP875' => +8.75,
+ 'UP9' => +9,
+ 'UP95' => +9.5,
+ 'UP10' => +10,
+ 'UP105' => +10.5,
+ 'UP11' => +11,
+ 'UP115' => +11.5,
+ 'UP12' => +12,
+ 'UP1275' => +12.75,
+ 'UP13' => +13,
+ 'UP14' => +14
);
if ($tz == '')
diff --git a/system/language/english/date_lang.php b/system/language/english/date_lang.php
index 93989eb45..329ad0999 100644
--- a/system/language/english/date_lang.php
+++ b/system/language/english/date_lang.php
@@ -15,37 +15,46 @@ $lang['date_minutes'] = "Minutes";
$lang['date_second'] = "Second";
$lang['date_seconds'] = "Seconds";
-$lang['UM12'] = "(UTC - 12:00) Eniwetok, Kwajalein";
-$lang['UM11'] = "(UTC - 11:00) Nome, Midway Island, Samoa";
-$lang['UM10'] = "(UTC - 10:00) Hawaii";
-$lang['UM9'] = "(UTC - 9:00) Alaska";
-$lang['UM8'] = "(UTC - 8:00) Pacific Time";
-$lang['UM7'] = "(UTC - 7:00) Mountain Time";
-$lang['UM6'] = "(UTC - 6:00) Central Time, Mexico City";
-$lang['UM5'] = "(UTC - 5:00) Eastern Time, Bogota, Lima, Quito";
-$lang['UM4'] = "(UTC - 4:00) Atlantic Time, Caracas, La Paz";
-$lang['UM25'] = "(UTC - 3:30) Newfoundland";
-$lang['UM3'] = "(UTC - 3:00) Brazil, Buenos Aires, Georgetown, Falkland Is.";
-$lang['UM2'] = "(UTC - 2:00) Mid-Atlantic, Ascension Is., St. Helena";
-$lang['UM1'] = "(UTC - 1:00) Azores, Cape Verde Islands";
-$lang['UTC'] = "(UTC) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia";
-$lang['UP1'] = "(UTC + 1:00) Berlin, Brussels, Copenhagen, Madrid, Paris, Rome";
-$lang['UP2'] = "(UTC + 2:00) Kaliningrad, South Africa, Warsaw";
-$lang['UP3'] = "(UTC + 3:00) Baghdad, Riyadh, Moscow, Nairobi";
-$lang['UP25'] = "(UTC + 3:30) Tehran";
-$lang['UP4'] = "(UTC + 4:00) Abu Dhabi, Baku, Muscat, Tbilisi";
-$lang['UP35'] = "(UTC + 4:30) Kabul";
-$lang['UP5'] = "(UTC + 5:00) Islamabad, Karachi, Tashkent";
-$lang['UP45'] = "(UTC + 5:30) Mumbai, Kolkata, Chennai, New Delhi";
-$lang['UP6'] = "(UTC + 6:00) Almaty, Colomba, Dhaka";
-$lang['UP7'] = "(UTC + 7:00) Bangkok, Hanoi, Jakarta";
-$lang['UP8'] = "(UTC + 8:00) Beijing, Hong Kong, Perth, Singapore, Taipei";
-$lang['UP9'] = "(UTC + 9:00) Osaka, Sapporo, Seoul, Tokyo, Yakutsk";
-$lang['UP85'] = "(UTC + 9:30) Adelaide, Darwin";
-$lang['UP10'] = "(UTC + 10:00) Melbourne, Papua New Guinea, Sydney, Vladivostok";
-$lang['UP11'] = "(UTC + 11:00) Magadan, New Caledonia, Solomon Islands";
-$lang['UP12'] = "(UTC + 12:00) Auckland, Wellington, Fiji, Marshall Islands";
+$lang['UM12'] = '(UTC -12:00) Baker/Howland Island',
+$lang['UM11'] = '(UTC -11:00) Samoa Time Zone, Niue',
+$lang['UM10'] = '(UTC -10:00) Hawaii-Aleutian Standard Time, Cook Islands, Tahiti',
+$lang['UM95'] = '(UTC -9:30) Marquesas Islands',
+$lang['UM9'] = '(UTC -9:00) Alaska Standard Time, Gambier Islands',
+$lang['UM8'] = '(UTC -8:00) Pacific Standard Time, Clipperton Island',
+$lang['UM7'] = '(UTC -7:00) Mountain Standard Time',
+$lang['UM6'] = '(UTC -6:00) Central Standard Time',
+$lang['UM5'] = '(UTC -5:00) Eastern Standard Time, Western Caribbean Standard Time',
+$lang['UM45'] = '(UTC -4:30) Venezuelan Standard Time',
+$lang['UM4'] = '(UTC -4:00) Atlantic Standard Time, Eastern Caribbean Standard Time',
+$lang['UM35'] = '(UTC -3:30) Newfoundland Standard Time',
+$lang['UM3'] = '(UTC -3:00) Argentina, Brazil, French Guiana, Uruguay',
+$lang['UM2'] = '(UTC -2:00) South Georgia/South Sandwich Islands',
+$lang['UM1'] = '(UTC -1:00) Azores, Cape Verde Islands',
+$lang['UTC'] = '(UTC) Greenwich Mean Time, Western European Time',
+$lang['UP1'] = '(UTC +1:00) Central European Time, West Africa Time',
+$lang['UP2'] = '(UTC +2:00) Central Africa Time, Eastern European Time, Kaliningrad Time',
+$lang['UP3'] = '(UTC +3:00) Moscow Time, East Africa Time',
+$lang['UP35'] = '(UTC +3:30) Iran Standard Time',
+$lang['UP4'] = '(UTC +4:00) Azerbaijan Standard Time, Samara Time',
+$lang['UP45'] = '(UTC +4:30) Afghanistan',
+$lang['UP5'] = '(UTC +5:00) Pakistan Standard Time, Yekaterinburg Time',
+$lang['UP55'] = '(UTC +5:30) Indian Standard Time, Sri Lanka Time',
+$lang['UP575'] = '(UTC +5:45) Nepal Time',
+$lang['UP6'] = '(UTC +6:00) Bangladesh Standard Time, Bhutan Time, Omsk Time',
+$lang['UP65'] = '(UTC +6:30) Cocos Islands, Myanmar',
+$lang['UP7'] = '(UTC +7:00) Krasnoyarsk Time, Cambodia, Laos, Thailand, Vietnam',
+$lang['UP8'] = '(UTC +8:00) Australian Western Standard Time, Beijing Time, Irkutsk Time',
+$lang['UP875'] = '(UTC +8:45) Australian Central Western Standard Time',
+$lang['UP9'] = '(UTC +9:00) Japan Standard Time, Korea Standard Time, Yakutsk Time',
+$lang['UP95'] = '(UTC +9:30) Australian Central Standard Time',
+$lang['UP10'] = '(UTC +10:00) Australian Eastern Standard Time, Vladivostok Time',
+$lang['UP105'] = '(UTC +10:30) Lord Howe Island',
+$lang['UP11'] = '(UTC +11:00) Magadan Time, Solomon Islands, Vanuatu',
+$lang['UP115'] = '(UTC +11:30) Norfolk Island',
+$lang['UP12'] = '(UTC +12:00) Fiji, Gilbert Islands, Kamchatka Time, New Zealand Standard Time',
+$lang['UP1275'] = '(UTC +12:45) Chatham Islands Standard Time',
+$lang['UP13'] = '(UTC +13:00) Phoenix Islands Time, Tonga',
+$lang['UP14'] = '(UTC +14:00) Line Islands',
-
-/* End of file date_lang.php */
+/* End of file date_lang.php */
/* Location: ./system/language/english/date_lang.php */ \ No newline at end of file
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index d980c3ff0..d317bbf81 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -75,6 +75,7 @@ SVN Revision: XXXX</p>
<li>Added the ability to store libraries in subdirectories within either the main "libraries" or the local application "libraries" folder. Please see the <a href="libraries/loader.html">Loader class</a> for more info. </li>
<li>Improved performance and accuracy of xss_clean(), including reduction of false positives on image/file tests.</li>
<li>Added a few openxml document mime types, and an additional mobile agent to mimes.php and user_agents.php respectively.</li>
+ <li>Updated Date Helper to match the world's current time zones and offsets.</li>
</ul>
</li>
</ul>