Download as
Browse Code »

Commit c3668be95ad890dbf6ee8e5fd730d53d636810bf

Authored by AntonioTerceiro
1 parent 5ad505de
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

ActionItem237: workaround for ambiguity between liblocale-ruby1.8 and 

libgettext-ruby1.8 in Debian.


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1580 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
app/helpers/search_helper.rb
  Diff comments   View file @c3668be
... ... @@ -12,6 +12,6 @@ module SearchHelper
12 12 end
13 13  
14 14 def remove_stop_words(query)
15   - (query.downcase.scan(/"[^"]*"?|'[^']*'?|[^'"\s]+/) - STOP_WORDS[Locale.current.to_s]).join(' ')
  15 + (query.downcase.scan(/"[^"]*"?|'[^']*'?|[^'"\s]+/) - (STOP_WORDS[locale] || [])).join(' ')
16 16 end
17 17 end
... ...
config/environment.rb
  Diff comments   View file @c3668be
... ... @@ -84,7 +84,7 @@ Noosfero.locales = {
84 84 }
85 85 # if you want to override this, do it in config/local.rb !
86 86 Noosfero.default_locale = 'en'
87   -require 'locale'
  87 +require 'locale.so'
88 88  
89 89 Tag.hierarchical = true
90 90  
... ...
test/functional/search_controller_test.rb
  Diff comments   View file @c3668be
... ... @@ -21,7 +21,7 @@ class SearchControllerTest < Test::Unit::TestCase
21 21 end
22 22  
23 23 should 'filter stop words' do
24   - GetText.locale = 'pt_BR'
  24 + @controller.expects(:locale).returns('pt_BR').at_least_once
25 25 get 'index', :query => 'a carne da vaca'
26 26 assert_response :success
27 27 assert_template 'index'
... ...