[whimsy] branch master updated: change agenda minuted adjournment time to UTC

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 1ced49f  change agenda minuted adjournment time to UTC
     new a1ef69d  Merge pull request #103 from royfielding/fielding-01
1ced49f is described below

commit 1ced49f0e4e650bc739555fd72818f04924d491b
Author: Roy T. Fielding <fi...@gbiv.com>
AuthorDate: Thu Jul 16 15:40:47 2020 -0700

    change agenda minuted adjournment time to UTC
---
 www/board/agenda/models/minutes.rb                      | 10 ++--------
 www/board/agenda/spec/secretary_spec.rb                 |  2 +-
 www/board/agenda/test/data/board_minutes_2015_01_21.txt |  2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/www/board/agenda/models/minutes.rb b/www/board/agenda/models/minutes.rb
index c3ebf8e..d134b91 100755
--- a/www/board/agenda/models/minutes.rb
+++ b/www/board/agenda/models/minutes.rb
@@ -134,18 +134,12 @@ class Minutes
         if title =~ /Action Items/
           comments = notes.gsub(/\r\n/,"\n").gsub(/^/,'    ')
         elsif title == 'Adjournment'
-          if notes =~ /^1[01]:\d\d/
-            comments = "\n    Adjourned at #{notes} a.m. (Pacific)\n"
-          elsif notes =~ /^\d\d:\d\d/
-            comments = "\n    Adjourned at #{notes} p.m. (Pacific)\n"
-          else
-            comments += "\n" + notes.to_s.reflow(4,68) + "\n"
-          end
+          comments = "\n    Adjourned at #{notes} UTC\n"
         else
           comments += "\n" + notes.to_s.reflow(4,68) + "\n"
         end
       elsif title == 'Adjournment'
-        comments = "\n    Adjourned at ??:?? a.m. (Pacific)\n"
+        comments = "\n    Adjourned at ??:?? UTC\n"
       end
       [attach, title, comments]
     end
diff --git a/www/board/agenda/spec/secretary_spec.rb b/www/board/agenda/spec/secretary_spec.rb
index 0e9c0b1..9ffb344 100644
--- a/www/board/agenda/spec/secretary_spec.rb
+++ b/www/board/agenda/spec/secretary_spec.rb
@@ -83,7 +83,7 @@ feature 'report' do
       expect(draft).to include('@Sam: Is anyone on the PMC looking at the reminders?')
       expect(draft).to include('No report was submitted.')
       expect(draft).to include('was approved by Unanimous Vote of the directors present.')
-      expect(draft).to match(/Adjourned at \d+:\d\d [ap]\.m\. \(Pacific\)/)
+      expect(draft).to match(/Adjourned at \d+:\d\d UTC/)
 
       @agenda = 'board_agenda_2015_02_18.txt'
       @message = 'Draft minutes for 2015-02-18'
diff --git a/www/board/agenda/test/data/board_minutes_2015_01_21.txt b/www/board/agenda/test/data/board_minutes_2015_01_21.txt
index a549c20..df2ca9a 100644
--- a/www/board/agenda/test/data/board_minutes_2015_01_21.txt
+++ b/www/board/agenda/test/data/board_minutes_2015_01_21.txt
@@ -859,7 +859,7 @@
 
 13. Adjournment
 
-    Adjourned at 11:34 a.m. (Pacific)
+    Adjourned at 11:34 UTC
 
 ============
 ATTACHMENTS: