8000 Merge branch '2.8' into 3.4 · symfony/symfony@a97a617 · GitHub
[go: up one dir, main page]
Skip to content

Commit a97a617

Browse files
fabpotfabpot
committed
Merge branch '2.8' into 3.4
* 2.8: 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 PHPDoc return type [MonologBridge] Improve FirePHPHandler Fix SVGs not scaling in IE9, IE10, and IE11
2 parents 18edda3 + 53cbd0d commit a97a617

File tree

13 files changed

+44
-5
lines changed

13 files changed

+44
-5
lines changed

‎src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,10 @@ public function onKernelResponse(FilterResponseEvent $event)
3838
return;
3939
}
4040

41-
if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $event->getRequest()->headers->get('User-Agent'))
42-
&& !$event->getRequest()->headers->has('X-FirePHP-Version')) {
43-
$this->sendHeaders = false;
41+
$request = $event->getRequest();
42+
if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $request->headers->get('User-Agent'))
43+
&& !$request->headers->has('X-FirePHP-Version')) {
44+
self::$sendHeaders = false;
4445
$this->headers = array();
4546

4647
return;
@@ -58,7 +59,7 @@ public function onKernelResponse(FilterResponseEvent $event)
5859
*/
5960
protected function sendHeader($header, $content)
6061
{
61-
if (!$this->sendHeaders) {
62+
if (!self::$sendHeaders) {
6263
return;
6364
}
6465

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
.sf-toolbarreset svg,
7171
.sf-toolbarreset img {
7272
height: 20px;
73+
width: 20px;
7374
display: inline-block;
7475
}
7576

‎src/Symfony/Component/HttpKernel/Event/GetResponseEvent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class GetResponseEvent extends KernelEvent
2929
/**
3030
* Returns the response object.
3131
*
32-
* @return Response
32+
* @return Response|null
3333
*/
3434
public function getResponse()
3535
{

‎src/Symfony/Component/Translation/PluralizationRules.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ public static function get($number, $locale)
144144
case 'bs':
145145
case 'hr':
146146
case 'ru':
147+
case 'sh':
147148
case 'sr':
148149
case 'uk':
149150
return ((1 == $number % 10) && (11 != $number % 100)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);

‎src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,10 @@
302302
<source>An empty file is not allowed.</source>
303303
<target>No està permès un fixter buit.</target>
304304
</trans-unit>
305+
<trans-unit id="83">
306+
<source>This is not a valid UUID.</source>
307+
<target>Aquest valor no és un UUID vàlid.</target>
308+
</trans-unit>
305309
</body>
306310
</file>
307311
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.de.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,10 @@
318318
<source>Error</source>
319319
<target>Fehler</target>
320320
</trans-unit>
321+
<trans-unit id="83">
322+
<source>This is not a valid UUID.</source>
323+
<target>Dies ist keine gültige UUID.</target>
324+
</trans-unit>
321325
</body>
322326
</file>
323327
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.en.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,10 @@
318318
<source>Error</source>
319319
<target>Error</target>
320320
</trans-unit>
321+
<trans-unit id="83">
322+
<source>This is not a valid UUID.</source>
323+
<target>This is not a valid UUID.</target>
324+
</trans-unit>
321325
</body>
322326
</file>
323327
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.es.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,10 @@
318318
<source>Error</source>
319319
<target>Error</target>
320320
</trans-unit>
321+
<trans-unit id="83">
322+
<source>This is not a valid UUID.</source>
323+
<target>Este valor no es un UUID válido.</target>
324+
</trans-unit>
321325
</body>
322326
</file>
323327
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.eu.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,10 @@
282282
<source>Error</source>
283283
<target>Errore</target>
284284
</trans-unit>
285+
<trans-unit id="83">
286+
<source>This is not a valid UUID.</source>
287+
<target>Balio hau ez da onartutako UUID bat.</target>
288+
</trans-unit>
285289
</body>
286290
</file>
287291
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,10 @@
318318
<source>Error</source>
319319
<target>Erreur</target>
320320
</trans-unit>
321+
<trans-unit id="83">
322+
<source>This is not a valid UUID.</source>
323+
<target>Ceci n'est pas un UUID valide.</target>
324+
</trans-unit>
321325
</body>
322326
</file>
323327
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,10 @@
318318
<source>Error</source>
319319
<target>Hiba</target>
320320
</trans-unit>
321+
<trans-unit id="83">
322+
<source>This is not a valid UUID.</source>
323+
<target>Érvénytelen egyedi azonosító (UUID).</target>
324+
</trans-unit>
321325
</body>
322326
</file>
323327
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.it.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,10 @@
318318
<source>Error</source>
319319
<target>Errore</target>
320320
</trans-unit>
321+
<trans-unit id="83">
322+
<source>This is not a valid UUID.</source>
323+
<target>Questo non è un UUID valido.</target>
324+
</trans-unit>
321325
</body>
322326
</file>
323327
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,10 @@
314314
<source>Error</source>
315315
<target>Fout</target>
316316
</trans-unit>
317+
<trans-unit id="83">
318+
<source>This is not a valid UUID.</source>
319+
<target>Deze waarde is geen geldige UUID waarde.</target>
320+
</trans-unit>
317321
</body>
318322
</file>
319323
</xliff>

0 commit comments

Comments
 (0)
0