Browse Source

Fix #826: Extend language configuration to consider defaults

Kartik Visweswaran 8 years ago
parent
commit
04510d66ee
3 changed files with 3 additions and 2 deletions
  1. 2 1
      CHANGE.md
  2. 1 1
      js/fileinput.js
  3. 0 0
      js/fileinput.min.js

+ 2 - 1
CHANGE.md

@@ -3,7 +3,7 @@ Change Log: `bootstrap-fileinput`
 
 ## version 4.3.7
 
-**Date:** 28-Dec-2016
+**Date:** 30-Dec-2016
 
 1. (enh #812): Update Greek Translations.
 2. (enh #816): New property `msgFileTypes` to control descriptions/localizations of file types displayed.
@@ -12,6 +12,7 @@ Change Log: `bootstrap-fileinput`
 5. (enh #823): Correct file indices assignment during validation of images.
 6. (enh #824): Add Korean Translations.
 7. (bug #825): Correct `fileimagesresized` event triggering.
+8. (bug #826): Extend language configuration to consider defaults.
 
 ## version 4.3.6
 

+ 1 - 1
js/fileinput.js

@@ -3170,7 +3170,7 @@
         this.each(function () {
             var self = $(this), data = self.data('fileinput'), options = typeof option === 'object' && option,
                 theme = options.theme || self.data('theme'), l = {}, t = {},
-                lang = options.language || self.data('language') || 'en', opts;
+                lang = options.language || self.data('language') || $.fn.fileinput.defaults.language  || 'en', opts;
             if (!data) {
                 if (theme) {
                     t = $.fn.fileinputThemes[theme] || {};

File diff suppressed because it is too large
+ 0 - 0
js/fileinput.min.js


Some files were not shown because too many files changed in this diff