From 4a768d0358aba8f2d30b7ebdfef6d0734a504050 Mon Sep 17 00:00:00 2001
From: Josh Pigford <josh@joshpigford.com>
Date: Mon, 3 Feb 2025 09:46:40 -0600
Subject: [PATCH] Clean up timezone selector

---
 app/helpers/languages_helper.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 883bfad6..7ebf267e 100644
--- 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