fix announcement language

app/controllers/default_widget_controller.rb

@@ -12,25 +12,20 @@ class DefaultWidgetController< OrbitWidgetController
 
   def query_for_default_widget
     @ori_class_name =  @default_widget["query"].split('.')[0]
-    @ori_query =  @default_widget["query"]
-    result = nil
-    result_objects = nil
+    @result =  eval(@default_widget["query"])
     if !params["tag_id"].blank?
       if params["category_id"].blank? #has tag no cate
-        result =  eval(@ori_query)
-        result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
+        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
       else #has tag and cate
-        result =  eval(@ori_query)
-        result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
-        result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
+        @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
+        @result.selector[:tagged_ids] = { "$in" => params['tag_id'] }
       end
     elsif params["category_id"].blank?  #no tag no cate
-      result = eval(@ori_query)
     else #no tag has cate
-      result = eval(@ori_query)
-      result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
+      
+      @result.selector[get_category_field_name] = { "$in" => params['category_id'].collect{|t| BSON::ObjectId(t)}}
     end
-    eval("result.#{@default_widget[:sorting_query]}")
+    eval("@result.#{@default_widget[:sorting_query]}")
   end
 
   def search_result

vendor/built_in_modules/announcement/init.rb

@@ -30,7 +30,7 @@ module Announcement
     widgets do
       default_widget do
 	  sorting 'desc(:postdate)'
-        query 'Bulletin.any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
+        query 'Bulletin.available_for_lang(I18n.locale).any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
         enable ["typeA","typeB_style3","typeC"]
         image :image
         field :postdate