diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-04 09:39:38 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-04 09:39:38 -0800 |
| commit | 5708648a77e8081d69e32ba827c8a909876dd3b9 (patch) | |
| tree | 6cd04fe001c3768134e61780df9c8a9bb19d9d74 /actionpack/lib/action_view | |
| parent | cf32a59ed6134d417503448c951b137aeceba81d (diff) | |
| parent | 6724c8c8879dc41a4cdffc507353d8a114ca8028 (diff) | |
| download | rails-5708648a77e8081d69e32ba827c8a909876dd3b9.tar.gz rails-5708648a77e8081d69e32ba827c8a909876dd3b9.tar.bz2 rails-5708648a77e8081d69e32ba827c8a909876dd3b9.zip | |
Merge pull request #4296 from kuroda/negative_format
Infer currency negative format from positive one.
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/number_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb index 3db1394df7..43122ef2ba 100644 --- a/actionpack/lib/action_view/helpers/number_helper.rb +++ b/actionpack/lib/action_view/helpers/number_helper.rb @@ -127,6 +127,7 @@ module ActionView defaults = I18n.translate(:'number.format', :locale => options[:locale], :default => {}) currency = I18n.translate(:'number.currency.format', :locale => options[:locale], :default => {}) + currency[:negative_format] ||= "-" + currency[:format] if currency[:format] defaults = DEFAULT_CURRENCY_VALUES.merge(defaults).merge!(currency) defaults[:negative_format] = "-" + options[:format] if options[:format] |