diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-23 16:16:46 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-23 16:16:46 +0200 |
| commit | 7424f3aef6ecdb1b62f4ab4ff0d23ade9011ad77 (patch) | |
| tree | e9cf72f3d6813d564baa9c286d0461afd0a27b34 /core/js | |
| parent | 707bd68bb4e77b4184b578699d508750653e2d42 (diff) | |
| parent | ab944094e2c0c9d063cc363a81dbe517c259a466 (diff) | |
| download | nextcloud-server-7424f3aef6ecdb1b62f4ab4ff0d23ade9011ad77.tar.gz nextcloud-server-7424f3aef6ecdb1b62f4ab4ff0d23ade9011ad77.zip | |
merge master into filesystem
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 4 | ||||
| -rw-r--r-- | core/js/share.js | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/core/js/js.js b/core/js/js.js index ba8020c89ed..c5e32f3c278 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -667,9 +667,7 @@ function formatDate(date){ if(typeof date=='number'){ date=new Date(date); } - var monthNames = [ t('files','January'), t('files','February'), t('files','March'), t('files','April'), t('files','May'), t('files','June'), - t('files','July'), t('files','August'), t('files','September'), t('files','October'), t('files','November'), t('files','December') ]; - return monthNames[date.getMonth()]+' '+date.getDate()+', '+date.getFullYear()+', '+((date.getHours()<10)?'0':'')+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes(); + return $.datepicker.formatDate(datepickerFormatDate, date)+' '+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes(); } /** diff --git a/core/js/share.js b/core/js/share.js index de50e53a441..1bc8f555680 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -343,6 +343,14 @@ OC.Share={ } $(document).ready(function() { + $.datepicker.setDefaults({ + monthNames: monthNames, + monthNamesShort: $.map(monthNames, function(v) { return v.slice(0,3)+'.'; }), + dayNames: dayNames, + dayNamesMin: $.map(dayNames, function(v) { return v.slice(0,2); }), + dayNamesShort: $.map(dayNames, function(v) { return v.slice(0,3)+'.'; }), + firstDay: firstDay + }); $('a.share').live('click', function(event) { event.stopPropagation(); |