Skip to content

Commit

Permalink
Merge pull request #1855 from IgniteUI/vslavov/regional-defaults-18.2
Browse files Browse the repository at this point in the history
#1842 - set regional defaults to "defaults" instead of "en-US" - 18.2
  • Loading branch information
kdinev authored Dec 4, 2018
2 parents eb24400 + 6408758 commit e7db5e7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/js/modules/infragistics.ui.editors.js
Original file line number Diff line number Diff line change
Expand Up @@ -11140,7 +11140,7 @@

//V.S. March 7th 2018 - #1358 if no regional option is provided and a global regional is set, uses the global one
if ($.datepicker && typeof reg === "string") {
if (reg === "defaults" || reg === "en-US") {
if (reg === "defaults") {
if (typeof $.ig.util.regional === "string" && $.ig.util.regional) {
abbreviation = $.ig.util.regional;
}
Expand Down
2 changes: 1 addition & 1 deletion src/js/modules/infragistics.ui.widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
$(".selector").%%WidgetName%%("option", "regional", "ja");
```
*/
regional: "en-US"
regional: "defaults"
},
_createWidget: function (options) {
this._userPreset = options;
Expand Down

0 comments on commit e7db5e7

Please sign in to comment.