From 87b6e60c9dd9f2dec4ede89e48b182c67409cd6c Mon Sep 17 00:00:00 2001 From: Daniela Soares Feitosa Date: Wed, 3 Nov 2010 19:38:31 -0300 Subject: [PATCH] Fix: terminology and ngettext works fine together --- lib/noosfero/core_ext/object.rb | 2 +- test/unit/noosfero_test.rb | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/noosfero/core_ext/object.rb b/lib/noosfero/core_ext/object.rb index 9b8bc94..fed788d 100644 --- a/lib/noosfero/core_ext/object.rb +++ b/lib/noosfero/core_ext/object.rb @@ -5,6 +5,6 @@ class Object alias :getterm :__ def n__(for_one, for_many, num) - getterm(ngettext(for_one, for_many, num)) + ngettext(getterm(for_one), getterm(for_many), num) end end diff --git a/test/unit/noosfero_test.rb b/test/unit/noosfero_test.rb index ffd9e5e..9d6597c 100644 --- a/test/unit/noosfero_test.rb +++ b/test/unit/noosfero_test.rb @@ -56,4 +56,16 @@ class NoosferoTest < Test::Unit::TestCase assert_equal 'en', FastGettext.locale end + should 'use terminology with ngettext' do + Noosfero.terminology = UnifreireTerminology.instance + + Noosfero.with_locale('en') do + assert_equal 'One institution', n__('One enterprise', '%{num} enterprises', 1) + end + + Noosfero.with_locale('pt') do + assert_equal 'Uma instituição', n__('One enterprise', '%{num} enterprises', 1) + end + end + end -- libgit2 0.21.2