Skip to content

Commit c186d30

Browse files
committed
Merge branch 'master' of github.com:victorjonsson/jQuery-Form-Validator
2 parents 6e4d689 + 68269bb commit c186d30

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

jquery.formvalidator.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
if (settings)
9191
$.extend(config, settings);
9292
if (language)
93-
$.extend(language, jQueryFormUtils.LANG);
93+
$.extend(jQueryFormUtils.LANG,language);
9494
else
9595
language = jQueryFormUtils.LANG;
9696

@@ -156,7 +156,7 @@
156156
if (settings)
157157
$.extend(config, settings);
158158
if (language)
159-
$.extend(language, jQueryFormUtils.LANG);
159+
$.extend(jQueryFormUtils.LANG, language);
160160
else
161161
language = jQueryFormUtils.LANG;
162162

0 commit comments

Comments
 (0)