Skip to content

Commit

Permalink
release 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Eonasdan committed Jun 5, 2018
1 parent 839083d commit ed0b1fa
Show file tree
Hide file tree
Showing 7 changed files with 2,434 additions and 1,592 deletions.
4 changes: 2 additions & 2 deletions build/js/tempusdominus-core.js
Original file line number Diff line number Diff line change
Expand Up @@ -759,9 +759,9 @@ var DateTimePicker = function ($, moment) {
} else if (this._hasTimeZone()) {
// There is a string to parse and a default time zone
// parse with the tz function which takes a default time zone if it is not in the format string
returnMoment = moment.tz(d, this.parseFormats, this._options.useStrict, this._options.timeZone);
returnMoment = moment.tz(d, this.parseFormats, this._options.locale, this._options.useStrict, this._options.timeZone);
} else {
returnMoment = moment(d, this.parseFormats, this._options.useStrict);
returnMoment = moment(d, this.parseFormats, this._options.locale, this._options.useStrict);
}

if (this._hasTimeZone()) {
Expand Down
2 changes: 1 addition & 1 deletion build/js/tempusdominus-core.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tempusdominus/core",
"type": "component",
"version": "5.0.0-alpha17",
"version": "5.0.0",
"description": "Tempus Dominus core",
"keywords": [
"bootstrap",
Expand Down
Loading

0 comments on commit ed0b1fa

Please sign in to comment.