Fallback to :en locale instead of handling a constant with defaults

Action Pack already comes with a default locale fine for :en, that is
always loaded. We can just fallback to this locale for defaults, if
values for the current locale cannot be found.

Closes #4420, #2802, #2890.

2 files changed, 38 insertions, 3 deletions

diff --git a/activesupport/test/number_helper_i18n_test.rb b/activesupport/test/number_helper_i18n_test.rb
index e07198027b..4d0d5e8631 100644
--- a/activesupport/test/number_helper_i18n_test.rb
+++ b/activesupport/test/number_helper_i18n_test.rb
@@ -72,11 +72,24 @@ module ActiveSupport
       assert_equal("1.00", number_to_rounded(1.0, :locale => 'ts'))
     end
 
+    def test_number_with_i18n_precision_and_empty_i18n_store
+      I18n.backend.store_translations 'empty', {}
+
+      assert_equal("123456789.123", number_to_rounded(123456789.123456789, :locale => 'empty'))
+      assert_equal("1.000", number_to_rounded(1.0000, :locale => 'empty'))
+    end
+
     def test_number_with_i18n_delimiter
       #Delimiter "," and separator "."
       assert_equal("1,000,000.234", number_to_delimited(1000000.234, :locale => 'ts'))
     end
 
+    def test_number_with_i18n_delimiter_and_empty_i18n_store
+      I18n.backend.store_translations 'empty', {}
+
+      assert_equal("1,000,000.234", number_to_delimited(1000000.234, :locale => 'empty'))
+    end
+
     def test_number_to_i18n_percentage
       # to see if strip_insignificant_zeros is true
       assert_equal("1%", number_to_percentage(1, :locale => 'ts'))
@@ -86,12 +99,27 @@ module ActiveSupport
       assert_equal("12434%", number_to_percentage(12434, :locale => 'ts'))
     end
 
+    def test_number_to_i18n_percentage_and_empty_i18n_store
+      I18n.backend.store_translations 'empty', {}
+
+      assert_equal("1.000%", number_to_percentage(1, :locale => 'empty'))
+      assert_equal("1.243%", number_to_percentage(1.2434, :locale => 'empty'))
+      assert_equal("12434.000%", number_to_percentage(12434, :locale => 'empty'))
+    end
+
     def test_number_to_i18n_human_size
       #b for bytes and k for kbytes
       assert_equal("2 k", number_to_human_size(2048, :locale => 'ts'))
       assert_equal("42 b", number_to_human_size(42, :locale => 'ts'))
     end
 
+    def test_number_to_i18n_human_size_with_empty_i18n_store
+      I18n.backend.store_translations 'empty', {}
+
+      assert_equal("2 KB", number_to_human_size(2048, :locale => 'empty'))
+      assert_equal("42 Bytes", number_to_human_size(42, :locale => 'empty'))
+    end
+
     def test_number_to_human_with_default_translation_scope
       #Using t for thousand
       assert_equal "2 t", number_to_human(2000, :locale => 'ts')
@@ -106,6 +134,13 @@ module ActiveSupport
       assert_equal "2 Tens", number_to_human(20, :locale => 'ts')
     end
 
+    def test_number_to_human_with_empty_i18n_store
+      I18n.backend.store_translations 'empty', {}
+
+      assert_equal "2 Thousand", number_to_human(2000, :locale => 'empty')
+      assert_equal "1.23 Billion", number_to_human(1234567890, :locale => 'empty')
+    end
+
     def test_number_to_human_with_custom_translation_scope
       #Significant was set to true with precision 2, with custom translated units
       assert_equal "4.3 cm", number_to_human(0.0432, :locale => 'ts', :units => :custom_units_for_number_to_human)
diff --git a/activesupport/test/number_helper_test.rb b/activesupport/test/number_helper_test.rb
index 9b7d7f020c..f26d75edfb 100644
--- a/activesupport/test/number_helper_test.rb
+++ b/activesupport/test/number_helper_test.rb
@@ -4,7 +4,7 @@ require 'active_support/number_helper'
 module ActiveSupport
   module NumberHelper
     class NumberHelperTest < ActiveSupport::TestCase
-      
+
       class TestClassWithInstanceNumberHelpers
         include ActiveSupport::NumberHelper
       end
@@ -16,7 +16,7 @@ module ActiveSupport
       def setup
         @instance_with_helpers = TestClassWithInstanceNumberHelpers.new
       end
-  
+
       def kilobytes(number)
         number * 1024
       end
@@ -362,7 +362,7 @@ module ActiveSupport
           assert_equal "x", number_helper.number_to_human('x')
         end
       end
-  
+
       def test_extending_or_including_number_helper_correctly_hides_private_methods
         [@instance_with_helpers, TestClassWithClassNumberHelpers, ActiveSupport::NumberHelper].each do |number_helper|
           assert !number_helper.respond_to?(:valid_float?)