lib/et-orbi/make.rb in et-orbi-1.2.5 vs lib/et-orbi/make.rb in et-orbi-1.2.6
- old
+ new
@@ -84,11 +84,11 @@
def make_from_time(t, zone)
z =
zone ||
get_as_tzone(t) ||
- get_tzone(t.zone) ||
- get_local_tzone(t)
+ get_local_tzone(t) ||
+ get_tzone(t.zone)
z ||= t.zone
# pass the abbreviation anyway,
# it will be used in the resulting error message