Fix #wday_in_month for floraison/fugit#67

floraison/fugit#67
floraison · Mar 9, 2022 · 0954c4d · 0954c4d
1 parent f9701f3
commit 0954c4d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ## et-orbi 1.2.7  not yet released
 
+- Fix the wday_in_month computation for floraison/fugit#67
+
 
 ## et-orbi 1.2.6  released 2021-10-30
 

diff --git a/lib/et-orbi/time.rb b/lib/et-orbi/time.rb
@@ -326,7 +326,8 @@ def localtime(zone=nil)
 
     def wday_in_month
 
-      [ count_weeks(-1), - count_weeks(1) ]
+      [ count_weeks(EtOrbi.make_time(strftime('%F 12:00:00 %/Z')), -1),
+        - count_weeks(EtOrbi.make_time(strftime('%F 12:00:00 %/Z')) , 1) ]
     end
 
     def rweek
@@ -385,10 +386,11 @@ def to_time
       @time ||= @zone.utc_to_local(utc)
     end
 
-    def count_weeks(dir)
+    def count_weeks(start, dir)
 
       c = 0
-      t = self
+      t = start
+
       until t.month != self.month
         c += 1
         t += dir * (7 * 24 * 3600)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,6 +4,8 @@

		## et-orbi 1.2.7 not yet released

		- Fix the wday_in_month computation for floraison/fugit#67


		## et-orbi 1.2.6 released 2021-10-30

Expand Down