Fixed bug with ngettext where it wouldn't find translations with keys…

… having a dot in them.
ruby-i18n · Dec 1, 2009 · 7362a43 · 7362a43
1 parent 1c8fcd3
commit 7362a43
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/lib/i18n/helpers/gettext.rb b/lib/i18n/helpers/gettext.rb
@@ -40,7 +40,7 @@ def nsgettext(msgid, msgid_plural, n = 1, separator = '|')
 
         scope, msgid = I18n::Gettext.extract_scope(msgid, separator)
         default = { :one => msgid, :other => msgid_plural }
-        I18n.t(msgid, :default => default, :count => n, :scope => scope)
+        I18n.t(msgid, :default => default, :count => n, :scope => scope, :separator => separator)
       end
       alias ns_ nsgettext
 

diff --git a/test/fixtures/locales/de.po b/test/fixtures/locales/de.po
@@ -65,3 +65,8 @@ msgid "Car|wheel"
 msgid_plural "Car|wheels"
 msgstr[0] "Rad"
 msgstr[1] "Räder"
+
+msgid "On %{count} wheel."
+msgid_plural "On %{count} wheels."
+msgstr[0] "Auf %{count} Achse."
+msgstr[1] "Auf %{count} Achsen."
diff --git a/test/gettext/backend_test.rb b/test/gettext/backend_test.rb
@@ -81,4 +81,11 @@ def test_pluralizes_namespaced_entry_with_alternative_syntax
     assert_equal 'Rad',   npgettext('Car', ['wheel', 'wheels'], 1)
     assert_equal 'Räder', npgettext('Car', ['wheel', 'wheels'], 2)
   end
+
+  def test_ngettextpluralizes_entry_with_dots
+    I18n.locale = :de
+    assert_equal 'Auf 1 Achse.', n_("On %{count} wheel.", "On %{count} wheels.", 1)
+    assert_equal 'Auf 2 Achsen.', n_("On %{count} wheel.", "On %{count} wheels.", 2)
+  end
+
 end