[Intl] Load locale aliases to support alias fallbacks
This commit is contained in:
parent
1616d368d9
commit
1debf79430
@ -15,6 +15,7 @@ use Symfony\Component\Intl\Data\Bundle\Reader\JsonBundleReader;
|
|||||||
use Symfony\Component\Intl\Data\Bundle\Reader\BufferedBundleReader;
|
use Symfony\Component\Intl\Data\Bundle\Reader\BufferedBundleReader;
|
||||||
use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
|
use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader;
|
||||||
use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
|
use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface;
|
||||||
|
use Symfony\Component\Intl\Data\Provider\LocaleDataProvider;
|
||||||
use Symfony\Component\Intl\Data\Provider\ScriptDataProvider;
|
use Symfony\Component\Intl\Data\Provider\ScriptDataProvider;
|
||||||
use Symfony\Component\Intl\ResourceBundle\CurrencyBundle;
|
use Symfony\Component\Intl\ResourceBundle\CurrencyBundle;
|
||||||
use Symfony\Component\Intl\ResourceBundle\CurrencyBundleInterface;
|
use Symfony\Component\Intl\ResourceBundle\CurrencyBundleInterface;
|
||||||
@ -259,6 +260,11 @@ final class Intl
|
|||||||
new JsonBundleReader(),
|
new JsonBundleReader(),
|
||||||
self::BUFFER_SIZE
|
self::BUFFER_SIZE
|
||||||
));
|
));
|
||||||
|
$localeDataProvider = new LocaleDataProvider(
|
||||||
|
self::getDataDirectory().'/'.self::LOCALE_DIR,
|
||||||
|
self::$entryReader
|
||||||
|
);
|
||||||
|
self::$entryReader->setLocaleAliases($localeDataProvider->getAliases());
|
||||||
}
|
}
|
||||||
|
|
||||||
return self::$entryReader;
|
return self::$entryReader;
|
||||||
|
84
src/Symfony/Component/Intl/Tests/IntlTest.php
Normal file
84
src/Symfony/Component/Intl/Tests/IntlTest.php
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Component\Intl\Tests;
|
||||||
|
|
||||||
|
use Symfony\Component\Intl\Intl;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
|
class IntlTest extends TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @requires extension intl
|
||||||
|
*/
|
||||||
|
public function testIsExtensionLoadedChecksIfIntlExtensionIsLoaded()
|
||||||
|
{
|
||||||
|
$this->assertTrue(Intl::isExtensionLoaded());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetCurrencyBundleCreatesTheCurrencyBundle()
|
||||||
|
{
|
||||||
|
$this->assertInstanceOf('Symfony\Component\Intl\ResourceBundle\CurrencyBundleInterface', Intl::getCurrencyBundle());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetLanguageBundleCreatesTheLanguageBundle()
|
||||||
|
{
|
||||||
|
$this->assertInstanceOf('Symfony\Component\Intl\ResourceBundle\LanguageBundleInterface', Intl::getLanguageBundle());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetLocaleBundleCreatesTheLocaleBundle()
|
||||||
|
{
|
||||||
|
$this->assertInstanceOf('Symfony\Component\Intl\ResourceBundle\LocaleBundleInterface', Intl::getLocaleBundle());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetRegionBundleCreatesTheRegionBundle()
|
||||||
|
{
|
||||||
|
$this->assertInstanceOf('Symfony\Component\Intl\ResourceBundle\LocaleBundleInterface', Intl::getLocaleBundle());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetIcuVersionReadsTheVersionOfInstalledIcuLibrary()
|
||||||
|
{
|
||||||
|
$this->assertStringMatchesFormat('%d.%d', Intl::getIcuVersion());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetIcuDataVersionReadsTheVersionOfInstalledIcuData()
|
||||||
|
{
|
||||||
|
$this->assertStringMatchesFormat('%d.%d', Intl::getIcuDataVersion());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetIcuStubVersionReadsTheVersionOfBundledStubs()
|
||||||
|
{
|
||||||
|
$this->assertStringMatchesFormat('%d.%d', Intl::getIcuStubVersion());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetDataDirectoryReturnsThePathToIcuData()
|
||||||
|
{
|
||||||
|
$this->assertTrue(is_dir(Intl::getDataDirectory()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires extension intl
|
||||||
|
*/
|
||||||
|
public function testLocaleAliasesAreLoaded()
|
||||||
|
{
|
||||||
|
\Locale::setDefault('zh_TW');
|
||||||
|
$countryNameZhTw = Intl::getRegionBundle()->getCountryName('AD');
|
||||||
|
|
||||||
|
\Locale::setDefault('zh_Hant_TW');
|
||||||
|
$countryNameHantZhTw = Intl::getRegionBundle()->getCountryName('AD');
|
||||||
|
|
||||||
|
\Locale::setDefault('zh');
|
||||||
|
$countryNameZh = Intl::getRegionBundle()->getCountryName('AD');
|
||||||
|
|
||||||
|
$this->assertSame($countryNameZhTw, $countryNameHantZhTw, 'zh_TW is an alias to zh_Hant_TW');
|
||||||
|
$this->assertNotSame($countryNameZh, $countryNameZhTw, 'zh_TW does not fall back to zh');
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user