From 5880f3af210d3bfee21e11f6439f1c15fb8f0b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr>
Date: Wed, 13 Apr 2016 13:56:32 +0200
Subject: [PATCH] Correction de la gestion des traductions.
---
Resources/js/widget/file_upload.js | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/Resources/js/widget/file_upload.js b/Resources/js/widget/file_upload.js
index 0e200a12..2d490895 100644
--- a/Resources/js/widget/file_upload.js
+++ b/Resources/js/widget/file_upload.js
@@ -112,9 +112,15 @@
filesContainer: $this.find('.fileinput-entries'),
dropZone: $this,
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');
+ var res = Translator.trans(key, values, domain || 'file_upload');
+ if (res !== key) {
+ return res;
+ }
+ res = Translator.trans('file_upload.'+ key, values, 'validators');
+ if (res !== 'file_upload.'+ key) {
+ return res;
+ }
+ return Translator.trans(key, values, 'messages');
},
uploadTemplate: function (data) {
var rows = $();
--
GitLab