SONAR-75 fix column titles in the filters page

diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
index c103b691217edff9cbb9411374262add1d24f76c..12e43941c3641e53925ebefd1bc160578d50bd18 100644 (file)
--- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -350,6 +350,13 @@ filters.display_form.as=Display as
 filters.display_form.table=Table
 filters.display_form.treemap=Treemap
 filters.build_date=Build date
+filters.col.date=Build date
+filters.col.language=Language
+filters.col.name=Name
+filters.col.links=Links
+filters.col.version=Version
+filters.col.key=Key
+
 
 #------------------------------------------------------------------------------
 #

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 4f827a2823d545f257a844f324e183170e0f3327..65e19f9fa90438888112936014e756a77b126f21 100644 (file)
--- 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 2af661559cf6a64d9ccbb092d5e5bb239d9905d0..50252c05764c678462b45b9d5ec3b060d16a5811 100644 (file)
--- 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