separate numeric value from suffix in File constraint's error message $uploadIniSizeErrorMessage

This commit is contained in:
Christian Raue 2012-05-11 16:14:27 +02:00
parent ff122d336c
commit 64101aba0a
37 changed files with 77 additions and 71 deletions

View File

@ -127,8 +127,8 @@
<target>Els dos valors haurien de ser iguals.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>L'arxiu és massa gran. El tamany màxim permés és {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>L'arxiu és massa gran. El tamany màxim permés és {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Tyto dvě hodnoty musí být stejné.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Soubor je příliš velký. Maximální povolená velikost souboru je {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Soubor je příliš velký. Maximální povolená velikost souboru je {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>De to værdier skal være ens.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Filen er for stor. Den maksimale størrelse er {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Filen er for stor. Den maksimale størrelse er {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Die beiden Werte sollten identisch sein.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Die Datei ist zu groß. Die maximal zulässige Größe beträgt {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Die Datei ist zu groß. Die maximal zulässige Größe beträgt {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>The two values should be equal.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>The file is too large. Allowed maximum size is {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Los dos valores deberían ser iguales.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>El archivo es demasiado grande. El tamaño máximo permitido es {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>El archivo es demasiado grande. El tamaño máximo permitido es {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Väärtused peaksid olema võrdsed.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Fail on liiga suur. Maksimaalne lubatud suurus on {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Fail on liiga suur. Maksimaalne lubatud suurus on {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Bi balioak berdinak izan beharko lirateke.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Fitxategia handiegia da. Baimendutako tamainu handiena {{ limit }} da.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Fitxategia handiegia da. Baimendutako tamainu handiena {{ limit }} {{ suffix }} da.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>دو مقدار باید برابر باشند.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>فایل بیش از اندازه بزرگ است. حداکثر اندازه مجاز برابر {{ limit }} است.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>فایل بیش از اندازه بزرگ است. حداکثر اندازه مجاز برابر {{ limit }} {{ suffix }} است.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Kahden annetun arvon tulee olla samat.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Annettu tiedosto on liian iso. Suurin sallittu tiedostokoko on {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Annettu tiedosto on liian iso. Suurin sallittu tiedostokoko on {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Les deux valeurs doivent être identiques.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Le fichier est trop volumineux. Sa taille ne doit pas dépasser {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Le fichier est trop volumineux. Sa taille ne doit pas dépasser {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>שני הערכים צריכים להיות שווים.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>הקובץ גדול מדי. הגודל המרבי המותר הוא {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>הקובץ גדול מדי. הגודל המרבי המותר הוא {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Obje vrijednosti trebaju biti jednake.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Ova datoteka je prevelika. Najveća dozvoljena veličina je {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Ova datoteka je prevelika. Najveća dozvoljena veličina je {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>A két értéknek azonosnak kell lennie.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>A fájl túl nagy. A megengedett maximális méret: {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>A fájl túl nagy. A megengedett maximális méret: {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Երկու արժեքները պետք է նույնը լինեն.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Ֆայլը չափազանց մեծ է: Մաքսիմալ թույլատրելի չափսը {{ limit }} է.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Ֆայլը չափազանց մեծ է: Մաքսիմալ թույլատրելի չափսը {{ limit }} {{ suffix }} է.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Isi keduanya harus sama.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Ukuran berkas terlalu besar. Ukuran maksimum yang diijinkan adalah {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Ukuran berkas terlalu besar. Ukuran maksimum yang diijinkan adalah {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>I due valori dovrebbero essere uguali.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Il file è troppo grande. La dimensione massima è {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Il file è troppo grande. La dimensione massima è {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -131,8 +131,8 @@
<target>値は有効な国名ではありません.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>ファイルのサイズが大きすぎます。有効な最大サイズは{{ limit }}です.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>ファイルのサイズが大きすぎます。有効な最大サイズは{{ limit }} {{ suffix }}です.</target>
</trans-unit>
<trans-unit id="34">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Béid Wäerter sollten identesch sinn.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>De fichier ass ze grouss. Déi maximal Gréisst dierf {{ limit }} net depasséieren.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>De fichier ass ze grouss. Déi maximal Gréisst dierf {{ limit }} {{ suffix }} net depasséieren.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Abi reikšmės turi būti identiškos.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Byla yra per didelė. Maksimalus dydis yra {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Byla yra per didelė. Maksimalus dydis yra {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Хоёр утгууд ижил байх ёстой.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Файл хэтэрхий том байна. Зөвшөөрөгдөх дээд хэмжээ нь {{ limit }} байна.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Файл хэтэрхий том байна. Зөвшөөрөгдөх дээд хэмжээ нь {{ limit }} {{ suffix }} байна.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>De to verdier skal være ens.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Filen er for stor. Den maksimale størrelse er {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Filen er for stor. Den maksimale størrelse er {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>De twee waarden moeten gelijk zijn.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Het bestand is te groot. Toegestane maximum grootte is {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Het bestand is te groot. Toegestane maximum grootte is {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Obie wartości powinny być równe.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Plik jest za duży. Maksymalny dozwolony rozmiar to {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Plik jest za duży. Maksymalny dozwolony rozmiar to {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Os dois valores deveriam ser iguais.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>O arquivo é muito grande ({{ size }}). O tamanho máximo permitido é de {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>O arquivo é muito grande. O tamanho máximo permitido é de {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Os dois valores devem ser iguais.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>O arquivo é muito grande. O tamanho máximo permitido é de {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>O arquivo é muito grande. O tamanho máximo permitido é de {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Cele două valori ar trebui să fie egale.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Fișierul este prea mare. Mărimea maximă permisă este {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Fișierul este prea mare. Mărimea maximă permisă este {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Оба значения должны быть одинаковыми.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Файл слишком большой. Максимальный допустимый размер {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Файл слишком большой. Максимальный допустимый размер {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Tieto dve hodnoty by mali byť rovnaké.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Súbor je príliš veľký. Maximálna povolená veľkosť je {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Súbor je príliš veľký. Maximálna povolená veľkosť je {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Vrednosti morata biti enaki.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Datoteka je prevelika. Največja dovoljena velikost je {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Datoteka je prevelika. Največja dovoljena velikost je {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Обе вредности треба да буду једнаке.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Датотека је превелика. Највећа дозвољена величина је {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Датотека је превелика. Највећа дозвољена величина је {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Obe vrednosti treba da budu jednake.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Datoteka je prevelika. Najveća dozvoljena veličina je {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Datoteka je prevelika. Najveća dozvoljena veličina je {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>Обидва занчення повинні бути одинаковими.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>Файл занадто великий. Максимальний допустимий розмір {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>Файл занадто великий. Максимальний допустимий розмір {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -127,8 +127,8 @@
<target>该两个变量的值应该相同.</target>
</trans-unit>
<trans-unit id="32">
<source>The file is too large. Allowed maximum size is {{ limit }}.</source>
<target>文件太大, 文件大小不可以超过 {{ limit }}.</target>
<source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source>
<target>文件太大, 文件大小不可以超过 {{ limit }} {{ suffix }}.</target>
</trans-unit>
<trans-unit id="33">
<source>The file is too large.</source>

View File

@ -27,7 +27,7 @@ class File extends Constraint
public $maxSizeMessage = 'The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.';
public $mimeTypesMessage = 'The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.';
public $uploadIniSizeErrorMessage = 'The file is too large. Allowed maximum size is {{ limit }}.';
public $uploadIniSizeErrorMessage = 'The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.';
public $uploadFormSizeErrorMessage = 'The file is too large.';
public $uploadPartialErrorMessage = 'The file was only partially uploaded.';
public $uploadNoFileErrorMessage = 'No file was uploaded.';

View File

@ -44,7 +44,10 @@ class FileValidator extends ConstraintValidator
case UPLOAD_ERR_INI_SIZE:
$maxSize = UploadedFile::getMaxFilesize();
$maxSize = $constraint->maxSize ? min($maxSize, $constraint->maxSize) : $maxSize;
$this->context->addViolation($constraint->uploadIniSizeErrorMessage, array('{{ limit }}' => $maxSize.' bytes'));
$this->context->addViolation($constraint->uploadIniSizeErrorMessage, array(
'{{ limit }}' => $maxSize,
'{{ suffix }}' => 'bytes',
));
return;
case UPLOAD_ERR_FORM_SIZE:

View File

@ -317,7 +317,10 @@ abstract class FileValidatorTest extends \PHPUnit_Framework_TestCase
);
if (class_exists('Symfony\Component\HttpFoundation\File\UploadedFile')) {
$tests[] = array(UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', array('{{ limit }}' => UploadedFile::getMaxFilesize() . ' bytes'));
$tests[] = array(UPLOAD_ERR_INI_SIZE, 'uploadIniSizeErrorMessage', array(
'{{ limit }}' => UploadedFile::getMaxFilesize(),
'{{ suffix }}' => 'bytes',
));
}
return $tests;