Commit Graph

5813 Commits

Author SHA1 Message Date
Joseph Bielawski
6e7c375a3d [FrameworkBundle] Cleanup schema file 2011-08-19 21:50:39 +03:00
Johannes Schmitt
b6ee1a67a7 fixes a bug when overriding method via the X-HTTP-METHOD-OVERRIDE header 2011-08-18 12:18:12 +02:00
Victor Berchet
1515912e2e [SecurityBundle] Fix autoloading in tests (autoload.php overrides autoload.php.dist when it exists) 2011-08-18 09:27:14 +02:00
Johannes Schmitt
3dcb238cd6 increased visibility of httpUtils property 2011-08-18 08:51:56 +02:00
Grégoire Passault
80d1718a62 [Fix] Email() constraints now guess as 'email' field type 2011-08-16 14:27:16 +02:00
Fabien Potencier
d1ad47c0eb merged branch krmcbride/form-doc-fixes (PR #1959)
Commits
-------

e3cb39d [Form] Fixed a few PHPDoc comments

Discussion
----------

[Form] Fixed a few PHPDoc comments
2011-08-14 18:27:26 +02:00
Fabien Potencier
36226913be merged branch pylebecq/master (PR #1958)
Commits
-------

e88ecbb [Form] Fixed a typo in AbstractType phpdoc

Discussion
----------

[Form] Fixed a typo in AbstractType phpdoc

This PR is a new version of PR #1862.

Original comment :
Hi,
Nothing really awesome, but I fixed a typo in some phpdoc of the AbstractType class.
2011-08-14 18:27:01 +02:00
Kevin McBride
e3cb39dd9f [Form] Fixed a few PHPDoc comments 2011-08-14 08:43:34 -07:00
Fabien Potencier
5d4b8a7c88 merged branch aboks/acl_voter (PR #1954)
Commits
-------

09c41d3 [Security] Fixed incorrect merge of two modifications (53f5c23c and 85199677) to AclVoter

Discussion
----------

[Security] Fixed incorrect merge of two modifications to AclVoter

It seems two modifications to `AclVoter` (53f5c23c and 85199677) have been merged incorrectly, leading to a method call on an object that is known to be `null` and a fatal error when running the tests
2011-08-14 10:54:09 +02:00
Abhoryo
e9d2a67c1f CS 2011-08-14 01:38:02 +03:00
Abhoryo
3a64b08bd9 Search in others user providers when a user is not found in the first user provider and throws the right exception. 2011-08-14 00:00:10 +03:00
Fabien Potencier
283097db09 Revert "expanded namespaces within phpdoc (special for PhpStorm)"
This reverts commit 6e7439e73a.
2011-08-13 19:27:36 +02:00
lenar
805a2672d0 Remove Content-Length header adding for now. Fixes #1846. 2011-08-13 17:30:17 +03:00
Pierre-Yves LEBECQ
e88ecbbbfd [Form] Fixed a typo in AbstractType phpdoc 2011-08-13 13:43:13 +02:00
Arnout Boks
09c41d32ca [Security] Fixed incorrect merge of two modifications (53f5c23c and 85199677) to AclVoter 2011-08-13 12:46:41 +02:00
Fabien Potencier
0ad6e4267c merged branch ornicar/swiftmailerNonFileSpool (PR #1868)
Commits
-------

ee5b9ce [SwiftmailerBundle] Allow non-file spools

Discussion
----------

[SwiftmailerBundle] Allow non-file spools

Actually if I have the following configuration:

    swiftmailer:
        spool:
            type:   not_file
            path:   some_path

The DIC compiler will complain:

    'The service "swiftmailer.spool.file" has a dependency on
    a non-existent parameter "swiftmailer.spool.file.path"

Because the file spool service is declared no matter the spool type configured.
And it requires the file.path, which is not available.

This patch aims to load the file spooler only if required by the
configuration.

---------------------------------------------------------------------------

by cystbear at 2011/07/29 16:36:04 -0700

Nice catch Thibault.
2011-08-13 11:07:52 +02:00
Fabien Potencier
ef9439dc72 merged branch gimler/master (PR #1894)
Commits
-------

86f888f fix https default port check

Discussion
----------

fix https default port check

---------------------------------------------------------------------------

by Abhoryo at 2011/08/03 03:26:15 -0700

I think it's better to delete $httpsPort variable from the prototype and use only $httpPort variable.

public function urlRedirectAction($path, $permanent = false, $scheme = null, $httpPort = 80)
...
        $port = '';
        if (('http' === $scheme && 80 != $httpPort)  || ('https' === $scheme && 443 != $httpPort)) {
            $port = ':'.$httpPort;
        }

But if this method is already used with the $httpsPort variable elsewhere, your change is ok with me.

---------------------------------------------------------------------------

by gimler at 2011/08/03 04:52:08 -0700

You can use different ports for http and https so when you call the function $scheme = null than it use the $request->getScheme() so you must add both ports so i think it is not a good idea to merge the http and https vars.

---------------------------------------------------------------------------

by gimler at 2011/08/03 04:53:17 -0700

damn sorry i have accidentally close the pull request ;(

---------------------------------------------------------------------------

by stof at 2011/08/03 05:13:24 -0700

I agree with @gimler. Merging them as a single parameter does not make sense here

---------------------------------------------------------------------------

by Abhoryo at 2011/08/03 05:33:12 -0700

I've juste think it's weird to set a useless parameter ($httpPort) when you want to use the last parameter ($httpsPort).
And I don't think someone want http protocole on 433 or https on 80 ?

---------------------------------------------------------------------------

by stof at 2011/08/03 05:35:16 -0700

@Abhoryo what if you are using this controller in a general way, without knowing by advance if the handled request is a secure one ? You need both parameters.
If you need to change the https port by keeping the default http port, you indeed need to pass it but blame PHP: it does not support named parameters.

---------------------------------------------------------------------------

by Abhoryo at 2011/08/03 06:02:18 -0700

Ok, right.
2011-08-13 10:54:56 +02:00
Fabien Potencier
941d05b8a4 merged branch realmfoo/master (PR #1932)
Commits
-------

4f9d229 The trace argument value could be string ("*DEEP NESTED ARRAY*")
6e7439e expanded namespaces within phpdoc (special for PhpStorm)
f0a6ee5 merge from master
8519967 Calling supportsClass from vote to find out if we can vote

Discussion
----------

The trace argument of an exception can be string (*DEEP NESTED ARRAY*) but with an array type specified

It leads to the exception of a foreach loop:

Invalid argument supplied for foreach() /.../vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php:103
2011-08-13 10:49:16 +02:00
Fabien Potencier
81c82fec9b merged branch oncletom/patch-1 (PR #1947)
Commits
-------

ae55a98 Added $format in serialize() method, to keep consistence and give a hint to the normalizer.

Discussion
----------

Added $format in serialize() method, to keep consistence and give a hint

Added $format in serialize() method, to keep consistence and give a hint to the normalizer.

---------------------------------------------------------------------------

by Seldaek at 2011/08/12 02:06:19 -0700

👍
2011-08-13 10:47:09 +02:00
Fabien Potencier
ec529fb7af merged branch patashnik/dom_crawler_charset (PR #1933)
Commits
-------

81fb8e1 [DomCrawler] fix finding charset in addContent

Discussion
----------

[DomCrawler] fix finding charset in addContent

According to http://www.ietf.org/rfc/rfc2045.txt content type can include other field after charset. So they should be cut.
2011-08-13 10:37:29 +02:00
Fabien Potencier
6fd9b62ac6 merged branch hhamon/validator_phpdoc_typo (PR #1936)
Commits
-------

d7c93ca [Validator] fixed phpdoc.

Discussion
----------

[Validator] fixed phpdoc.
2011-08-13 10:31:19 +02:00
Fabien Potencier
7f3b6baf3a [ClassLoader] fixed CS 2011-08-13 10:30:20 +02:00
Oncle Tom
ae55a98604 Added $format in serialize() method, to keep consistence and give a hint to the normalizer. 2011-08-12 12:01:28 +03:00
Baptiste Clavié
7ec533eb93 got an if-condition out of unnecessary loops in Symfony\Component\ClassLoader\UniversalClassLoader 2011-08-11 16:23:36 +03:00
Martin Mayer
34a1b53168 [HttpFoundation] Do not save session in Session::__destroy() when saved already 2011-08-10 16:34:36 +02:00
Hugo Hamon
d7c93cacd0 [Validator] fixed phpdoc. 2011-08-10 16:11:31 +02:00
Alexey Popkov
81fb8e16e7 [DomCrawler] fix finding charset in addContent 2011-08-10 13:41:07 +04:00
realmfoo
4f9d229e78 The trace argument value could be string ("*DEEP NESTED ARRAY*") 2011-08-10 12:08:47 +04:00
realmfoo
6e7439e73a expanded namespaces within phpdoc (special for PhpStorm) 2011-08-10 11:16:31 +04:00
realmfoo
f0a6ee5a4d merge from master 2011-08-10 10:59:19 +04:00
Gregwar
a1810d6881 [Various] Fixed errors on PHPDocs exception names (TransformationFailedException) 2011-08-09 00:14:29 +02:00
Fabien Potencier
db713ea34d merged branch mvrhov/patch-1 (PR #1902)
Commits
-------

e78bc32 Fixed: Notice: Undefined index: enable_annotations in ...

Discussion
----------

Fixed: Notice: Undefined index: enable_annotations in ...

---------------------------------------------------------------------------

by stloyd at 2011/08/04 03:57:49 -0700

IMO `isset()` should be good enough here.

---------------------------------------------------------------------------

by stof at 2011/08/04 04:18:20 -0700

I don't see how such a notice could occur. There is a default value for this node so as soon as the validation node exists, there will be a value for this node. Could you give an example of configuration that causes the notice ?

---------------------------------------------------------------------------

by mvrhov at 2011/08/04 04:23:33 -0700

I don't have any validation node set up in my config in such a case it seems that sub nodes doesn't get build. So it seems that I found a bug in config builder.

---------------------------------------------------------------------------

by stof at 2011/08/04 04:54:05 -0700

This is in fact due to a hackish stuff in the DI extension. It changes the configuration after using the Config component to merge them in the case where you enable the forms without enabling the validator, to force enabling it.
2011-08-08 23:23:53 +02:00
Fabien Potencier
860ae77d24 merged branch weaverryan/doctrine_generate_entities_output (PR #1920)
Commits
-------

ba6a09d [DoctrineBundle] Adding a message in doctrine:generate:entities to notify people when a backup file is created

Discussion
----------

[DoctrineBundle] Adding a message in doctrine:generate:entities to notify

Hey guys!

This adds a message to the doctrine:generate:entities command when a backup file is created. This is because the backup file causes confusion in some cases (where did it come from?) and in rare cases - for reasons I don't know yet - the backup file causes "Cannot redeclare class ..." errors.

This is a not a BC-break, but of course could potentially cause an issue if there's some edge case that line 112 doesn't consider. For that reason, I'm pulling against master instead of 2.0.

Thanks!
2011-08-08 23:21:15 +02:00
Fabien Potencier
06517b9139 merged branch weaverryan/cache_clear_env_info (PR #1921)
Commits
-------

6738d2b [FrameworkBundle] Adding information about exactly which cache is being cleared.

Discussion
----------

[FrameworkBundle] Adding information about env being cleared

Hey guys!

I think the `cache:clear` confuses some people - they're expecting it to wipe out any and all cache (not just the cache for a specific env+debug mode). So, this adds details on *what* is being cleared, which should at least help.

I'll also put more information into the docs.

Thanks!

---------------------------------------------------------------------------

by jmikola at 2011/08/07 18:48:48 -0700

👍 on dumping the environment at output. Does the debug option mean anything in this context, though?

---------------------------------------------------------------------------

by weaverryan at 2011/08/07 19:57:18 -0700

I can't think of a spot where it makes a difference, but of course it *could* theoretically make a difference. The command's "help" message seems to indicate that it should be treated like there's a difference, so I followed suit.

But yes, environment is the big concern, hopefully nobody gets too hung up on the debug - one of those things where I think we technically need it, but practically don't.

---------------------------------------------------------------------------

by brikou at 2011/08/08 00:44:00 -0700

@weaverryan it would also be interesting to display the env used also for router:debug and probably other commands

---------------------------------------------------------------------------

by stof at 2011/08/08 01:13:58 -0700

@weaverryan It does make a difference when warùing up the cache (which is done by default when clearing it): many service definitions change according to the debug flag, so dumping the debug container seems a weird idea (the first request will need to dump the non-debug container as they have different names). But bigger issue: some cache warmer depend of the debug state (the Doctrine one IIRC) so the warming-up would do weird things if you run the prod CLI in debug mode.
2011-08-08 23:21:08 +02:00
Fabien Potencier
54999ef02d [HttpKernel] made a small internal refactoring to ease extensibility 2011-08-08 23:20:53 +02:00
Fabien Potencier
be031f54a1 [HttpKernel] fixed ControllerResolver when the controller is a class name with an __invoke() method 2011-08-08 23:20:03 +02:00
Ryan Weaver
6738d2b6f8 [FrameworkBundle] Adding information about exactly which cache is being cleared. 2011-08-07 14:02:33 -05:00
Ryan Weaver
ba6a09d452 [DoctrineBundle] Adding a message in doctrine:generate:entities to notify people when a backup file is created 2011-08-07 13:41:19 -05:00
hidenorigoto
275da0d478 [Validator] changed 'self' to 'static' for child class to override pattern constant 2011-08-07 15:48:14 +09:00
Miha Vrhovnik
e78bc327d6 Fixed: Notice: Undefined index: enable_annotations in ... 2011-08-04 13:56:01 +03:00
Gordon Franke
86f888f91c fix https default port check 2011-08-03 09:14:32 +02:00
Luis Cordova
8a980bd1e1 $node->hasAttribute('disabled') sf2 should not create disagreement between implementation and practice for a crawler. If sahi real browser can find an element that is disabled, then sf2 should too.
https://github.com/Behat/Mink/pull/58#issuecomment-1712459
2011-08-02 15:13:21 -05:00
Fabien Potencier
e136718ed6 merged branch weaverryan/patch-1 (PR #1865)
Commits
-------

b8ee401 Making the english smoother in command help description

Discussion
----------

Making the english smoother in command help description

Pretty simple :)

Thanks!
2011-08-02 09:29:43 +02:00
Fabien Potencier
b463646ce0 merged branch Seldaek/ucl_exception (PR #1825)
Commits
-------

c0571fc [ClassLoader] Improve exception messages of the debug class loader

Discussion
----------

[ClassLoader] Improve exception messages of the debug class loader

---------------------------------------------------------------------------

by Seldaek at 2011/07/31 14:01:40 -0700

Ok, I updated this to just clarify the message, because when I got the issue after some serious copy-paste coding, I thought it was quite confusing - it seems to imply you mistyped the class name when using the class, and therefore it was not found, while the typo is in the class's file itself.
2011-08-02 09:24:13 +02:00
Michel Salib
1087792f7e -- fix use of STDIN 2011-08-01 02:02:37 +02:00
Jordi Boggiano
c0571fc08c [ClassLoader] Improve exception messages of the debug class loader 2011-07-31 22:59:22 +02:00
ornicar
ee5b9cefda [SwiftmailerBundle] Allow non-file spools
Actually if I have the following configuration:

    swiftmailer:
        spool:
            type:   not_file
            path:   some_path

The DIC compiler will complain:

    'The service "swiftmailer.spool.file" has a dependency on
    a non-existent parameter "swiftmailer.spool.file.path"

Because the file spool service is declared no matter the spool type configured.
And it requires the file.path, which is not available.

This patch aims to load the file spooler only if required by the
configuration.
2011-07-29 16:25:23 -07:00
Ryan Weaver
b8ee401028 Making the english smoother in command help description 2011-07-29 11:28:15 -05:00
Fabien Potencier
5b5dc45f79 merged branch asm89/master (PR #1849)
Commits
-------

cbbdceb [HttpFoundation] Fixed incorrect ServerBag comment

Discussion
----------

[HttpFoundation] Fixed incorrect ServerBag comment

.
2011-07-29 10:51:08 +02:00
Fabien Potencier
c639d8df61 merged branch mbontemps/translation (PR #1848)
Commits
-------

c43aba9 Add a french translation

Discussion
----------

Add a french translation
2011-07-29 10:50:07 +02:00
Fabien Potencier
100eaf1e92 merged branch mbontemps/spelling (PR #1847)
Commits
-------

377128e Fix french spelling

Discussion
----------

Fix french spelling
2011-07-29 10:49:57 +02:00
Fabien Potencier
34eb972415 merged branch yethee/cn_translations (PR #1853)
Commits
-------

cf598de [FrameworkBundle] Updated the Chinese translations by @heccjj
e16ddcf [FrameworkBundle] Renamed validators.cn.xliff to validators.zh_CN.xliff
62da90a [FrameworkBundle] Fixed the Chinese translations by @heccjj
057cf2f Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.cn.xliff via GitHub

Discussion
----------

[FrameworkBundle] Updated the Chinese translations
2011-07-29 09:29:35 +02:00
Deni
cf598de945 [FrameworkBundle] Updated the Chinese translations by @heccjj 2011-07-28 17:59:03 +04:00
stloyd
d880db2791 [Form] Test covered fix for invalid date (13 month/31.02.2011 etc.) send to transformer. Closes #1755 2011-07-28 12:16:58 +02:00
Matthew Davis
df74f49a49 Patched src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php to throw an exception when an invalid date is passed for transformation (e.g. 31st February) 2011-07-28 12:16:57 +02:00
Alexander
cbbdcebff5 [HttpFoundation] Fixed incorrect ServerBag comment 2011-07-28 11:27:56 +02:00
Matthieu Bontemps
c43aba9a8e Add a french translation 2011-07-28 11:01:00 +02:00
Matthieu Bontemps
377128ec8a Fix french spelling 2011-07-28 10:51:06 +02:00
Fabien Potencier
c3ebdbf9cc prepared Symfony 2.0.0 release 2011-07-28 10:41:06 +02:00
Fabien Potencier
bcf5cebcff merged branch pborreli/last-day-typo (PR #1845)
Commits
-------

de5374e [Various] Typos

Discussion
----------

[Various] Typos
2011-07-28 10:39:55 +02:00
Pascal Borreli
de5374ebac [Various] Typos 2011-07-28 10:28:20 +02:00
Hugo Hamon
f2e4d35931 [Console] harmonized commands documentation by changing ./app/console to php app/console. 2011-07-28 10:01:57 +02:00
Hugo Hamon
41fe82656b [SwiftmailerBundle] harmonized commands documentation by changing ./app/console to php app/console. 2011-07-28 10:01:26 +02:00
Hugo Hamon
08072e4595 [FrameworkBundle] harmonized commands documentation by changing ./app/console to php app/console. 2011-07-28 10:01:00 +02:00
Hugo Hamon
ec9c0aab64 [DoctrineBundle] harmonized commands documentation by changing ./app/console to php app/console. 2011-07-28 10:00:47 +02:00
Hugo Hamon
1c082b8133 [FrameworkBundle] added short description for the assets:install command. 2011-07-28 09:52:34 +02:00
Hugo Hamon
e16ccaac71 [SecurityBundle] added short description and help for the init:acl command. 2011-07-28 09:49:02 +02:00
Hugo Hamon
e90efdc383 [DoctrineBundle] removed extra point at the end of the commands' short descriptions. 2011-07-28 09:48:27 +02:00
Fabien Potencier
3caa8953c5 merged branch cvaldemar/master (PR #1842)
Commits
-------

7d5785e Fixed message 8
8ef3647 Updated danish validator translation

Discussion
----------

Updated Danish translation of validator strings

Just an updated Danish translation as requested.

---------------------------------------------------------------------------

by yethee at 2011/07/27 23:25:11 -0700

@cvaldemar, can you fix message #8?
2011-07-28 08:56:38 +02:00
Lukas Kahwe Smith
6773cd7e05 [Serializer] removed @api since its not yet part of the stable API 2011-07-28 08:32:22 +02:00
Casper Valdemar Poulsen
7d5785ea9d Fixed message 8 2011-07-28 08:27:31 +02:00
Casper Valdemar Poulsen
8ef3647df7 Updated danish validator translation 2011-07-28 08:12:00 +02:00
Fabien Potencier
79c11c3351 merged branch irmantas/master (PR #1839)
Commits
-------

9ac711f Added lithuanian validators translation

Discussion
----------

Added translation

Added lithuanian validators translation
2011-07-28 07:06:55 +02:00
excelwebzone
2fca9b748b Some small hebrew fixes 2011-07-27 17:28:06 -07:00
Irmantas
9ac711f687 Added lithuanian validators translation 2011-07-28 00:15:36 +03:00
excelwebzone
8b77d4d24b Hebrew translations updated 2011-07-27 07:02:52 -07:00
umpirsky
56e92e940a Fixed Serbian translation. 2011-07-27 14:57:13 +02:00
Fabien Potencier
f18d71f139 merged branch danielcsgomes/master (PR #1832)
Commits
-------

336e4d4 some minor corrections to pt_PT translation

Discussion
----------

some minor corrections to pt_PT translation
2011-07-27 14:30:40 +02:00
Daniel Gomes
336e4d47e6 some minor corrections to pt_PT translation 2011-07-27 14:28:26 +02:00
Fabien Potencier
de04779eef merged branch doup/euskara_translations (PR #1831)
Commits
-------

363fed4 Euskara translations updated

Discussion
----------

Euskara translations updated
2011-07-27 14:21:05 +02:00
doup
363fed48ee Euskara translations updated 2011-07-27 14:15:55 +02:00
Fabien Potencier
824ee13990 merged branch yethee/ru_translation (PR #1830)
Commits
-------

e7c07c4 [FrameworkBundle] Updated the Russian translations.

Discussion
----------

[FrameworkBundle] Updated the Russian translations.
2011-07-27 14:10:57 +02:00
Deni
e7c07c49a2 [FrameworkBundle] Updated the Russian translations. 2011-07-27 15:42:03 +04:00
Daniel Gomes
00e10f9a44 updated pt_PT translation 2011-07-27 12:59:56 +02:00
Martin Hason
1d90b43a4f [FrameworkBundle] updated czech translation 2011-07-27 12:35:15 +02:00
Deni
e16ddcfd30 [FrameworkBundle] Renamed validators.cn.xliff to validators.zh_CN.xliff 2011-07-27 12:16:47 +04:00
Deni
62da90ad62 [FrameworkBundle] Fixed the Chinese translations by @heccjj
Merge remote-tracking branch 'heccjj/patch-1' into cn_translations
2011-07-27 12:02:44 +04:00
lenar
07298ac699 Detect EOF when reading input stream
[Console] Change back to fgets() in DialogHelper
2011-07-27 10:47:43 +03:00
Fabien Potencier
8700cd6154 fixed CS 2011-07-27 08:27:46 +02:00
Fabien Potencier
c248f8123d merged branch craue/patch-9 (PR #1787)
Commits
-------

c558b78 avoid rendering the `ChoiceType` separator if all `choices` are `preferred_choices`

Discussion
----------

avoid rendering the `ChoiceType` separator if all `choices` are `preferred_choices`

---------------------------------------------------------------------------

by fabpot at 2011/07/24 00:51:21 -0700

The same change should be made to the PHP template.

---------------------------------------------------------------------------

by fabpot at 2011/07/25 00:31:39 -0700

I forgot to ask you to add some unit tests too. Thanks.

---------------------------------------------------------------------------

by craue at 2011/07/25 10:23:34 -0700

Are you asking for PHPUnit tests? If so, unfortunately, I'm not able to add those because I haven't used PHPUnit yet. ;)

---------------------------------------------------------------------------

by lenar at 2011/07/25 12:47:51 -0700

I would prefer ```choises | length``` without spaces as everywhere else.

---------------------------------------------------------------------------

by lenar at 2011/07/25 12:50:32 -0700

@fabpot: Since <option disabled> is unclickable in browser (by HTML spec) this really doesn't change anything (something not there is as unclickable) except the the look when rendered. I have hard time to imagine what could become unit-testable here by this change.

---------------------------------------------------------------------------

by stof at 2011/07/25 13:03:47 -0700

@lenar unit testing is not about what the browser could do. What should be unit-tested is that an example will only preferred choices does not output the separator, which is exactly what this PR is about

---------------------------------------------------------------------------

by stof at 2011/07/25 13:04:03 -0700

@lenar unit testing is not about what the browser could do. What should be unit-tested is that an example will only preferred choices does not output the separator, which is exactly what this PR is about

---------------------------------------------------------------------------

by lenar at 2011/07/25 13:08:33 -0700

@stof: ok, put this way you are definitely right.

---------------------------------------------------------------------------

by craue at 2011/07/25 13:37:50 -0700

@lenar: You're right about the spaces. I'm using them in my projects but will remove them here for the sake of consistency.

---------------------------------------------------------------------------

by stloyd at 2011/07/25 13:40:40 -0700

@craue I will write today/tomorrow test to cover your code and send you PR.

---------------------------------------------------------------------------

by craue at 2011/07/25 14:00:26 -0700

@stloyd: That would be nice. But I'm still not that familiar with Git(Hub). Is there anything I have to take care of?

Also, I'd like to squash my three commits into one ... if this is possible for an open PR and if I find out how to do that easily. :D

---------------------------------------------------------------------------

by fabpot at 2011/07/26 00:18:22 -0700

@craue: yes, you should squash your commits into one and use `--force` when you push (the PR will automatically be updated accordingly).
2011-07-27 07:59:53 +02:00
Fabien Potencier
c6308a5daf merged branch stof/trans_locale (PR #1808)
Commits
-------

85c0087 [TwigBridge] Made the locale configurable for the trans and transchoice tags
3ea31a0 [TwigBridge] Made the locale configurable for the trans and transchoice filters

Discussion
----------

Trans locale

This allows setting the locale when translating in a Twig template. This was already allowed in the Translator and in the PHP templates
2011-07-27 07:44:42 +02:00
Fabien Potencier
bddfb9f052 merged branch husinluck/master (PR #1822)
Commits
-------

0832f4d Updated Persian translation
2a4fca8 translated validators resources into Persian

Discussion
----------

Persian translation

Added Persian validator translations
2011-07-27 07:43:45 +02:00
Fabien Potencier
1c564f39ca merged branch dlsniper/patch-1 (PR #1820)
Commits
-------

be4b77d Updated Romanian translation

Discussion
----------

Updated Romanian translation

Updated Romanian translation for validation messages to match the latest messages.
2011-07-27 07:43:39 +02:00
Hossein Bukhamsin
0832f4d92f Updated Persian translation 2011-07-27 09:31:14 +04:30
Hossein Bukhamsin
2a4fca8f8f translated validators resources into Persian 2011-07-27 09:18:19 +04:30
heccjj
057cf2fc97 Edited src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.cn.xliff via GitHub 2011-07-27 10:21:49 +08:00
Arnout Boks
9883c603a7 [FrameworkBundle] Updated Dutch validator translations 2011-07-27 00:07:10 +02:00
dlsniper
be4b77d407 Updated Romanian translation 2011-07-27 01:00:05 +03:00
Fabien Potencier
b56a40c9b6 merged branch stloyd/patch-8 (PR #1819)
Commits
-------

fe8e0ad [Validator] Sync polish translation

Discussion
----------

[Validator] Sync polish translation
2011-07-26 20:50:06 +02:00
Fabien Potencier
9b6a7c996d merged branch xmontana/patch-1 (PR #1818)
Commits
-------

321dd45 Updated spanish and catalan translations

Discussion
----------

Updated spanish and catalan translations

Added new translations based on the indonesian updated file.
2011-07-26 20:49:40 +02:00