I18n fix

1 files changed, 7 insertions, 5 deletions

diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
index 3e0613a1f..98d4c1044 100644
--- a/app/controllers/admin_public_body_controller.rb
+++ b/app/controllers/admin_public_body_controller.rb
@@ -23,11 +23,13 @@ class AdminPublicBodyController < AdminController
             if @page == ""
                 @page = nil
             end
-            @public_bodies = PublicBody.paginate :order => "name", :page => @page, :per_page => 100,
-                :conditions =>  @query.nil? ? nil : ["lower(name) like lower('%'||?||'%') or 
-                                 lower(short_name) like lower('%'||?||'%') or 
-                                 lower(request_email) like lower('%'||?||'%')", @query, @query, @query]
-            @public_bodies_by_tag = PublicBody.find_by_tag(@query) 
+            @public_bodies = PublicBody.paginate :order => "public_body_translations.name", :page => @page, :per_page => 100,
+                :conditions =>  @query.nil? ? "public_body_translations.locale = '#{@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],
+              :joins => :translations
+            @public_bodies_by_tag = PublicBody::Translation.find_by_tag(@query) 
         end
     end