Update to rails-i18n 0.5.2 and remove monkey patch
This commit is contained in:
parent
d0980087d1
commit
a48f2ac856
3 changed files with 4 additions and 16 deletions
2
Gemfile
2
Gemfile
|
@ -11,7 +11,7 @@ gem 'pg'
|
|||
gem 'jquery-rails'
|
||||
|
||||
# Load rails plugins
|
||||
gem 'rails-i18n', ">= 0.5.1"
|
||||
gem 'rails-i18n', ">= 0.5.2"
|
||||
gem 'dynamic_form'
|
||||
gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
|
||||
gem 'oauth-plugin', '>= 0.4.0.pre7'
|
||||
|
|
|
@ -109,7 +109,7 @@ GEM
|
|||
activesupport (= 3.2.2)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.2.2)
|
||||
rails-i18n (0.5.1)
|
||||
rails-i18n (0.5.2)
|
||||
i18n (~> 0.5)
|
||||
railties (3.2.2)
|
||||
actionpack (= 3.2.2)
|
||||
|
@ -121,7 +121,7 @@ GEM
|
|||
rake (0.9.2.2)
|
||||
rdoc (3.12)
|
||||
json (~> 1.4)
|
||||
redcarpet (2.1.0)
|
||||
redcarpet (2.1.1)
|
||||
rinku (1.5.1)
|
||||
ruby-openid (2.1.8)
|
||||
sanitize (2.0.3)
|
||||
|
@ -170,7 +170,7 @@ DEPENDENCIES
|
|||
paperclip (~> 2.0)
|
||||
pg
|
||||
rails (= 3.2.2)
|
||||
rails-i18n (>= 0.5.1)
|
||||
rails-i18n (>= 0.5.2)
|
||||
redcarpet
|
||||
rinku (>= 1.2.2)
|
||||
sanitize
|
||||
|
|
|
@ -1,17 +1,5 @@
|
|||
module I18n
|
||||
module Backend
|
||||
class Simple
|
||||
def init_translations_with_mn_cleanup
|
||||
init_translations_without_mn_cleanup
|
||||
|
||||
translations[:mn][:errors][:template].delete(:body)
|
||||
translations[:mn][:activemodel][:errors][:template].delete(:body)
|
||||
translations[:mn][:activerecord][:errors][:template].delete(:body)
|
||||
end
|
||||
|
||||
alias_method_chain :init_translations, :mn_cleanup
|
||||
end
|
||||
|
||||
module Fallbacks
|
||||
def find_first_string_or_lambda_default(defaults)
|
||||
defaults.each_with_index { |default, ix| return ix if default && !default.is_a?(Symbol) }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue