sidekiq 7.3.0 → 7.3.9

data/lib/sidekiq/web/application.rb

@@ -67,11 +67,15 @@ module Sidekiq
     end
 
     get "/metrics" do
+      x = params[:substr]
+      class_filter = (x.nil? || x == "") ? nil : Regexp.new(Regexp.escape(x), Regexp::IGNORECASE)
+
       q = Sidekiq::Metrics::Query.new
       @period = h((params[:period] || "")[0..1])
       @periods = METRICS_PERIODS
       minutes = @periods.fetch(@period, @periods.values.first)
-      @query_result = q.top_jobs(minutes: minutes)
+      @query_result = q.top_jobs(minutes: minutes, class_filter: class_filter)
+
       erb(:metrics)
     end
 
@@ -153,9 +157,15 @@ module Sidekiq
     end
 
     get "/morgue" do
-      @count = (params["count"] || 25).to_i
-      (@current_page, @total_size, @dead) = page("dead", params["page"], @count, reverse: true)
-      @dead = @dead.map { |msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
+      x = params[:substr]
+
+      if x && x != ""
+        @dead = search(Sidekiq::DeadSet.new, x)
+      else
+        @count = (params["count"] || 25).to_i
+        (@current_page, @total_size, @dead) = page("dead", params["page"], @count, reverse: true)
+        @dead = @dead.map { |msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
+      end
 
       erb(:morgue)
     end
@@ -174,7 +184,7 @@ module Sidekiq
     end
 
     post "/morgue" do
-      redirect(request.path) unless params["key"]
+      redirect(request.path) unless url_params("key")
 
       params["key"].each do |key|
         job = Sidekiq::DeadSet.new.fetch(*parse_params(key)).first
@@ -197,7 +207,7 @@ module Sidekiq
     end
 
     post "/morgue/:key" do
-      key = route_params[:key]
+      key = route_params(:key)
       halt(404) unless key
 
       job = Sidekiq::DeadSet.new.fetch(*parse_params(key)).first
@@ -207,9 +217,15 @@ module Sidekiq
     end
 
     get "/retries" do
-      @count = (params["count"] || 25).to_i
-      (@current_page, @total_size, @retries) = page("retry", params["page"], @count)
-      @retries = @retries.map { |msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
+      x = url_params("substr")
+
+      if x && x != ""
+        @retries = search(Sidekiq::RetrySet.new, x)
+      else
+        @count = (params["count"] || 25).to_i
+        (@current_page, @total_size, @retries) = page("retry", params["page"], @count)
+        @retries = @retries.map { |msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
+      end
 
       erb(:retries)
     end
@@ -262,9 +278,15 @@ module Sidekiq
     end
 
     get "/scheduled" do
-      @count = (params["count"] || 25).to_i
-      (@current_page, @total_size, @scheduled) = page("schedule", params["page"], @count)
-      @scheduled = @scheduled.map { |msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
+      x = params[:substr]
+
+      if x && x != ""
+        @scheduled = search(Sidekiq::ScheduledSet.new, x)
+      else
+        @count = (params["count"] || 25).to_i
+        (@current_page, @total_size, @scheduled) = page("schedule", params["page"], @count)
+        @scheduled = @scheduled.map { |msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
+      end
 
       erb(:scheduled)
     end
@@ -328,72 +350,6 @@ module Sidekiq
       json Sidekiq::Stats.new.queues
     end
 
-    ########
-    # Filtering
-
-    get "/filter/metrics" do
-      redirect "#{root_path}metrics"
-    end
-
-    post "/filter/metrics" do
-      x = params[:substr]
-      q = Sidekiq::Metrics::Query.new
-      @period = h((params[:period] || "")[0..1])
-      @periods = METRICS_PERIODS
-      minutes = @periods.fetch(@period, @periods.values.first)
-      @query_result = q.top_jobs(minutes: minutes, class_filter: Regexp.new(Regexp.escape(x), Regexp::IGNORECASE))
-
-      erb :metrics
-    end
-
-    get "/filter/retries" do
-      x = params[:substr]
-      return redirect "#{root_path}retries" unless x && x != ""
-
-      @retries = search(Sidekiq::RetrySet.new, params[:substr])
-      erb :retries
-    end
-
-    post "/filter/retries" do
-      x = params[:substr]
-      return redirect "#{root_path}retries" unless x && x != ""
-
-      @retries = search(Sidekiq::RetrySet.new, params[:substr])
-      erb :retries
-    end
-
-    get "/filter/scheduled" do
-      x = params[:substr]
-      return redirect "#{root_path}scheduled" unless x && x != ""
-
-      @scheduled = search(Sidekiq::ScheduledSet.new, params[:substr])
-      erb :scheduled
-    end
-
-    post "/filter/scheduled" do
-      x = params[:substr]
-      return redirect "#{root_path}scheduled" unless x && x != ""
-
-      @scheduled = search(Sidekiq::ScheduledSet.new, params[:substr])
-      erb :scheduled
-    end
-
-    get "/filter/dead" do
-      x = params[:substr]
-      return redirect "#{root_path}morgue" unless x && x != ""
-
-      @dead = search(Sidekiq::DeadSet.new, params[:substr])
-      erb :morgue
-    end
-
-    post "/filter/dead" do
-      x = params[:substr]
-      return redirect "#{root_path}morgue" unless x && x != ""
-
-      @dead = search(Sidekiq::DeadSet.new, params[:substr])
-      erb :morgue
-    end
-
     post "/change_locale" do
       locale = params["locale"]
 
@@ -428,7 +384,8 @@ module Sidekiq
           Rack::CONTENT_TYPE => "text/html",
           Rack::CACHE_CONTROL => "private, no-store",
           Web::CONTENT_LANGUAGE => action.locale,
-          Web::CONTENT_SECURITY_POLICY => process_csp(env, CSP_HEADER_TEMPLATE)
+          Web::CONTENT_SECURITY_POLICY => process_csp(env, CSP_HEADER_TEMPLATE),
+          Web::X_CONTENT_TYPE_OPTIONS => "nosniff"
         }
         # we'll let Rack calculate Content-Length for us.
         [200, headers, [resp]]

data/lib/sidekiq/web/helpers.rb

@@ -36,7 +36,7 @@ module Sidekiq
     # NB: keys and values are not escaped; do not allow user input
     # in the attributes
     private def html_tag(tagname, attrs)
-      s = "<#{tagname}"
+      s = +"<#{tagname}"
       attrs.each_pair do |k, v|
         next unless v
         s << " #{k}=\"#{v}\""
@@ -52,11 +52,11 @@ module Sidekiq
     end
 
     def strings(lang)
-      @strings ||= {}
+      @@strings ||= {}
 
       # Allow sidekiq-web extensions to add locale paths
       # so extensions can be localized
-      @strings[lang] ||= settings.locales.each_with_object({}) do |path, global|
+      @@strings[lang] ||= settings.locales.each_with_object({}) do |path, global|
         find_locale_files(lang).each do |file|
           strs = YAML.safe_load(File.read(file))
           global.merge!(strs[lang])
@@ -77,19 +77,19 @@ module Sidekiq
     end
 
     def clear_caches
-      @strings = nil
-      @locale_files = nil
-      @available_locales = nil
+      @@strings = nil
+      @@locale_files = nil
+      @@available_locales = nil
     end
 
     def locale_files
-      @locale_files ||= settings.locales.flat_map { |path|
+      @@locale_files ||= settings.locales.flat_map { |path|
         Dir["#{path}/*.yml"]
       }
     end
 
     def available_locales
-      @available_locales ||= Set.new(locale_files.map { |path| File.basename(path, ".yml") })
+      @@available_locales ||= Set.new(locale_files.map { |path| File.basename(path, ".yml") })
     end
 
     def find_locale_files(lang)
@@ -111,7 +111,7 @@ module Sidekiq
       if within.nil?
         ::Rack::Utils.escape_html(jid)
       else
-        "<a href='#{root_path}filter/#{within}?substr=#{jid}'>#{::Rack::Utils.escape_html(jid)}</a>"
+        "<a href='#{root_path}#{within}?substr=#{jid}'>#{::Rack::Utils.escape_html(jid)}</a>"
       end
     end
 
@@ -184,7 +184,8 @@ module Sidekiq
 
     # sidekiq/sidekiq#3243
     def unfiltered?
-      yield unless env["PATH_INFO"].start_with?("/filter/")
+      s = url_params("substr")
+      yield unless s && s.size > 0
     end
 
     def get_locale

data/lib/sidekiq/web/router.rb

@@ -39,10 +39,13 @@ module Sidekiq
       route(DELETE, path, &block)
     end
 
-    def route(method, path, &block)
+    def route(*methods, path, &block)
       @routes ||= {GET => [], POST => [], PUT => [], PATCH => [], DELETE => [], HEAD => []}
 
-      @routes[method] << WebRoute.new(method, path, block)
+      methods.each do |method|
+        method = method.to_s.upcase
+        @routes[method] << WebRoute.new(method, path, block)
+      end
     end
 
     def match(env)

data/lib/sidekiq/web.rb

@@ -40,14 +40,21 @@ module Sidekiq
       CONTENT_SECURITY_POLICY = "Content-Security-Policy"
       LOCATION = "Location"
       X_CASCADE = "X-Cascade"
+      X_CONTENT_TYPE_OPTIONS = "X-Content-Type-Options"
     else
       CONTENT_LANGUAGE = "content-language"
       CONTENT_SECURITY_POLICY = "content-security-policy"
       LOCATION = "location"
       X_CASCADE = "x-cascade"
+      X_CONTENT_TYPE_OPTIONS = "x-content-type-options"
     end
 
     class << self
+      # Forward compatibility with 8.0
+      def configure
+        yield self
+      end
+
       def settings
         self
       end
@@ -211,7 +218,7 @@ module Sidekiq
   Sidekiq::WebApplication.helpers WebHelpers
   Sidekiq::WebApplication.helpers Sidekiq::Paginator
 
-  Sidekiq::WebAction.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+  Sidekiq::WebAction.class_eval <<-RUBY, Web::LAYOUT, -1 # standard:disable Style/EvalWithLocation
     def _render
       #{ERB.new(File.read(Web::LAYOUT)).src}
     end

data/lib/sidekiq.rb

@@ -102,18 +102,19 @@ module Sidekiq
   def self.freeze!
     @frozen = true
     @config_blocks = nil
+    default_configuration.freeze!
   end
 
   # Creates a Sidekiq::Config instance that is more tuned for embedding
   # within an arbitrary Ruby process. Notably it reduces concurrency by
   # default so there is less contention for CPU time with other threads.
   #
-  #   inst = Sidekiq.configure_embed do |config|
+  #   instance = Sidekiq.configure_embed do |config|
   #     config.queues = %w[critical default low]
   #   end
-  #   inst.run
+  #   instance.run
   #   sleep 10
-  #   inst.stop
+  #   instance.stop
   #
   # NB: it is really easy to overload a Ruby process with threads due to the GIL.
   # I do not recommend setting concurrency higher than 2-3.

data/sidekiq.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "redis-client", ">= 0.22.2"
   gem.add_dependency "connection_pool", ">= 2.3.0"
   gem.add_dependency "rack", ">= 2.2.4"
-  gem.add_dependency "concurrent-ruby", "< 2"
   gem.add_dependency "logger"
+  gem.add_dependency "base64"
 end

data/web/assets/javascripts/dashboard-charts.js

@@ -83,6 +83,8 @@ class RealtimeChart extends DashboardChart {
     this.chart.data.datasets[1].data.push(failed);
     this.chart.update();
 
+    updateScreenReaderDashboardValues(processed, failed);
+
     updateStatsSummary(this.stats.sidekiq);
     updateRedisStats(this.stats.redis);
     updateFooterUTCTime(this.stats.server_utc_time);

data/web/assets/javascripts/dashboard.js

@@ -36,6 +36,12 @@ var ready = (callback) => {
   else document.addEventListener("DOMContentLoaded", callback);
 }
 
+var updateScreenReaderDashboardValues = function(processed, failed) {
+  let lastDashboardUpdateSpan = document.getElementById("sr-last-dashboard-update");
+  var updateText = document.getElementById("sr-last-dashboard-update-template").innerText;
+  lastDashboardUpdateSpan.innerText = updateText.replace("PROCESSED_COUNT", processed).replace("FAILED_COUNT", failed);
+}
+
 ready(() => {
   var sldr = document.getElementById('sldr');
   if (typeof localStorage.sidekiqTimeInterval !== 'undefined') {

data/web/assets/stylesheets/application.css

@@ -634,12 +634,8 @@ div.interval-slider input {
 .container {
   padding: 0;
 }
-.navbar-fixed-bottom {
-  position: relative;
-  top: auto;
-}
 @media (max-width: 767px) {
-  .navbar-fixed-top {
+  .navbar-fixed-top, .navbar-fixed-bottom {
     position: relative;
     top: auto;
   }
@@ -652,18 +648,23 @@ div.interval-slider input {
 
 @media (min-width: 768px) {
   .redis-url {
-    max-width: 250px;
+    max-width: 160px;
+  }
+
+  .navbar-fixed-bottom .nav {
+    margin-left: -15px;
+    margin-right: -15px;
   }
 }
 
 @media (min-width: 992px) {
   .redis-url {
-    max-width: 490px;
+    max-width: 380px;
   }
 }
 @media (min-width: 1200px) {
   .redis-url {
-    max-width: 600px;
+    max-width: 580px;
   }
 }
 

data/web/locales/en.yml

@@ -34,6 +34,8 @@ en:
   Jobs: Jobs
   Kill: Kill
   KillAll: Kill All
+  Language: Language
+  LastDashboardUpdateTemplateLiteral: "Latest poll: Processed: PROCESSED_COUNT. Failed: FAILED_COUNT."
   LastRetry: Last Retry
   Latency: Latency
   LivePoll: Live Poll
@@ -53,6 +55,7 @@ en:
   PeakMemoryUsage: Peak Memory Usage
   Plugins: Plugins
   PollingInterval: Polling interval
+  PollingIntervalMilliseconds: Polling interval milliseconds
   Process: Process
   Processed: Processed
   Processes: Processes
@@ -95,7 +98,6 @@ en:
   TotalExecutionTime: Total Execution Time
   AvgExecutionTime: Average Execution Time
   Context: Context
-  Bucket: Bucket
   NoJobMetricsFound: No recent job metrics were found
   Filter: Filter
   AnyJobContent: Any job content

data/web/locales/fr.yml

@@ -95,5 +95,4 @@ fr:
   TotalExecutionTime: Temps d'exécution total
   AvgExecutionTime: Temps d'exécution moyen
   Context: Contexte
-  Bucket: Bucket
   NoJobMetricsFound: Aucune statistique de tâche récente n'a été trouvée

data/web/locales/gd.yml

@@ -95,5 +95,4 @@ gd:
   TotalExecutionTime: Ùine iomlan nan gnìomhan
   AvgExecutionTime: Ùine cuibheasach nan gnìomhan
   Context: Co-theacsa
-  Bucket: Bucaid
   NoJobMetricsFound: Cha deach meatraigeachd o chionn goirid air obair a lorg

data/web/locales/it.yml

@@ -6,44 +6,60 @@ it:
   AreYouSureDeleteJob: Sei sicuro di voler cancellare questo lavoro?
   AreYouSureDeleteQueue: Sei sicuro di voler cancellare la coda %{queue}?
   Arguments: Argomenti
+  BackToApp: Torna all'App
   Busy: Occupato
   Class: Classe
   Connections: Connessioni
+  CreatedAt: Creato il
   CurrentMessagesInQueue: Messaggi in <span class='title'>%{queue}</span>
   Dashboard: Dashboard
   Dead: Arrestato
   DeadJobs: Lavori arrestati
   Delete: Cancella
   DeleteAll: Cancella tutti
+  Deploy: Distribuire
   Enqueued: In coda
   Error: Errore
   ErrorBacktrace: Backtrace dell'errore
   ErrorClass: Classe dell'errore
   ErrorMessage: Messaggio di errore
+  ExecutionTime: Tempo di esecuzione
   Extras: Extra
   Failed: Fallito
   Failures: Fallimenti
+  Failure: Fallimento
   GoBack: ← Indietro
   History: Storia
   Job: Lavoro
   Jobs: Lavori
   Kill: Uccidere
+  KillAll: Uccidere tutti
   LastRetry: Ultimo tentativo
+  Latency: Latenza
   LivePoll: Live poll
   MemoryUsage: Memoria utilizzata
+  Name: Nome
   Namespace: Namespace
   NextRetry: Prossimo tentativo
   NoDeadJobsFound: Non ci sono lavori arrestati
   NoRetriesFound: Non sono stati trovati nuovi tentativi
   NoScheduledFound: Non ci sono lavori pianificati
+  NotYetEnqueued: Non ancora in coda
   OneMonth: 1 mese
   OneWeek: 1 settimana
   OriginallyFailed: Primo fallimento
+  Pause: Metti in pausa
+  Paused: In pausa
   PeakMemoryUsage: Memoria utilizzata (max.)
+  Plugins: Plugins
+  PollingInterval: Intervallo di polling
+  Process: Processo
   Processed: Processato
   Processes: Processi
   Queue: Coda
   Queues: Code
+  Quiet: Silenzia
+  QuietAll: Silenzia Tutti
   Realtime: Tempo reale
   Retries: Nuovi tentativi
   RetryAll: Riprova tutti
@@ -51,19 +67,34 @@ it:
   RetryNow: Riprova
   Scheduled: Pianificato
   ScheduledJobs: Lavori pianificati
+  Seconds: Secondi
   ShowAll: Mostra tutti
   SixMonths: 6 mesi
   Size: Dimensione
   Started: Iniziato
   Status: Stato
+  Stop: Ferma
+  StopAll: Ferma Tutti
   StopPolling: Ferma il polling
+  Success: Successo
+  Summary: Riepilogo
   Thread: Thread
-  Threads: Thread
+  Threads: Threads
   ThreeMonths: 3 mesi
   Time: Ora
+  Unpause: Riattiva
   Uptime: Uptime (giorni)
+  Utilization: Utilizzo
   Version: Versione
   When: Quando
   Worker: Lavoratore
   active: attivo
   idle: inattivo
+  Metrics: Metriche
+  NoDataFound: Nessun dato trovato
+  TotalExecutionTime: Tempo totale di esecuzione
+  AvgExecutionTime: Tempo medio di esecuzione
+  Context: Contesto
+  NoJobMetricsFound: Metriche recenti di lavoro non trovate
+  Filter: Filtro
+  AnyJobContent: Qualsiasi contenuto di lavoro

data/web/locales/ja.yml

@@ -87,5 +87,4 @@ ja:
   TotalExecutionTime: 合計実行時間
   AvgExecutionTime: 平均実行時間
   Context: コンテキスト
-  Bucket: バケット
   NoJobMetricsFound: 直近のジョブメトリクスが見つかりませんでした

data/web/locales/pt-br.yml

@@ -7,7 +7,6 @@
   Arguments: Argumentos
   AvgExecutionTime: Tempo médio de execução
   BackToApp: De volta ao aplicativo
-  Bucket: Bucket
   Busy: Ocupados
   Class: Classe
   Connections: Conexões
@@ -93,4 +92,4 @@
   Utilization: Utilização
   Version: Versão
   When: Quando
-  Worker: Trabalhador
+  Worker: Trabalhador

data/web/locales/tr.yml

@@ -4,7 +4,7 @@ tr:
   AddToQueue: Kuyruğa ekle
   AreYouSure: Emin misiniz?
   AreYouSureDeleteJob: Bu işi silmek istediğinizden emin misiniz?
-  AreYouSureDeleteQueue: %{queue} kuyruğunu silmek istediğinizden emin misiniz?
+  AreYouSureDeleteQueue: "%{queue} kuyruğunu silmek istediğinizden emin misiniz?"
   Arguments: Argümanlar
   BackToApp: Uygulamaya geri dön
   Busy: Meşgul
@@ -95,7 +95,6 @@ tr:
   TotalExecutionTime: Toplam Yürütme Süresi
   AvgExecutionTime: Ortalama Yürütme Süresi
   Context: Bağlam
-  Bucket: Kova
   NoJobMetricsFound: Son iş metrikleri bulunamadı
   Filter: Filtre
   AnyJobContent: Herhangi bir iş içeriği

data/web/locales/uk.yml

@@ -6,31 +6,39 @@ uk:
   AreYouSureDeleteJob: Ви впевнені у тому, що хочете видалити задачу?
   AreYouSureDeleteQueue: Ви впевнені у тому, що хочете видалити чергу %{queue}?
   Arguments: Аргументи
+  BackToApp: Назад
   Busy: Зайнятих
   Class: Клас
   Connections: З'єднань
+  CreatedAt: Створено
   CurrentMessagesInQueue: Поточні задачі у черзі <span class='title'>%{queue}</span>
   Dashboard: Панель керування
   Dead: Вбитих
   DeadJobs: Вбиті задачі
   Delete: Видалити
   DeleteAll: Видалити усі
+  Deploy: Деплой
   Enqueued: У черзі
   Error: Помилка
   ErrorBacktrace: Трасування помилки
   ErrorClass: Клас помилки
   ErrorMessage: Повідомлення про помилку
+  ExecutionTime: Час виконання
   Extras: Додатково
   Failed: Невдалих
   Failures: Невдачі
+  Failure: Невдача
   GoBack: ← Назад
   History: Історія
   Job: Задача
   Jobs: Задачі
-  Kill: Вбиваємо
+  Kill: Вбити
+  KillAll: Вбити все
   LastRetry: Остання спроба
+  Latency: Затримка
   LivePoll: Постійне опитування
   MemoryUsage: Використання пам'яті
+  Name: Назва
   Namespace: Простір імен
   NextRetry: Наступна спроба
   NoDeadJobsFound: Вбитих задач не знайдено
@@ -40,10 +48,12 @@ uk:
   OneMonth: 1 місяць
   OneWeek: 1 тиждень
   OriginallyFailed: Перша невдала спроба
+  Pause: Призупинити
   Paused: Призупинено
   PeakMemoryUsage: Максимальне використання пам'яті
   Plugins: Плагіни
   PollingInterval: Інтервал опитування
+  Process: Процес
   Processed: Опрацьовано
   Processes: Процеси
   Queue: Черга
@@ -57,6 +67,7 @@ uk:
   RetryNow: Повторити зараз
   Scheduled: Заплановано
   ScheduledJobs: Заплановані задачі
+  Seconds: Секунди
   ShowAll: Відобразити усі
   SixMonths: 6 місяців
   Size: Розмір
@@ -65,13 +76,25 @@ uk:
   Stop: Зупинити
   StopAll: Зупинити усі
   StopPolling: Зупинити опитування
+  Success: Успіх
+  Summary: Підсумок
   Thread: Потік
   Threads: Потоки
   ThreeMonths: 3 місяці
   Time: Час
+  Unpause: Відновити
   Uptime: Днів безперебійної роботи
+  Utilization: Утилізація
   Version: Версія
   When: Коли
   Worker: Обробник
   active: активний
   idle: незайнятий
+  Metrics: Метрики
+  NoDataFound: Даних не знайдено
+  TotalExecutionTime: Загальний час виконання
+  AvgExecutionTime: Середній час виконання
+  Context: Контекст
+  NoJobMetricsFound: Недавніх метрик задачі не знайдено
+  Filter: Фільтр
+  AnyJobContent: Будь-який атрибут задачі

data/web/locales/zh-cn.yml

@@ -89,7 +89,6 @@ zh-cn: # <---- change this to your locale code
   TotalExecutionTime: 总执行时间
   AvgExecutionTime: 平均执行时间
   Context: 上下文
-  Bucket: 桶
   NoJobMetricsFound: 无任务相关指标数据
   Success: 成功
   Failure: 失败

data/web/locales/zh-tw.yml

@@ -98,5 +98,4 @@ zh-tw: # <---- change this to your locale code
   TotalExecutionTime: 總執行時間
   AvgExecutionTime: 平均執行時間
   Context: 上下文
-  Bucket: 桶
   NoJobMetricsFound: 找無工作相關計量資料

data/web/views/_footer.erb

@@ -17,8 +17,7 @@
           <li>
             <form id="locale-form" class="form-inline" action="<%= root_path %>change_locale" method="post">
               <%= csrf_tag %>
-              <label class="sr-only" for="locale">Language</label>
-              <select id="locale-select" class="form-control" name="locale">
+              <select id="locale-select" class="form-control" aria-label="<%= t("Language") %>" name="locale">
                 <% available_locales.each do |locale_option| %>
                   <% if locale_option == locale %>
                     <option selected value="<%= locale_option %>"><%= locale_option %></option>