SONAR-75 fix column titles in the filters page

2 files changed, 2 insertions, 4 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb
index 4f827a2823d..65e19f9fa90 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb
@@ -110,9 +110,7 @@ module FiltersHelper
   end
 
   def column_title(column, filter)
-    html=nil
     if column.sortable?
-      asc = (column.descending? || column.sort_direction.nil?)
       html=link_to h(column.display_name), url_for(:overwrite_params => {:asc => (!(column.ascending?)).to_s, :sort => column.id})
     else
       html=h(column.display_name)
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/filter_column.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/filter_column.rb
index 2af661559cf..50252c05764 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/filter_column.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/filter_column.rb
@@ -39,9 +39,9 @@ class FilterColumn < ActiveRecord::Base
 
   def name
     if on_metric?
-      Api::Utils.message("metric." + kee + ".name", :default => (metric ? metric.short_name : kee))
+      Api::Utils.message("metric.#{kee}.name", :default => (metric ? metric.short_name : kee))
     else
-      Api::Utils.message(family, :default => kee)
+      Api::Utils.message("filters.col.#{family}", :default => kee)
     end
   end