Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Pôle IS
Bundles Symfony 2
file-upload-bundle
Commits
7ea45e0a
Commit
7ea45e0a
authored
Mar 24, 2015
by
Guillaume Perréal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correction du problème d'affichage des messages d'errreurs.
parent
801faf16
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
16 deletions
+27
-16
DependencyInjection/IrsteaFileUploadExtension.php
DependencyInjection/IrsteaFileUploadExtension.php
+1
-0
Form/Type/FileUploadType.php
Form/Type/FileUploadType.php
+1
-1
Resources/js/widget/file_upload.js
Resources/js/widget/file_upload.js
+8
-4
Resources/translations/file_upload.fr.yml
Resources/translations/file_upload.fr.yml
+8
-9
Resources/translations/messages.fr.yml
Resources/translations/messages.fr.yml
+0
-2
Resources/translations/validators.fr.yml
Resources/translations/validators.fr.yml
+9
-0
No files found.
DependencyInjection/IrsteaFileUploadExtension.php
View file @
7ea45e0a
...
...
@@ -49,6 +49,7 @@ class IrsteaFileUploadExtension extends Extension implements PrependExtensionInt
"
$pluginDir
/js/jquery.fileupload-ui.js"
,
"@BazingaJsTranslationBundle/Resources/js/translator.js"
,
'js/translations/file_upload/*.js'
,
'js/translations/validators/*.js'
,
'@IrsteaFileUploadBundle/Resources/js/widget/file_upload.js'
],
],
...
...
Form/Type/FileUploadType.php
View file @
7ea45e0a
...
...
@@ -143,7 +143,7 @@ class FileUploadType extends AbstractType
}
if
(
$options
[
'max_number_of_files'
])
{
$range
[
'max'
]
=
$options
[
'max_number_of_files'
];
$range
[
'maxMessage'
]
=
'file_upload.max
_n
umber
_of_f
iles'
;
$range
[
'maxMessage'
]
=
'file_upload.max
N
umber
OfF
iles'
;
}
if
(
!
empty
(
$range
))
{
$constraints
[]
=
new
Count
(
$range
);
...
...
Resources/js/widget/file_upload.js
View file @
7ea45e0a
...
...
@@ -60,13 +60,13 @@
error
=
''
;
if
(
counts
.
upload
>
0
)
{
error
=
Translator
.
trans
(
'
file_upload.running
_u
pload
'
);
error
=
Translator
.
trans
(
'
file_upload.running
U
pload
'
,
null
,
'
validators
'
);
}
else
if
(
counts
.
error
>
0
)
{
error
=
Translator
.
trans
(
'
file_upload.upload
_e
rror
'
);
error
=
Translator
.
trans
(
'
file_upload.upload
E
rror
'
,
null
,
'
validators
'
);
}
else
if
(
options
.
required
&&
counts
.
download
<
1
)
{
error
=
Translator
.
trans
(
'
file_upload.required
_file
'
);
error
=
Translator
.
trans
(
'
file_upload.required
'
,
null
,
'
validators
'
);
}
input
.
setCustomValidity
(
error
);
...
...
@@ -111,7 +111,11 @@
downloadTemplateId
:
null
,
filesContainer
:
$this
.
find
(
'
.fileinput-entries
'
),
dropZone
:
$this
,
i18n
:
Translator
.
trans
,
i18n
:
function
(
key
,
values
,
domain
)
{
return
Translator
.
trans
(
key
,
values
,
domain
||
'
file_upload
'
)
||
Translator
.
trans
(
'
file_upload.
'
+
key
,
values
,
'
validators
'
)
||
Translator
.
trans
(
key
,
values
,
'
messages
'
);
},
uploadTemplate
:
function
(
data
)
{
var
rows
=
$
();
$
.
each
(
data
.
files
,
function
(
index
,
file
)
{
...
...
Resources/translations/file_upload.fr.yml
View file @
7ea45e0a
'
file_size(%size%,%unit%)'
:
'
%size%
%unit%o'
unknownError
:
'
Erreur
inconnue'
maxNumberOfFiles
:
'
Nombre
maximum
de
fichiers
dépassé'
acceptFileTypes
:
'
Type
de
fichier
non
autorisé'
maxFileSize
:
'
Le
fichier
est
trop
grand'
minFileSize
:
'
Le
fichier
est
trop
petit'
'
Invalid
CSRF
Token'
:
'
Token
CSRF
invalide,
veuillez
recharger
la
page.'
'
Internal
server
error'
:
'
Erreur
interne
du
serveur'
form.description.placeholder
:
'
Description
facultative'
form.max_number_of_files(%num%)
:
'
%num%
fichiers
maximum'
form.min_file_size
:
'
Taille
minimale'
form.max_file_size
:
'
Taille
maximale'
form
:
description.placeholder
:
'
Description
facultative'
max_number_of_files(%num%)
:
'
%num%
fichiers
maximum'
min_file_size
:
'
Taille
minimale'
max_file_size
:
'
Taille
maximale'
Resources/translations/messages.fr.yml
View file @
7ea45e0a
button.upload
:
'
Ajouter
un
fichier'
file_upload.required
:
Fichier requis
UploadedFile
:
index
:
title
:
Liste des fichiers
...
...
Resources/translations/validators.fr.yml
0 → 100644
View file @
7ea45e0a
file_upload
:
required
:
'
Fichier
requis'
unknownError
:
'
Erreur
inconnue'
maxNumberOfFiles
:
'
Nombre
maximum
de
fichiers
dépassé'
acceptFileTypes
:
'
Type
de
fichier
non
autorisé'
maxFileSize
:
'
Le
fichier
est
trop
grand'
minFileSize
:
'
Le
fichier
est
trop
petit'
runningUpload
:
'
Un
téléchargement
est
en
cours.'
uploadError
:
'
Un
téléchargement
a
échoué.'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment