From d0da2f921a8d509f0b1682d03f5db96d0eaf3ab9 Mon Sep 17 00:00:00 2001 From: Hugo Hamon Date: Tue, 17 Jan 2012 16:44:47 +0100 Subject: [PATCH 1/4] [Bridge] [Twig] fixed typo in a comment of the Twig FormExtension extension. --- src/Symfony/Bridge/Twig/Extension/FormExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php index 25004e90fd..f33e3fe9d8 100644 --- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php @@ -67,7 +67,7 @@ class FormExtension extends \Twig_Extension public function getTokenParsers() { return array( - // {% form_theme form "SomeBungle::widgets.twig" %} + // {% form_theme form "SomeBundle::widgets.twig" %} new FormThemeTokenParser(), ); } From a1317c343724296294450169bd6ffa595e18195f Mon Sep 17 00:00:00 2001 From: Manuel Kiessling Date: Tue, 17 Jan 2012 18:44:55 +0100 Subject: [PATCH 2/4] [Locale][Testing] Fixed breaking tests if 'intl' extension is not installed (#3139) Symfony\Tests\Component\Locale\LocaleTest->testGetDisplayCountriesReturnsFullListForSubLocale() fails with a fatal error if the PHP extension 'intl' is not installed on the system. Added a check which skips the affected tests if the extension is not available. Fixes #3139 --- tests/Symfony/Tests/Component/Locale/LocaleTest.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/Symfony/Tests/Component/Locale/LocaleTest.php b/tests/Symfony/Tests/Component/Locale/LocaleTest.php index a6ab32af0f..0155a521ca 100644 --- a/tests/Symfony/Tests/Component/Locale/LocaleTest.php +++ b/tests/Symfony/Tests/Component/Locale/LocaleTest.php @@ -11,12 +11,16 @@ namespace Symfony\Tests\Component\Locale; -use Symfony\Component\Locale\Locale; +require_once __DIR__.'/TestCase.php'; -class LocaleTest extends \PHPUnit_Framework_TestCase +use Symfony\Component\Locale\Locale; +use Symfony\Tests\Component\Locale\TestCase as LocaleTestCase; + +class LocaleTest extends LocaleTestCase { public function testGetDisplayCountriesReturnsFullListForSubLocale() { + $this->skipIfIntlExtensionIsNotLoaded(); $countriesDe = Locale::getDisplayCountries('de'); $countriesDeCh = Locale::getDisplayCountries('de_CH'); @@ -27,6 +31,7 @@ class LocaleTest extends \PHPUnit_Framework_TestCase public function testGetDisplayLanguagesReturnsFullListForSubLocale() { + $this->skipIfIntlExtensionIsNotLoaded(); $languagesDe = Locale::getDisplayLanguages('de'); $languagesDeCh = Locale::getDisplayLanguages('de_CH'); @@ -37,6 +42,7 @@ class LocaleTest extends \PHPUnit_Framework_TestCase public function testGetDisplayLocalesReturnsFullListForSubLocale() { + $this->skipIfIntlExtensionIsNotLoaded(); $localesDe = Locale::getDisplayLocales('de'); $localesDeCh = Locale::getDisplayLocales('de_CH'); From 812c72ad8c16c4f34fea8d96a85561069476bdab Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 18 Jan 2012 13:29:06 +0100 Subject: [PATCH 3/4] fixed CS --- .../Extension/Validator/Validator/DelegatingValidator.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php b/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php index d1df51e647..5c906421c7 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php +++ b/src/Symfony/Component/Form/Extension/Validator/Validator/DelegatingValidator.php @@ -153,8 +153,7 @@ class DelegatingValidator implements FormValidatorInterface private function buildFormPathMapping(FormInterface $form, array &$mapping, $formPath = 'children', $namePath = '') { - foreach ($form->getAttribute('error_mapping') as $nestedDataPath => $nestedNamePath) - { + foreach ($form->getAttribute('error_mapping') as $nestedDataPath => $nestedNamePath) { $mapping['/^'.preg_quote($formPath.'.data.'.$nestedDataPath).'(?!\w)/'] = $namePath.'.'.$nestedNamePath; } @@ -188,8 +187,7 @@ class DelegatingValidator implements FormValidatorInterface private function buildDataPathMapping(FormInterface $form, array &$mapping, $dataPath = 'data', $namePath = '') { - foreach ($form->getAttribute('error_mapping') as $nestedDataPath => $nestedNamePath) - { + foreach ($form->getAttribute('error_mapping') as $nestedDataPath => $nestedNamePath) { $mapping['/^'.preg_quote($dataPath.'.'.$nestedDataPath).'(?!\w)/'] = $namePath.'.'.$nestedNamePath; } From 1f733e11684c038176dce0f0396f956466ae7217 Mon Sep 17 00:00:00 2001 From: Sasa Stamenkovic Date: Sat, 21 Jan 2012 23:34:49 +0100 Subject: [PATCH 4/4] Updated Serbian translation. --- .../translations/validators.sr.xliff | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr.xliff b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr.xliff index 1731177900..02ff856b97 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr.xliff +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.sr.xliff @@ -126,6 +126,46 @@ The two values should be equal Обе вредности треба да буду једнаке + + The file is too large. Allowed maximum size is {{ limit }} + Датотека је превелика. Највећа дозвољена величина је {{ limit }} + + + The file is too large + Датотека је превелика + + + The file could not be uploaded + Датотека не може бити отпремљена + + + This value should be a valid number + Вредност треба да буде валидан број + + + This file is not a valid image + Ова датотека није валидна слика + + + This is not a valid IP address + Ово није валидна ИП адреса + + + This value is not a valid language + Вредност није валидан језик + + + This value is not a valid locale + Вредност није валидан локал + + + This value is not a valid country + Вредност није валидна земља + + + This value is already used + Вредност је већ искоришћена + \ No newline at end of file