Skip to content

Commit 992d8ae

Browse files
author
Olga Kopylova
committed
Merge remote-tracking branch 'extensibility/MAGETWO-35338-use-all-list' into PR_Branch
2 parents a70745a + 5a6a4e7 commit 992d8ae

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

app/code/Magento/Config/Model/Config/Backend/Locale/Timezone.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Timezone extends \Magento\Framework\App\Config\Value
1919
*/
2020
public function beforeSave()
2121
{
22-
if (!in_array($this->getValue(), \DateTimeZone::listIdentifiers(\DateTimeZone::ALL_WITH_BC))) {
22+
if (!in_array($this->getValue(), \DateTimeZone::listIdentifiers(\DateTimeZone::ALL))) {
2323
throw new LocalizedException(__('Please correct the timezone.'));
2424
}
2525
return $this;

lib/internal/Magento/Framework/Locale/Lists.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function getOptionTimezones()
103103
{
104104
$options = [];
105105
$locale = $this->localeResolver->getLocale();
106-
$zones = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL_WITH_BC);
106+
$zones = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL);
107107
foreach ($zones as $code) {
108108
$options[] = [
109109
'label' => \IntlTimeZone::createTimeZone($code)->getDisplayName(

setup/src/Magento/Setup/Model/Lists.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct(ConfigInterface $localeConfig)
3636
*/
3737
public function getTimezoneList()
3838
{
39-
$zones = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL_WITH_BC);
39+
$zones = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL);
4040
$list = [];
4141
foreach ($zones as $code) {
4242
$list[$code] = \IntlTimeZone::createTimeZone($code)->getDisplayName(

0 commit comments

Comments
 (0)