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
This commit is contained in:
commit
a97a6175ba
@ -38,9 +38,10 @@ class FirePHPHandler extends BaseFirePHPHandler
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $event->getRequest()->headers->get('User-Agent'))
|
$request = $event->getRequest();
|
||||||
&& !$event->getRequest()->headers->has('X-FirePHP-Version')) {
|
if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $request->headers->get('User-Agent'))
|
||||||
$this->sendHeaders = false;
|
&& !$request->headers->has('X-FirePHP-Version')) {
|
||||||
|
self::$sendHeaders = false;
|
||||||
$this->headers = array();
|
$this->headers = array();
|
||||||
|
|
||||||
return;
|
return;
|
||||||
@ -58,7 +59,7 @@ class FirePHPHandler extends BaseFirePHPHandler
|
|||||||
*/
|
*/
|
||||||
protected function sendHeader($header, $content)
|
protected function sendHeader($header, $content)
|
||||||
{
|
{
|
||||||
if (!$this->sendHeaders) {
|
if (!self::$sendHeaders) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,6 +70,7 @@
|
|||||||
.sf-toolbarreset svg,
|
.sf-toolbarreset svg,
|
||||||
.sf-toolbarreset img {
|
.sf-toolbarreset img {
|
||||||
height: 20px;
|
height: 20px;
|
||||||
|
width: 20px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ class GetResponseEvent extends KernelEvent
|
|||||||
/**
|
/**
|
||||||
* Returns the response object.
|
* Returns the response object.
|
||||||
*
|
*
|
||||||
* @return Response
|
* @return Response|null
|
||||||
*/
|
*/
|
||||||
public function getResponse()
|
public function getResponse()
|
||||||
{
|
{
|
||||||
|
@ -144,6 +144,7 @@ class PluralizationRules
|
|||||||
case 'bs':
|
case 'bs':
|
||||||
case 'hr':
|
case 'hr':
|
||||||
case 'ru':
|
case 'ru':
|
||||||
|
case 'sh':
|
||||||
case 'sr':
|
case 'sr':
|
||||||
case 'uk':
|
case 'uk':
|
||||||
return ((1 == $number % 10) && (11 != $number % 100)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
|
return ((1 == $number % 10) && (11 != $number % 100)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
|
||||||
|
@ -302,6 +302,10 @@
|
|||||||
<source>An empty file is not allowed.</source>
|
<source>An empty file is not allowed.</source>
|
||||||
<target>No està permès un fixter buit.</target>
|
<target>No està permès un fixter buit.</target>
|
||||||
</trans-unit>
|
</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>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
@ -318,6 +318,10 @@
|
|||||||
<source>Error</source>
|
<source>Error</source>
|
||||||
<target>Fehler</target>
|
<target>Fehler</target>
|
||||||
</trans-unit>
|
</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>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
@ -318,6 +318,10 @@
|
|||||||
<source>Error</source>
|
<source>Error</source>
|
||||||
<target>Error</target>
|
<target>Error</target>
|
||||||
</trans-unit>
|
</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>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
@ -318,6 +318,10 @@
|
|||||||
<source>Error</source>
|
<source>Error</source>
|
||||||
<target>Error</target>
|
<target>Error</target>
|
||||||
</trans-unit>
|
</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>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
@ -282,6 +282,10 @@
|
|||||||
<source>Error</source>
|
<source>Error</source>
|
||||||
<target>Errore</target>
|
<target>Errore</target>
|
||||||
</trans-unit>
|
</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>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
@ -318,6 +318,10 @@
|
|||||||
<source>Error</source>
|
<source>Error</source>
|
||||||
<target>Erreur</target>
|
<target>Erreur</target>
|
||||||
</trans-unit>
|
</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>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
@ -318,6 +318,10 @@
|
|||||||
<source>Error</source>
|
<source>Error</source>
|
||||||
<target>Hiba</target>
|
<target>Hiba</target>
|
||||||
</trans-unit>
|
</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>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
@ -318,6 +318,10 @@
|
|||||||
<source>Error</source>
|
<source>Error</source>
|
||||||
<target>Errore</target>
|
<target>Errore</target>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
|
<trans-unit id="83">
|
||||||
|
<source>This is not a valid UUID.</source>
|
||||||
|
<target>Questo non è un UUID valido.</target>
|
||||||
|
</trans-unit>
|
||||||
</body>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
@ -314,6 +314,10 @@
|
|||||||
<source>Error</source>
|
<source>Error</source>
|
||||||
<target>Fout</target>
|
<target>Fout</target>
|
||||||
</trans-unit>
|
</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>
|
</body>
|
||||||
</file>
|
</file>
|
||||||
</xliff>
|
</xliff>
|
||||||
|
Reference in New Issue
Block a user