From: Iskren Chernev <me@iskren.info>
Date: Sat, 23 Dec 2023 12:53:53 +0000 (+0200)
Subject: bugfix: weekyear setter handle dow
X-Git-Tag: 2.30.0~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6193%2Fhead;p=thirdparty%2Fmoment.git

bugfix: weekyear setter handle dow

Fixes #3944
---

diff --git a/src/lib/units/week-year.js b/src/lib/units/week-year.js
index 94e438994..585362c20 100644
--- 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
index fcc7e6323..b54d1b013 100644
--- 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