diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.0

Browse Source 
* 3.4:
  fixed UUID error message id in translation files
  Add several missing translations of the UUID validation message.
  Serbo-Croatian has Serbian plural rule
  [Validator] Add missing UUID validator message translation (hu)
  [Validator] Add missing UUID validator message translation (en)
  add missing translation for uuid validator
  Fix false-positive deprecation notices for TranslationLoader and WriteCheckSessionHandler
  Fix PHPDoc return type
  [MonologBridge] Improve FirePHPHandler
  Fix SVGs not scaling in IE9, IE10, and IE11
This commit is contained in:
Fabien Potencier 2018-07-23 10:19:18 +02:00
commit ffb28a360d
13 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
View File

@ -38,9 +38,10 @@ class FirePHPHandler extends BaseFirePHPHandler
return;
}
if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $event->getRequest()->headers->get('User-Agent'))
&& !$event->getRequest()->headers->has('X-FirePHP-Version')) {
$this->sendHeaders = false;
$request = $event->getRequest();
if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $request->headers->get('User-Agent'))
&& !$request->headers->has('X-FirePHP-Version')) {
self::$sendHeaders = false;
$this->headers = array();
return;
@ -58,7 +59,7 @@ class FirePHPHandler extends BaseFirePHPHandler
*/
protected function sendHeader($header, $content)
{
if (!$this->sendHeaders) {
if (!self::$sendHeaders) {
return;
}

1
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
View File

@ -70,6 +70,7 @@
.sf-toolbarreset svg,
.sf-toolbarreset img {
height: 20px;
width: 20px;
display: inline-block;
}

2
src/Symfony/Component/HttpKernel/Event/GetResponseEvent.php
View File

@ -29,7 +29,7 @@ class GetResponseEvent extends KernelEvent
/**
* Returns the response object.
*
* @return Response
* @return Response|null
*/
public function getResponse()
{

1
src/Symfony/Component/Translation/PluralizationRules.php
View File

@ -144,6 +144,7 @@ class PluralizationRules
case 'bs':
case 'hr':
case 'ru':
case 'sh':
case 'sr':
case 'uk':
return ((1 == $number % 10) && (11 != $number % 100)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);

4
src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf
View File

@ -302,6 +302,10 @@
<source>An empty file is not allowed.</source>
<target>No està permès un fixter buit.</target>
</trans-unit>
<trans-unit id="83">
<source>This is not a valid UUID.</source>
<target>Aquest valor no és un UUID vàlid.</target>
</trans-unit>
</body>
</file>
</xliff>

4
src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
View File

@ -318,6 +318,10 @@
<source>Error</source>
<target>Fehler</target>
</trans-unit>
<trans-unit id="83">
<source>This is not a valid UUID.</source>
<target>Dies ist keine gültige UUID.</target>
</trans-unit>
</body>
</file>
</xliff>

4
src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
View File

@ -318,6 +318,10 @@
<source>Error</source>
<target>Error</target>
</trans-unit>
<trans-unit id="83">
<source>This is not a valid UUID.</source>
<target>This is not a valid UUID.</target>
</trans-unit>
</body>
</file>
</xliff>

4
src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
View File

@ -318,6 +318,10 @@
<source>Error</source>
<target>Error</target>
</trans-unit>
<trans-unit id="83">
<source>This is not a valid UUID.</source>
<target>Este valor no es un UUID válido.</target>
</trans-unit>
</body>
</file>
</xliff>

4
src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf
View File

@ -282,6 +282,10 @@
<source>Error</source>
<target>Errore</target>
</trans-unit>
<trans-unit id="83">
<source>This is not a valid UUID.</source>
<target>Balio hau ez da onartutako UUID bat.</target>
</trans-unit>
</body>
</file>
</xliff>

4
src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf
View File

@ -318,6 +318,10 @@
<source>Error</source>
<target>Erreur</target>
</trans-unit>
<trans-unit id="83">
<source>This is not a valid UUID.</source>
<target>Ceci n'est pas un UUID valide.</target>
</trans-unit>
</body>
</file>
</xliff>

4
src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf
View File

@ -318,6 +318,10 @@
<source>Error</source>
<target>Hiba</target>
</trans-unit>
<trans-unit id="83">
<source>This is not a valid UUID.</source>
<target>Érvénytelen egyedi azonosító (UUID).</target>
</trans-unit>
</body>
</file>
</xliff>

4
src/Symfony/Component/Validator/Resources/translations/validators.it.xlf
View File

@ -318,6 +318,10 @@
<source>Error</source>
<target>Errore</target>
</trans-unit>
<trans-unit id="83">
<source>This is not a valid UUID.</source>
<target>Questo non è un UUID valido.</target>
</trans-unit>
</body>
</file>
</xliff>

4
src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf
View File

@ -314,6 +314,10 @@
<source>Error</source>
<target>Fout</target>
</trans-unit>
<trans-unit id="83">
<source>This is not a valid UUID.</source>
<target>Deze waarde is geen geldige UUID waarde.</target>
</trans-unit>
</body>
</file>
</xliff>