Skip to content

Commit 7bf38fc

Browse files
committed
fix(datepicker): use localized default format if available (fixes mgcrea#76)
1 parent 0f85f8f commit 7bf38fc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/directives/datepicker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ angular.module('$strap.directives')
4646
link: function postLink(scope, element, attrs, controller) {
4747

4848
var options = config.datepicker || {},
49-
format = attrs.dateFormat || options.format || 'mm/dd/yyyy',
50-
language = attrs.language || options.language || 'en';
49+
language = attrs.language || options.language || 'en',
50+
format = attrs.dateFormat || options.format || ($.fn.datepicker.dates[language] && $.fn.datepicker.dates[language].format) || 'mm/dd/yyyy';
5151

5252
var dateFormatRegexp = isTouch ? 'yyyy/mm/dd' : regexpForDateFormat(format, language);
5353

0 commit comments

Comments
 (0)