Merge branch 'public-body-locale-fallback' into rails-3-develop

Conflicts:
    app/controllers/public_body_controller.rb
    config/general.yml-example
    lib/configuration.rb

1 files changed, 3 insertions, 2 deletions

diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
index ec2a08dbc..e0da234b0 100644
--- a/app/controllers/admin_public_body_controller.rb
+++ b/app/controllers/admin_public_body_controller.rb
@@ -14,6 +14,7 @@ class AdminPublicBodyController < AdminController
 
     def _lookup_query_internal
         @locale = self.locale_from_params()
+        underscore_locale = @locale.gsub '-', '_'
         I18n.with_locale(@locale) do
             @query = params[:query]
             if @query == ""
@@ -23,10 +24,10 @@ class AdminPublicBodyController < AdminController
             if @page == ""
                 @page = nil
             end
-            @public_bodies = PublicBody.joins(:translations).where(@query.nil? ? "public_body_translations.locale = '#{@locale}'" :
+            @public_bodies = PublicBody.joins(:translations).where(@query.nil? ? "public_body_translations.locale = '#{underscore_locale}'" :
                                 ["(lower(public_body_translations.name) like lower('%'||?||'%') or
                                  lower(public_body_translations.short_name) like lower('%'||?||'%') or
-                                 lower(public_body_translations.request_email) like lower('%'||?||'%' )) AND (public_body_translations.locale = '#{@locale}')", @query, @query, @query]).paginate :order => "public_body_translations.name", :page => @page, :per_page => 100
+                                 lower(public_body_translations.request_email) like lower('%'||?||'%' )) AND (public_body_translations.locale = '#{underscore_locale}')", @query, @query, @query]).paginate :order => "public_body_translations.name", :page => @page, :per_page => 100
         end
         @public_bodies_by_tag = PublicBody.find_by_tag(@query)
     end