summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-06 16:19:54 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-06 16:19:54 +0100
commitebdb1b86f4f39f4ab1a4063d4fdd565c3141877c (patch)
treebf319e32af01b3af9ba1130724c9ffcbca672f50
parent2b5682d4f39f7d16ce47e2f45ea19ffab615cc60 (diff)
parent0ef898b7ea947c6ba4957877d1afd713a189b6f2 (diff)
Merge pull request #3444 from peterdenk/russian-timezones
Russian time zones were changed on Oct 26 2014.
-rw-r--r--system/language/english/date_lang.php6
-rw-r--r--user_guide_src/source/helpers/date_helper.rst4
2 files changed, 5 insertions, 5 deletions
diff --git a/system/language/english/date_lang.php b/system/language/english/date_lang.php
index 973fcc07a..5e1ae58e6 100644
--- a/system/language/english/date_lang.php
+++ b/system/language/english/date_lang.php
@@ -70,9 +70,9 @@ $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) East Africa Time, Arabia Standard Time';
+$lang['UP3'] = '(UTC +3:00) Moscow Time, East Africa Time, Arabia Standard Time';
$lang['UP35'] = '(UTC +3:30) Iran Standard Time';
-$lang['UP4'] = '(UTC +4:00) Moscow Time, Azerbaijan 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';
@@ -86,7 +86,7 @@ $lang['UP9'] = '(UTC +9:00) Japan Standard Time, Korea Standard Time, Yakutsk Ti
$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['UP11'] = '(UTC +11:00) Srednekolymsk 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';
diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst
index d9019a203..dcff7a4e5 100644
--- a/user_guide_src/source/helpers/date_helper.rst
+++ b/user_guide_src/source/helpers/date_helper.rst
@@ -357,7 +357,7 @@ The following functions are available:
<option value='UP95'>(UTC +9:30) Australian Central Standard Time</option>
<option value='UP10'>(UTC +10:00) Australian Eastern Standard Time, Vladivostok Time</option>
<option value='UP105'>(UTC +10:30) Lord Howe Island</option>
- <option value='UP11'>(UTC +11:00) Magadan Time, Solomon Islands, Vanuatu</option>
+ <option value='UP11'>(UTC +11:00) Srednekolymsk Time, Solomon Islands, Vanuatu</option>
<option value='UP115'>(UTC +11:30) Norfolk Island</option>
<option value='UP12'>(UTC +12:00) Fiji, Gilbert Islands, Kamchatka Time, New Zealand Standard Time</option>
<option value='UP1275'>(UTC +12:45) Chatham Islands Standard Time</option>
@@ -428,7 +428,7 @@ UP9 (UTC +9:00) Japan Standard Time, Korea Standard Time, Yakutsk
UP95 (UTC +9:30) Australian Central Standard Time
UP10 (UTC +10:00) Australian Eastern Standard Time, Vladivostok Time
UP105 (UTC +10:30) Lord Howe Island
-UP11 (UTC +11:00) Magadan Time, Solomon Islands, Vanuatu
+UP11 (UTC +11:00) Srednekolymsk Time, Solomon Islands, Vanuatu
UP115 (UTC +11:30) Norfolk Island
UP12 (UTC +12:00) Fiji, Gilbert Islands, Kamchatka, New Zealand
UP1275 (UTC +12:45) Chatham Islands Standard Time