From eb0637f675f16193ac440aab914d0aa3a20c8a53 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Tue, 30 Dec 2014 09:06:31 +0100 Subject: [PATCH] Fix the implementation of deprecated Locale classes The ICU component does not exist anymore. --- src/Symfony/Component/Locale/Locale.php | 3 +-- src/Symfony/Component/Locale/Stub/StubLocale.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Locale/Locale.php b/src/Symfony/Component/Locale/Locale.php index 3bb59ee67e..72817da3a5 100644 --- a/src/Symfony/Component/Locale/Locale.php +++ b/src/Symfony/Component/Locale/Locale.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Locale; -use Symfony\Component\Icu\IcuData; use Symfony\Component\Intl\Intl; /** @@ -173,7 +172,7 @@ class Locale extends \Locale */ public static function getIcuDataDirectory() { - return IcuData::getResourceDirectory(); + return Intl::getDataDirectory(); } /** diff --git a/src/Symfony/Component/Locale/Stub/StubLocale.php b/src/Symfony/Component/Locale/Stub/StubLocale.php index cde47f7a5d..3ef259c06b 100644 --- a/src/Symfony/Component/Locale/Stub/StubLocale.php +++ b/src/Symfony/Component/Locale/Stub/StubLocale.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Locale\Stub; -use Symfony\Component\Icu\IcuData; use Symfony\Component\Intl\Intl; use Symfony\Component\Intl\Locale\Locale; @@ -86,7 +85,7 @@ class StubLocale extends Locale public static function getDataDirectory() { - return IcuData::getResourceDirectory(); + return Intl::getDataDirectory(); } private static function prepareCurrencies($locale)