merged 2.0
This commit is contained in:
commit
b9a14f0411
@ -162,6 +162,10 @@
|
||||
<source>This value is not a valid country</source>
|
||||
<target>Ez az érték nem egy érvényes ország</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="41">
|
||||
<source>This value is already used</source>
|
||||
<target>Ez az érték már használva van</target>
|
||||
</trans-unit>
|
||||
</body>
|
||||
</file>
|
||||
</xliff>
|
||||
|
@ -17,7 +17,7 @@ namespace Symfony\Component\ClassLoader;
|
||||
* It is able to load classes that use either:
|
||||
*
|
||||
* * The technical interoperability standards for PHP 5.3 namespaces and
|
||||
* class names (http://groups.google.com/group/php-standards/web/psr-0-final-proposal);
|
||||
* class names (https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md);
|
||||
*
|
||||
* * The PEAR naming convention for classes (http://pear.php.net/).
|
||||
*
|
||||
|
@ -17,7 +17,7 @@ namespace Symfony\Component\ClassLoader;
|
||||
* It is able to load classes that use either:
|
||||
*
|
||||
* * The technical interoperability standards for PHP 5.3 namespaces and
|
||||
* class names (http://groups.google.com/group/php-standards/web/psr-0-final-proposal);
|
||||
* class names (https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md);
|
||||
*
|
||||
* * The PEAR naming convention for classes (http://pear.php.net/).
|
||||
*
|
||||
|
@ -36,6 +36,8 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
|
||||
* @param string $outputTimezone The name of the output timezone
|
||||
* @param integer $dateFormat The date format
|
||||
* @param integer $timeFormat The time format
|
||||
* @param \IntlDateFormatter $calendar An \IntlDateFormatter instance
|
||||
* @param string $pattern A pattern to pass to \IntlDateFormatter
|
||||
*
|
||||
* @throws UnexpectedTypeException If a format is not supported
|
||||
* @throws UnexpectedTypeException if a timezone is not a string
|
||||
|
@ -76,7 +76,7 @@ class DelegatingValidator implements FormValidatorInterface
|
||||
$child->addError($error);
|
||||
}
|
||||
}
|
||||
} elseif ($violations = $this->validator->validate($form)) {
|
||||
} elseif (count($violations = $this->validator->validate($form))) {
|
||||
foreach ($violations as $violation) {
|
||||
$propertyPath = $violation->getPropertyPath();
|
||||
$template = $violation->getMessageTemplate();
|
||||
|
@ -300,7 +300,7 @@ class FormBuilder
|
||||
/**
|
||||
* Appends a transformer to the normalization transformer chain
|
||||
*
|
||||
* @param DataTransformerInterface $clientTransformer
|
||||
* @param DataTransformerInterface $normTransformer
|
||||
*
|
||||
* @return FormBuilder The current builder
|
||||
*/
|
||||
|
@ -43,6 +43,7 @@ abstract class FormUtil
|
||||
* Returns whether the given choice is selected.
|
||||
*
|
||||
* @param mixed $choice The choice
|
||||
* @param mixed $value the value
|
||||
*
|
||||
* @return Boolean Whether the choice is selected
|
||||
*/
|
||||
|
@ -112,6 +112,7 @@ class FilesystemSessionStorage extends NativeSessionStorage
|
||||
* The preferred format for a key is directory style so naming conflicts can be avoided.
|
||||
*
|
||||
* @param string $key A unique key identifying your data
|
||||
* @param string $default The default value
|
||||
*
|
||||
* @return mixed Data associated with the key
|
||||
*
|
||||
|
@ -15,6 +15,7 @@ namespace Symfony\Component\Routing\Annotation;
|
||||
* Annotation class for @Route().
|
||||
*
|
||||
* @Annotation
|
||||
*
|
||||
* @author Fabien Potencier <fabien@symfony.com>
|
||||
*/
|
||||
class Route
|
||||
|
@ -31,7 +31,7 @@ class ParseException extends \RuntimeException implements ExceptionInterface
|
||||
* @param string $message The error message
|
||||
* @param integer $parsedLine The line where the error occurred
|
||||
* @param integer $snippet The snippet of code near the problem
|
||||
* @param string $filename The file name where the error occurred
|
||||
* @param string $parsedFile The file name where the error occurred
|
||||
* @param Exception $previous The previous exception
|
||||
*/
|
||||
public function __construct($message, $parsedLine = -1, $snippet = null, $parsedFile = null, Exception $previous = null)
|
||||
@ -59,7 +59,7 @@ class ParseException extends \RuntimeException implements ExceptionInterface
|
||||
/**
|
||||
* Sets the snippet of code near the error.
|
||||
*
|
||||
* @param string $parsedFile The filename
|
||||
* @param string $snippet The code snippet
|
||||
*/
|
||||
public function setSnippet($snippet)
|
||||
{
|
||||
|
Reference in New Issue
Block a user