Ensure it works with empty locale files.

ruby-i18n · Jun 23, 2010 · 8805e01 · 8805e01
1 parent 188d924
commit 8805e01
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/lib/i18n/backend/base.rb b/lib/i18n/backend/base.rb
@@ -202,7 +202,7 @@ def load_file(filename)
           type = File.extname(filename).tr('.', '').downcase
           raise UnknownFileType.new(type, filename) unless respond_to?(:"load_#{type}")
           data = send(:"load_#{type}", filename) # TODO raise a meaningful exception if this does not yield a Hash
-          data.each { |locale, d| store_translations(locale, d) }
+          data.each { |locale, d| store_translations(locale, d || {}) }
         end
 
         # Loads a plain Ruby translations file. eval'ing the file must yield

diff --git a/test/i18n_load_path_test.rb b/test/i18n_load_path_test.rb
@@ -16,6 +16,11 @@ def test_nested_load_paths_do_not_break_locale_loading
     assert_equal "baz", I18n.t(:'foo.bar')
   end
 
+  def test_load_empty_yml_works
+    I18n.load_path = [[locales_dir + '/empty.yml']]
+    assert_equal "baz", I18n.t(:default => "baz")
+  end
+
   def test_adding_arrays_of_filenames_to_load_path_do_not_break_locale_loading
     I18n.load_path << Dir[locales_dir + '/*.{rb,yml}']
     assert_equal "baz", I18n.t(:'foo.bar')

diff --git a/test/test_data/locales/empty.yml b/test/test_data/locales/empty.yml
@@ -0,0 +1 @@
+en: