diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index 0becfc6..55046ab 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -29,7 +29,7 @@ class SearchController < PublicController
       @asset = key
       send(key)
       @order << key
-      @names[key] = getterm(description)
+      @names[key] = _(description)
     end
     @asset = nil
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a26170e..6022d2f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -796,7 +796,7 @@ module ApplicationHelper
         end
       }
       html += "<br />\n".html_safe if line_size == 0 || ( values.size % line_size ) > 0
-      column = object.class.columns_hash[method.to_s]
+      column = object.class.columns_hash[method.to_s] if object
       text =
         ( column ?
           column.human_name :
@@ -1425,7 +1425,7 @@ module ApplicationHelper
       object = instance_variable_get("@#{name}")
       object.errors.full_messages.each do |msg|
         errors << msg
-      end
+      end if object
     end
     return '' if errors.empty?
 
@@ -1437,11 +1437,6 @@ module ApplicationHelper
     end
   end
 
-  # FIXME
-  def observe_field(*args)
-    ''
-  end
-
   def private_profile_partial_parameters
     if profile.person?
       @action = :add_friend
diff --git a/app/helpers/forum_helper.rb b/app/helpers/forum_helper.rb
index 858cb27..7d8bd24 100644
--- a/app/helpers/forum_helper.rb
+++ b/app/helpers/forum_helper.rb
@@ -36,7 +36,7 @@ module ForumHelper
                              :id => "post-#{art.id}"
                             )
     }
-    content_tag('table', content) + (pagination or '')
+    content_tag('table', content.join) + (pagination or '')
   end
 
   def last_topic_update(article)
diff --git a/app/helpers/language_helper.rb b/app/helpers/language_helper.rb
index 0d6ea24..081b637 100644
--- a/app/helpers/language_helper.rb
+++ b/app/helpers/language_helper.rb
@@ -22,7 +22,7 @@ module LanguageHelper
     if options[:element] == 'dropdown'
       select_tag('lang', 
         options_for_select(locales.map{|code,name| [name, code]}, current),
-        :onchange => "document.location.href= #{url_for(params.merge(:lang => 'LANGUAGE')).inspect}.replace(/LANGUAGE/, this.value) ;",
+        :onchange => "document.location.href= #{url_for(params.merge(:lang => 'LANGUAGE'))}.replace(/LANGUAGE/, this.value) ;",
         :help => _('The language you choose here is the language used for options, buttons, etc. It does not affect the language of the content created by other users.')
       )
     else
diff --git a/app/models/link_list_block.rb b/app/models/link_list_block.rb
index f40174e..900b719 100644
--- a/app/models/link_list_block.rb
+++ b/app/models/link_list_block.rb
@@ -58,7 +58,7 @@ class LinkListBlock < Block
   def content(args={})
     block_title(title) +
     content_tag('ul',
-      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}.join(',')
+      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}.join
     )
   end
 
diff --git a/app/views/cms/select_article_type.html.erb b/app/views/cms/select_article_type.html.erb
index 058f471..ed84cdf 100644
--- a/app/views/cms/select_article_type.html.erb
+++ b/app/views/cms/select_article_type.html.erb
@@ -5,7 +5,7 @@
 <ul class="article-types">
   <% for type in @article_types %>
     <% action = type[:class].name == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:class].name} %>
-    <% content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %>
+    <%= content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %>
       <li class="<%= icon_for_new_article(type[:class]) %>" onmouseover="javascript: jQuery(this).addClass('mouseover')" onmouseout="jQuery(this).removeClass('mouseover')">
         <strong><%= type[:short_description] %></strong>
         <div class='description'><%= type[:description] %></div>
diff --git a/app/views/profile_editor/_pending_tasks.html.erb b/app/views/profile_editor/_pending_tasks.html.erb
index 9a13ee0..e266f8f 100644
--- a/app/views/profile_editor/_pending_tasks.html.erb
+++ b/app/views/profile_editor/_pending_tasks.html.erb
@@ -4,7 +4,7 @@
   <div class='pending-tasks'>
     <h2><%= _('You have pending requests') %></h2>
     <ul>
-      <%= @pending_tasks.map {|task| content_tag('li', task_information(task))} %>
+      <%= @pending_tasks.map {|task| content_tag('li', task_information(task))}.join %>
     </ul>
     <%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>
   </div>
diff --git a/app/views/shared/_list_groups.html.erb b/app/views/shared/_list_groups.html.erb
index 2878d97..6ec3108 100644
--- a/app/views/shared/_list_groups.html.erb
+++ b/app/views/shared/_list_groups.html.erb
@@ -7,7 +7,7 @@
     <span class='profile-details'>
       <strong><%= group.name %></strong><br/>
       <%= _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by_resource_id(group.id) %>
-      <%= _('Type: %s') % getterm(group.class.identification) %> <br/>
+      <%= _('Type: %s') % _(group.class.identification) %> <br/>
       <%= _('Description: %s') % group.description  + '<br/>' if group.community? %>
       <%= _('Members: %s') % group.members_count.to_s %> <br/>
       <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index cbe4371..a4f7609 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -59,7 +59,7 @@ class SearchControllerTest < ActionController::TestCase
 
   should 'search only in specified types of content' do
     get :articles, :query => 'something not important'
-    assert_equal [:articles], assigns(:searches).keys
+    assert_equal ['articles'], assigns(:searches).keys
   end
 
   should 'render success in search' do
@@ -155,13 +155,13 @@ class SearchControllerTest < ActionController::TestCase
   should 'include extra content supplied by plugins on product asset' do
     class Plugin1 < Noosfero::Plugin
       def asset_product_extras(product)
-        lambda {"<span id='plugin1'>This is Plugin1 speaking!</span>"}
+        proc {"<span id='plugin1'>This is Plugin1 speaking!</span>"}
       end
     end
 
     class Plugin2 < Noosfero::Plugin
       def asset_product_extras(product)
-        lambda {"<span id='plugin2'>This is Plugin2 speaking!</span>"}
+        proc {"<span id='plugin2'>This is Plugin2 speaking!</span>"}
       end
     end
 
@@ -182,12 +182,12 @@ class SearchControllerTest < ActionController::TestCase
   should 'include extra properties of the product supplied by plugins' do
     class Plugin1 < Noosfero::Plugin
       def asset_product_properties(product)
-        return { :name => _('Property1'), :content => lambda { link_to(product.name, '/plugin1') } }
+        return { :name => _('Property1'), :content => proc { link_to(product.name, '/plugin1') } }
       end
     end
     class Plugin2 < Noosfero::Plugin
       def asset_product_properties(product)
-        return { :name => _('Property2'), :content => lambda { link_to(product.name, '/plugin2') } }
+        return { :name => _('Property2'), :content => proc { link_to(product.name, '/plugin2') } }
       end
     end
     enterprise = fast_create(Enterprise)
--
libgit2 0.21.2