thedarkone-i18n 0.1.4 → 0.2.0

data/test/backend/simple/translations_test.rb

@@ -0,0 +1,89 @@
+# encoding: utf-8
+
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+
+class I18nSimpleBackendLoadTranslationsTest < Test::Unit::TestCase
+  include Tests::Backend::Simple::Setup::Base
+
+  def test_load_translations_with_unknown_file_type_raises_exception
+    assert_raises(I18n::UnknownFileType) { I18n.backend.load_translations "#{locales_dir}/en.xml" }
+  end
+
+  def test_load_translations_with_ruby_file_type_does_not_raise_exception
+    assert_nothing_raised { I18n.backend.load_translations "#{locales_dir}/en.rb" }
+  end
+
+  def test_load_rb_loads_data_from_ruby_file
+    data = I18n.backend.send :load_rb, "#{locales_dir}/en.rb"
+    assert_equal({ :en => { :fuh => { :bah => 'bas' } } }, data)
+  end
+
+  def test_load_rb_loads_data_from_yaml_file
+    data = I18n.backend.send :load_yml, "#{locales_dir}/en.yml"
+    assert_equal({ 'en' => { 'foo' => { 'bar' => 'baz' } } }, data)
+  end
+
+  def test_load_translations_loads_from_different_file_formats
+    I18n.backend = I18n::Backend::Simple.new
+    I18n.backend.load_translations "#{locales_dir}/en.rb", "#{locales_dir}/en.yml"
+    expected = { :en => { :fuh => { :bah => "bas" }, :foo => { :bar => "baz" } } }
+    assert_equal expected, backend_get_translations
+  end
+end
+
+class I18nSimpleBackendStoreTranslationsTest < Test::Unit::TestCase
+  include Tests::Backend::Simple::Setup::Base
+
+  def test_store_translations_adds_translations # no, really :-)
+    I18n.backend.store_translations :'en', :foo => 'bar'
+    assert_equal Hash[:'en', {:foo => 'bar'}], backend_get_translations
+  end
+
+  def test_store_translations_deep_merges_translations
+    I18n.backend.store_translations :'en', :foo => {:bar => 'bar'}
+    I18n.backend.store_translations :'en', :foo => {:baz => 'baz'}
+    assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], backend_get_translations
+  end
+
+  def test_store_translations_forces_locale_to_sym
+    I18n.backend.store_translations 'en', :foo => 'bar'
+    assert_equal Hash[:'en', {:foo => 'bar'}], backend_get_translations
+  end
+
+  def test_store_translations_converts_keys_to_symbols
+    # backend_reset_translations!
+    I18n.backend.store_translations 'en', 'foo' => {'bar' => 'bar', 'baz' => 'baz'}
+    assert_equal Hash[:'en', {:foo => {:bar => 'bar', :baz => 'baz'}}], backend_get_translations
+  end
+
+  def test_deep_symbolize_keys_works
+    result = I18n.backend.send :deep_symbolize_keys, 'foo' => {'bar' => {'baz' => 'bar'}}
+    expected = {:foo => {:bar => {:baz => 'bar'}}}
+    assert_equal expected, result
+  end
+end
+
+class I18nSimpleBackendReloadTranslationsTest < Test::Unit::TestCase
+  include Tests::Backend::Simple::Setup::Base
+
+  def setup
+    I18n.backend = I18n::Backend::Simple.new
+    I18n.load_path = [locales_dir + '/en.yml']
+    assert_nil backend_get_translations
+    I18n.backend.send :init_translations
+  end
+
+  def test_setup
+    assert_not_nil backend_get_translations
+  end
+
+  def test_reload_translations_unloads_translations
+    I18n.backend.reload!
+    assert_nil backend_get_translations
+  end
+
+  def test_reload_translations_uninitializes_translations
+    I18n.backend.reload!
+    assert_equal I18n.backend.initialized?, false
+  end
+end

data/test/fixtures/locales/de.po

@@ -0,0 +1,61 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: version 0.0.1\n"
+"POT-Creation-Date: 2009-02-26 19:50+0100\n"
+"PO-Revision-Date: 2009-02-18 14:53+0100\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+# #: app/helpers/translation_helper.rb:3
+# msgid "%{relative_time} ago"
+# msgstr "vor %{relative_time}"
+
+#: app/views/cars/show.html.erb:5
+msgid "Axis"
+msgid_plural "Axis"
+msgstr[0] "Achse"
+msgstr[1] "Achsen"
+
+#: app/controllers/cars_controller.rb:47
+msgid "Car was successfully created."
+msgstr "Auto wurde erfolgreich gespeichert"
+
+#: app/controllers/cars_controller.rb:64
+msgid "Car was successfully updated."
+msgstr "Auto wurde erfolgreich aktualisiert"
+
+#: app/views/cars/show.html.erb:1 locale/model_attributes.rb:3
+msgid "Car|Model"
+msgstr "Modell"
+
+#: app/views/cars/show.html.erb:3 locale/model_attributes.rb:4
+msgid "Car|Wheels count"
+msgstr "Räderzahl"
+
+#: app/views/cars/show.html.erb:7
+msgid "Created"
+msgstr "Erstellt"
+
+#: app/views/cars/show.html.erb:9
+msgid "Month"
+msgstr "Monat"
+
+#: locale/model_attributes.rb:2
+msgid "car"
+msgstr "Auto"
+
+#: locale/testlog_phrases.rb:2
+msgid "this is a dynamic translation which was found thorugh gettext_test_log!"
+msgstr ""
+"Dies ist eine dynamische Übersetzung, die durch gettext_test_log "
+"gefunden wurde!"

data/test/fixtures/locales/en.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+{ :en => { :fuh => { :bah => "bas" } } }

data/test/fixtures/locales/en.yml

@@ -0,0 +1,3 @@
+en:
+  foo:
+    bar: baz

data/test/fixtures/locales/plurals.rb

@@ -0,0 +1,112 @@
+# encoding: utf-8
+
+{
+  :af  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :am  => { :i18n => { :pluralize => lambda { |n| (0..1).include?(n) ? :one : :other } } },
+  :ar  => { :i18n => { :pluralize => lambda { |n| n == 0 ? :zero : n == 1 ? :one : n == 2 ? :two : (3..10).include?(n % 100) ? :few : (11..99).include?(n % 100) ? :many : :other } } },
+  :az  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :be  => { :i18n => { :pluralize => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : (2..4).include?(n % 10) && !(12..14).include?(n % 100) ? :few : n % 10 == 0 || (5..9).include?(n % 10) || (11..14).include?(n % 100) ? :many : :other } } },
+  :bg  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :bh  => { :i18n => { :pluralize => lambda { |n| (0..1).include?(n) ? :one : :other } } },
+  :bn  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :bo  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :bs  => { :i18n => { :pluralize => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : (2..4).include?(n % 10) && !(12..14).include?(n % 100) ? :few : n % 10 == 0 || (5..9).include?(n % 10) || (11..14).include?(n % 100) ? :many : :other } } },
+  :ca  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :cs  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : (2..4).include?(n) ? :few : :other } } },
+  :cy  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : n == 2 ? :two : n == 8 || n == 11 ? :many : :other } } },
+  :da  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :de  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :dz  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :el  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :en  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :eo  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :es  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :et  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :eu  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :fa  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :fi  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :fil => { :i18n => { :pluralize => lambda { |n| (0..1).include?(n) ? :one : :other } } },
+  :fo  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :fr  => { :i18n => { :pluralize => lambda { |n| n && n != 2 ? :one : :other } } },
+  :fur => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :fy  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :ga  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } },
+  :gl  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :gu  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :guw => { :i18n => { :pluralize => lambda { |n| (0..1).include?(n) ? :one : :other } } },
+  :ha  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :he  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :hi  => { :i18n => { :pluralize => lambda { |n| (0..1).include?(n) ? :one : :other } } },
+  :hr  => { :i18n => { :pluralize => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : (2..4).include?(n % 10) && !(12..14).include?(n % 100) ? :few : n % 10 == 0 || (5..9).include?(n % 10) || (11..14).include?(n % 100) ? :many : :other } } },
+  :hu  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :id  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :is  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :it  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :iw  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :ja  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :jv  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :ka  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :km  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :kn  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :ko  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :ku  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :lb  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :ln  => { :i18n => { :pluralize => lambda { |n| (0..1).include?(n) ? :one : :other } } },
+  :lt  => { :i18n => { :pluralize => lambda { |n| n % 10 == 1 && !(11..19).include?(n % 100) ? :one : (2..9).include?(n % 10) && !(11..19).include?(n % 100) ? :few : :other } } },
+  :lv  => { :i18n => { :pluralize => lambda { |n| n == 0 ? :zero : n % 10 == 1 && n % 100 != 11 ? :one : :other } } },
+  :mg  => { :i18n => { :pluralize => lambda { |n| (0..1).include?(n) ? :one : :other } } },
+  :mk  => { :i18n => { :pluralize => lambda { |n| n % 10 == 1 ? :one : :other } } },
+  :ml  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :mn  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :mo  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : n == 0 ? :few : :other } } },
+  :mr  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :ms  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :mt  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : n == 0 || (2..10).include?(n % 100) ? :few : (11..19).include?(n % 100) ? :many : :other } } },
+  :my  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :nah => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :nb  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :ne  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :nl  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :nn  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :no  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :nso => { :i18n => { :pluralize => lambda { |n| (0..1).include?(n) ? :one : :other } } },
+  :om  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :or  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :pa  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :pap => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :pl  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : (2..4).include?(n % 10) && !(12..14).include?(n % 100) && !(22..24).include?(n % 100) ? :few : :other } } },
+  :ps  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :pt  => { :i18n => { :pluralize => lambda { |n| (0..1).include?(n) ? :one : :other } } },
+  :"pt-PT" => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :ro  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : n == 0 ? :few : :other } } },
+  :ru  => { :i18n => { :pluralize => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : (2..4).include?(n % 10) && !(12..14).include?(n % 100) ? :few : n % 10 == 0 || (5..9).include?(n % 10) || (11..14).include?(n % 100) ? :many : :other } } },
+  :se  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } },
+  :sh  => { :i18n => { :pluralize => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : (2..4).include?(n % 10) && !(12..14).include?(n % 100) ? :few : n % 10 == 0 || (5..9).include?(n % 10) || (11..14).include?(n % 100) ? :many : :other } } },
+  :sk  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : (2..4).include?(n) ? :few : :other } } },
+  :sl  => { :i18n => { :pluralize => lambda { |n| n % 100 == 1 ? :one : n % 100 == 2 ? :two : (3..4).include?(n % 100) ? :few : :other } } },
+  :sma => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } },
+  :smi => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } },
+  :smj => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } },
+  :smn => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } },
+  :sms => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : n == 2 ? :two : :other } } },
+  :so  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :sq  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :sr  => { :i18n => { :pluralize => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : (2..4).include?(n % 10) && !(12..14).include?(n % 100) ? :few : n % 10 == 0 || (5..9).include?(n % 10) || (11..14).include?(n % 100) ? :many : :other } } },
+  :sv  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :sw  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :ta  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :te  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :th  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :ti  => { :i18n => { :pluralize => lambda { |n| (0..1).include?(n) ? :one : :other } } },
+  :tk  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :tl  => { :i18n => { :pluralize => lambda { |n| (0..1).include?(n) ? :one : :other } } },
+  :to  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :tr  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :uk  => { :i18n => { :pluralize => lambda { |n| n % 10 == 1 && n % 100 != 11 ? :one : (2..4).include?(n % 10) && !(12..14).include?(n % 100) ? :few : n % 10 == 0 || (5..9).include?(n % 10) || (11..14).include?(n % 100) ? :many : :other } } },
+  :ur  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } },
+  :vi  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :wa  => { :i18n => { :pluralize => lambda { |n| (0..1).include?(n) ? :one : :other } } },
+  :yo  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :zh  => { :i18n => { :pluralize => lambda { |n| :other } } },
+  :zu  => { :i18n => { :pluralize => lambda { |n| n == 1 ? :one : :other } } }
+}

data/test/gettext/api_test.rb

@@ -0,0 +1,78 @@
+# encoding: utf-8
+
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require 'i18n/backend/gettext'
+require 'i18n/helpers/gettext'
+
+include I18n::Helpers::Gettext
+
+class I18nGettextApiTest < Test::Unit::TestCase
+  def setup
+    I18n.locale = :en
+    I18n.backend.store_translations :de, {
+      'Hi Gettext!' => 'Hallo Gettext!',
+      'Sentence 1. Sentence 2.' => 'Satz 1. Satz 2.',
+      "An apple#{I18n::Gettext::PLURAL_SEPARATOR}{{count}} apples" => { :one => 'Ein Apfel', :other => '{{count}} Äpfel' },
+      :special => { 'An apple' => { :one => 'Ein spezieller Apfel', :other => '{{count}} spezielle Äpfel' } },
+      :foo => { :bar => { :baz => 'baz-de' } }
+    }
+  end
+
+  def test_helper_uses_msg_as_default
+    assert_equal 'Hi Gettext!', _('Hi Gettext!')
+  end
+
+  def test_helper_uses_msg_as_key
+    I18n.locale = :de
+    assert_equal 'Hallo Gettext!', _('Hi Gettext!')
+  end
+
+  def test_helper_uses_msg_containing_dots_as_default
+    assert_equal 'Sentence 1. Sentence 2.', _('Sentence 1. Sentence 2.')
+  end
+
+  def test_helper_uses_msg_containing_dots_as_key
+    I18n.locale = :de
+    assert_equal 'Satz 1. Satz 2.', _('Sentence 1. Sentence 2.')
+  end
+
+  def test_sgettext_defaults_to_the_last_token_of_a_scoped_msgid
+    assert_equal 'baz', sgettext('foo|bar|baz')
+  end
+
+  def test_sgettext_looks_up_a_scoped_translation
+    I18n.locale = :de
+    assert_equal 'baz-de', sgettext('foo|bar|baz')
+  end
+
+  def test_pgettext_defaults_to_msgid
+    assert_equal 'baz', pgettext('foo|bar', 'baz', '|')
+  end
+
+  def test_pgettext_looks_up_a_scoped_translation
+    I18n.locale = :de
+    assert_equal 'baz-de', pgettext('foo|bar', 'baz', '|')
+  end
+
+  def test_ngettext_looks_up_msg_id_as_default_singular
+    assert_equal 'An apple', ngettext('An apple', '{{count}} apples', 1)
+  end
+
+  def test_ngettext_looks_up_msg_id_plural_as_default_plural
+    assert_equal '2 apples', ngettext('An apple', '{{count}} apples', 2)
+  end
+
+  def test_ngettext_looks_up_msg_id_as_singular
+    I18n.locale = :de
+    assert_equal 'Ein Apfel', ngettext('An apple', '{{count}} apples', 1)
+  end
+
+  def test_ngettext_looks_up_msg_id_as_singular
+    I18n.locale = :de
+    assert_equal '2 Äpfel', ngettext('An apple', '{{count}} apples', 2)
+  end
+
+  def test_nsgettext_looks_up_msg_id_as_default_singular
+    assert_equal 'A special apple', nsgettext('special|A special apple', '{{count}} special apples', 1, '|')
+  end
+end

data/test/gettext/backend_test.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require 'i18n/backend/gettext'
+require 'i18n/helpers/gettext'
+
+include I18n::Helpers::Gettext
+
+class I18nGettextBackendTest < Test::Unit::TestCase
+  def setup
+    I18n.locale = :en
+    I18n.load_path = [locales_dir + '/de.po']
+    I18n.backend.meta_class.send(:include, I18n::Backend::Gettext)
+  end
+  
+  def teardown
+    I18n.load_path = nil
+    I18n.backend = nil
+  end
+
+  def test_backend_loads_po_file
+    I18n.backend.send(:init_translations)
+    assert I18n.backend.send(:translations)[:de][:"Axis\001Axis"]
+  end
+  
+  def test_looks_up_translation
+    I18n.locale = :de
+    assert_equal 'Auto', _('car')
+  end
+  
+  def test_pluralizes_entry
+    I18n.locale = :de
+    assert_equal 'Achsen', ngettext('Axis', 'Axis', 2)
+  end
+end

data/test/i18n_exceptions_test.rb

@@ -1,12 +1,8 @@
-$:.unshift "lib"
+# encoding: utf-8
 
-require 'rubygems'
-require 'test/unit'
-require 'mocha'
-require 'i18n'
-require 'active_support'
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
-module I18nExceptionsTest
+class I18nExceptionsTest < Test::Unit::TestCase
   def test_invalid_locale_stores_locale
     force_invalid_locale
   rescue I18n::ArgumentError => e
@@ -48,16 +44,17 @@ module I18nExceptionsTest
   end
 
   def test_missing_interpolation_argument_stores_key_and_string
+    assert_raises(I18n::MissingInterpolationArgument) { force_missing_interpolation_argument } 
     force_missing_interpolation_argument
   rescue I18n::ArgumentError => e
-    assert_equal :bar, e.key
+    # assert_equal :bar, e.key
     assert_equal "{{bar}}", e.string
   end
 
   def test_missing_interpolation_argument_message
     force_missing_interpolation_argument
   rescue I18n::ArgumentError => e
-    assert_equal 'interpolation argument :bar missing in "{{bar}}"', e.message
+    assert_equal 'missing interpolation argument in "{{bar}}" ({:baz=>"baz"} given)', e.message
   end
 
   def test_reserved_interpolation_key_stores_key_and_string
@@ -97,20 +94,4 @@ module I18nExceptionsTest
       I18n.backend.store_translations 'de', :foo => "{{scope}}"
       I18n.backend.translate 'de', :foo, :baz => 'baz'
     end
-end
-
-class I18nSimpleBackendExceptionsTest < Test::Unit::TestCase
-  include I18nExceptionsTest
-
-  def setup
-    I18n.backend = I18n::Backend::Simple.new
-  end
-end
-
-class I18nFastBackendExceptionsTest < Test::Unit::TestCase
-  include I18nExceptionsTest
-
-  def setup
-    I18n.backend = I18n::Backend::Fast.new
-  end
 end