diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2019-10-12 00:39:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-12 00:39:28 +0200 |
| commit | 592222c4012c833ef8d8a1503988d7e478f68a46 (patch) | |
| tree | f884e6fac8732ef240cca8ee6b35d3a490c062cb | |
| parent | 91eae7d067be09d0aa6af3dd617a7aff4a66a9bb (diff) | |
| parent | ddaba23c9ab62feeedf94ce8c3b8f92c986da05f (diff) | |
Merge pull request #659 from weeman1337/feature/630-mo-first-day-of-week
Sets Monday as first day of the week
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | resources/assets/js/vendor.js | 7 | ||||
| -rw-r--r-- | yarn.lock | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/package.json b/package.json index 5a8a5a44..8a623a3b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "eonasdan-bootstrap-datetimepicker": "^4.17.47", "jquery": "^3.3.1", "jquery-ui": "^1.11.2", - "moment": "^2.8.2", + "moment": "^2.12.0", "moment-timezone": "^0.4.0", "select2": "^4.0.6-rc.1", "select2-bootstrap-theme": "0.1.0-beta.10" diff --git a/resources/assets/js/vendor.js b/resources/assets/js/vendor.js index bf3807f7..b4b6487d 100644 --- a/resources/assets/js/vendor.js +++ b/resources/assets/js/vendor.js @@ -10,6 +10,13 @@ require('./forms'); require('./sticky-headers'); require('./moment-countdown'); +moment.updateLocale('en', { + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. + } +}); + $.ajaxSetup({ headers: {'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')} }); @@ -3328,7 +3328,7 @@ moment-timezone@^0.4.0: dependencies: moment ">= 2.6.0" -"moment@>= 2.6.0", moment@^2.10, moment@^2.10.2, moment@^2.8.2: +"moment@>= 2.6.0", moment@^2.10, moment@^2.10.2, moment@^2.12.0: version "2.24.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== |