Use Mobility.locale in QueryBuilder

shioyama · May 4, 2018 · 4d9528d · 4d9528d
1 parent c73d0f1
commit 4d9528d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/mobility/plugins/active_record/query.rb b/lib/mobility/plugins/active_record/query.rb
@@ -25,7 +25,7 @@ def #{Mobility.query_method}
 
  module QueryExtension
  def where!(opts, *rest)
- QueryBuilder.build(self, opts, Mobility.locale) do |opts|
+ QueryBuilder.build(self, opts) do |opts|
  opts ? super(opts) : super
  end
  end
@@ -36,17 +36,18 @@ def where(opts = :chain, *rest)
 
  class WhereChain < ::ActiveRecord::QueryMethods::WhereChain
  def not(opts, *rest)
- QueryBuilder.build(@scope, opts, Mobility.locale, invert: true) do |opts|
+ QueryBuilder.build(@scope, opts, invert: true) do |opts|
  opts ? super(opts) : super
  end
  end
  end
 
  module QueryBuilder
  class << self
- def build(scope, opts, locale, invert: false)
+ def build(scope, opts, invert: false)
  return yield unless Hash === opts
 
+ locale = Mobility.locale
  opts = opts.with_indifferent_access
  keys = opts.keys.map &:to_s
  predicates = []