Merge pull request #6193 from moment:fix-locale-week-year

[bugfix] weekyear setter handle dow
moment · Dec 23, 2023 · 50af8c2 · 50af8c2
2 parents 5718d97 + 6767277
commit 50af8c2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/lib/units/week-year.js b/src/lib/units/week-year.js
@@ -69,7 +69,7 @@ export function getSetWeekYear(input) {
  this,
  input,
  this.week(),
- this.weekday(),
+ this.weekday() + this.localeData()._week.dow,
  this.localeData()._week.dow,
  this.localeData()._week.doy
  );

diff --git a/src/test/moment/week_year.js b/src/test/moment/week_year.js
@@ -62,6 +62,14 @@ test('week year', function (assert) {
  assert.equal(moment([2008, 11, 29]).weekYear(), 2009);
  assert.equal(moment([2009, 11, 27]).weekYear(), 2009);
  assert.equal(moment([2009, 11, 28]).weekYear(), 2010);
+
+ moment.locale('dow:1 doy:4', { week: { dow: 1, doy: 4 } });
+ assert.equal(moment([2015, 11, 27]).locale('dow:1 doy:4').weekYear(), 2015);
+ assert.equal(
+ moment([2015, 11, 27]).locale('dow:1 doy:4').weekYear(2015).date(),
+ 27
+ );
+ moment.defineLocale('dow:1 doy:4', null);
 });
 
 // Verifies that the week number, week day computation is correct for all dow, doy combinations