Merge branch '5.0/update-legacy-timezones' into 5.0-trunk

bestpractical · Aug 30, 2023 · 19ded24 · 19ded24
2 parents 49c8a4b + f2fb3e7
commit 19ded24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
@@ -145,7 +145,7 @@ your server.
 
 =cut
 
-Set($Timezone, "US/Eastern");
+Set($Timezone, "America/New_York");
 
 =item C<@Plugins>
 

diff --git a/t/api/date.t b/t/api/date.t
@@ -415,7 +415,7 @@ my $year = (localtime(time))[5] + 1900;
     $date->Set(Format => 'unknown', Value => 'tomorrow 10am');
     is($date->ISO, '2012-06-15 06:00:00', "YYYY-DD-MM hh:mm:ss");
 
-    $current_user->UserObj->__Set( Field => 'Timezone', Value => 'US/Hawaii');
+    $current_user->UserObj->__Set( Field => 'Timezone', Value => 'Pacific/Honolulu');
 
     set_fixed_time("2012-06-14T20:10:00Z"); # 14th in UTC and Hawaii
     $date = RT::Date->new( $current_user );