Download as
Browse Code »

Commit 87b6e60c9dd9f2dec4ede89e48b182c67409cd6c

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent d084befd
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Fix: terminology and ngettext works fine together 

(ActionItem1762)
Showing 2 changed files with 13 additions and 1 deletions   Show diff stats
lib/noosfero/core_ext/object.rb
  Diff comments   View file @87b6e60
@@ -5,6 +5,6 @@ class Object @@ -5,6 +5,6 @@ class Object
5 alias :getterm :__ 5 alias :getterm :__
6 6
7 def n__(for_one, for_many, num) 7 def n__(for_one, for_many, num)
8 - getterm(ngettext(for_one, for_many, num)) 8 + ngettext(getterm(for_one), getterm(for_many), num)
9 end 9 end
10 end 10 end
test/unit/noosfero_test.rb
  Diff comments   View file @87b6e60
@@ -56,4 +56,16 @@ class NoosferoTest < Test::Unit::TestCase @@ -56,4 +56,16 @@ class NoosferoTest < Test::Unit::TestCase
56 assert_equal 'en', FastGettext.locale 56 assert_equal 'en', FastGettext.locale
57 end 57 end
58 58
  59 + should 'use terminology with ngettext' do
  60 + Noosfero.terminology = UnifreireTerminology.instance
  61 +
  62 + Noosfero.with_locale('en') do
  63 + assert_equal 'One institution', n__('One enterprise', '%{num} enterprises', 1)
  64 + end
  65 +
  66 + Noosfero.with_locale('pt') do
  67 + assert_equal 'Uma instituição', n__('One enterprise', '%{num} enterprises', 1)
  68 + end
  69 + end
  70 +
59 end 71 end