Update setting.rb

self.where(:name => name, :locale => (locale || I18n.locale)).first_or_initialize