aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorSven Fuchs <svenfuchs@artweb-design.de>2008-07-02 19:21:07 +0200
committerSven Fuchs <svenfuchs@artweb-design.de>2008-07-02 19:21:07 +0200
commit8f74ba96c47e77e18ce363c8e7cd2fc9196faf7a (patch)
treed3ea17f604e93db745ee74ee21dc7cafa76bc81d /actionpack/lib
parent7403c825a05af320e20f1b7e20b0c565081ede89 (diff)
downloadrails-8f74ba96c47e77e18ce363c8e7cd2fc9196faf7a.tar.gz
rails-8f74ba96c47e77e18ce363c8e7cd2fc9196faf7a.tar.bz2
rails-8f74ba96c47e77e18ce363c8e7cd2fc9196faf7a.zip
remove core extensions in favor of I18n#translate and I18n#localize
Diffstat (limited to 'actionpack/lib')
-rwxr-xr-xactionpack/lib/action_view/helpers/date_helper.rb5
-rw-r--r--actionpack/lib/action_view/helpers/number_helper.rb2
2 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 6ac4171fd5..d306c7a742 100755
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -512,7 +512,8 @@ module ActionView
else
month_options = []
month_names = options[:use_month_names] || begin
- (options[:use_short_month] ? :'date.abbr_month_names' : :'date.month_names').t locale
+ key = options[:use_short_month] ? :'date.abbr_month_names' : :'date.month_names'
+ I18n.translate key, locale
end
month_names.unshift(nil) if month_names.size < 13
@@ -632,7 +633,7 @@ module ActionView
position = { :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6 }
- order = options[:order] ||= :'date.order'.t(locale)
+ order = options[:order] ||= I18n.translate(:'date.order', locale)
# Discard explicit and implicit by not being included in the :order
discard = {}
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 3e0d5b1db4..981589437d 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -70,7 +70,7 @@ module ActionView
# # => 1234567890,50 &pound;
def number_to_currency(number, options = {})
options = options.symbolize_keys
- defaults = :'currency.format'.t(options[:locale]) || {}
+ defaults = I18n.translate(:'currency.format', options[:locale]) || {}
precision = options[:precision] || defaults[:precision]
unit = options[:unit] || defaults[:unit]