lib/fugit/nat.rb in fugit-1.1.5 vs lib/fugit/nat.rb in fugit-1.1.6
- old
+ new
@@ -126,10 +126,10 @@
def plain_day(i); rex(:plain_day, i, /day/i); end
def biz_day(i); rex(:biz_day, i, /(biz|business|week) *day/i); end
def name_day(i); rex(:name_day, i, /#{WEEKDAYS.reverse.join('|')}/i); end
def _tz_name(i)
- rex(nil, i, /[A-Z][a-zA-Z0-9]+(\/[A-Z][a-zA-Z0-9\_]+){0,2}/)
+ rex(nil, i, /[A-Z][a-zA-Z0-9+\-]+(\/[A-Z][a-zA-Z0-9+\-_]+){0,2}/)
end
def _tz_delta(i)
rex(nil, i, /[-+]([01][0-9]|2[0-4]):?(00|15|30|45)/)
end
def _tz(i); alt(:tz, i, :_tz_delta, :_tz_name); end