Clean up timezone selector

2025-02-03 09:46:40 -06:00
parent a1065fde83
commit 4a768d0358
1 changed files with 6 additions and 1 deletions
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -365,6 +365,11 @@ module LanguagesHelper
  end

  def timezone_options
-    ActiveSupport::TimeZone.all.map { |tz| [ tz.name + " (#{tz.tzinfo.identifier})", tz.tzinfo.identifier ] }
+    ActiveSupport::TimeZone.all
+      .sort_by { |tz| [ tz.utc_offset, tz.name ] }
+      .map do |tz|
+        name = tz.name.split(" - ").first.gsub(" (US & Canada)", "")
+        [ "(#{tz.formatted_offset}) #{name}", tz.tzinfo.identifier ]
+      end
  end
 end