Correction de la gestion des traductions.

5880f3af · Guillaume Perréal · 7c50bb92 · 5880f3af
Commit 5880f3af authored 9 years ago by Guillaume Perréal
Hide whitespace changes
Inline Side-by-side

Showing

with 9 additions and 3 deletions
+9 -3
--- 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 = $();