fix timezone selector

4 months ago · e130584fec
parent ade5c4832f
commit e130584fec
1 changed files with 4 additions and 1 deletions
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@ -14,7 +14,10 @@
          <div class="form-control">
            <%= ff.label :timezone, t('time_zone'), class: 'label' %>
            <%= ff.select :timezone, nil, {}, class: 'base-select' do %>
-              <%= time_zone_options_for_select(current_account.timezone) %>
+              <% tzinfo = TZInfo::Timezone.get(ActiveSupport::TimeZone::MAPPING[current_account.timezone] || current_account.timezone) %>
+              <% items = ActiveSupport::TimeZone.all.map { |z| [z.to_s, z.name] } %>
+              <% items.unshift(tzinfo) unless ActiveSupport::TimeZone.all.find { |e| e.tzinfo == tzinfo } %>
+              <%= options_for_select(items, current_account.timezone) %>
            <% end %>
          </div>
          <div class="form-control">