From c3668be95ad890dbf6ee8e5fd730d53d636810bf Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Thu, 13 Mar 2008 17:55:01 +0000 Subject: [PATCH] ActionItem237: workaround for ambiguity between liblocale-ruby1.8 and libgettext-ruby1.8 in Debian. --- app/helpers/search_helper.rb | 2 +- config/environment.rb | 2 +- test/functional/search_controller_test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 1a3a309..81182fb 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -12,6 +12,6 @@ module SearchHelper end def remove_stop_words(query) - (query.downcase.scan(/"[^"]*"?|'[^']*'?|[^'"\s]+/) - STOP_WORDS[Locale.current.to_s]).join(' ') + (query.downcase.scan(/"[^"]*"?|'[^']*'?|[^'"\s]+/) - (STOP_WORDS[locale] || [])).join(' ') end end diff --git a/config/environment.rb b/config/environment.rb index 514959c..1d3af49 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -84,7 +84,7 @@ Noosfero.locales = { } # if you want to override this, do it in config/local.rb ! Noosfero.default_locale = 'en' -require 'locale' +require 'locale.so' Tag.hierarchical = true diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb index 034dffb..b7ddf60 100644 --- a/test/functional/search_controller_test.rb +++ b/test/functional/search_controller_test.rb @@ -21,7 +21,7 @@ class SearchControllerTest < Test::Unit::TestCase end should 'filter stop words' do - GetText.locale = 'pt_BR' + @controller.expects(:locale).returns('pt_BR').at_least_once get 'index', :query => 'a carne da vaca' assert_response :success assert_template 'index' -- libgit2 0.21.2