Merge pull request #103 from royfielding/fielding-01
change agenda minuted adjournment time to UTC
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 @@
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 @@
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:
