diff options
Diffstat (limited to 'rt/share/html/Elements/SelectTimezone')
| -rw-r--r-- | rt/share/html/Elements/SelectTimezone | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/rt/share/html/Elements/SelectTimezone b/rt/share/html/Elements/SelectTimezone index 5ff603e24..c77311e8f 100644 --- a/rt/share/html/Elements/SelectTimezone +++ b/rt/share/html/Elements/SelectTimezone @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -46,26 +46,18 @@ %# %# END BPS TAGGED BLOCK }}} <%ONCE> -my $HAS_DATETIME_TZ = eval { require DateTime::TimeZone }; -my $HAS_DATETIME = eval { require DateTime }; +use DateTime; -my (@names, %label); -if ( $HAS_DATETIME_TZ ) { - @names = DateTime::TimeZone->all_names; -} +my @names = DateTime::TimeZone->all_names; -if ( $HAS_DATETIME ) { - my $dt = DateTime->now; - for ( @names ) { - $dt->set_time_zone( $_ ); - $label{$_} = $_ . ' ' . $dt->strftime('%z'); - } +my %label; +my $dt = DateTime->now; +for ( @names ) { + $dt->set_time_zone( $_ ); + $label{$_} = $_ . ' ' . $dt->strftime('%z'); } </%ONCE> -% unless ( $HAS_DATETIME_TZ && @names ) { -<input type="text" name="<% $Name %>" value="<% $Default %>" /> -% } else { <select name="<% $Name %>"> % if ( $ShowNullOption ) { <option value=""><&|/l&>System Default</&></option> @@ -75,7 +67,6 @@ if ( $HAS_DATETIME ) { |n %> ><% $label{$tz} || $tz %></option> % } </select> -% } <%ARGS> $ShowNullOption => 1 $Name => undef |