diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 2cd2a4a..4148aca 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -5,6 +5,10 @@ class HomeController < ApplicationController
     if Thema.count>0
     t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml")
     @rubriken= Rubrik.accessible_by(current_ability, :show)
+
+    params[:month]= Date.today.month if params[:month].nil?
+    params[:year]= Date.today.year if params[:year].nil?
+        
     @calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten.select {|c| c.object !=nil}
 
     @starttopic= @themen = Thema.where(:id=>t).first
diff --git a/app/controllers/rubriken_controller.rb b/app/controllers/rubriken_controller.rb
index 6b58967..b6c5e0e 100755
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -10,6 +10,9 @@ class RubrikenController < ApplicationController
   #    @neuigkeiten = Neuigkeit.public.published.page(params[:page]).per(3)
   #  end   
     
+    params[:month]= Date.today.month if params[:month].nil?
+    params[:year]= Date.today.year if params[:year].nil?
+        
     @rubriken= Rubrik.accessible_by(current_ability, :show)
     @neuigkeiten = Neuigkeit.accessible_by(current_ability, :list).page(params[:page]).per(3)
     
@@ -28,6 +31,9 @@ class RubrikenController < ApplicationController
     @rubrik = Rubrik.find(params[:id])
     @moderatoren=User.with_role(:newsmoderator,@rubrik)
 
+    params[:month]= Date.today.month if params[:month].nil?
+    params[:year]= Date.today.year if params[:year].nil?
+        
     @calentries= @rubrik.calendar.calentries.select {|c| c.object !=nil}
     @neuigkeiten = @rubrik.neuigkeiten.accessible_by(current_ability, :list).page(params[:page]).per(3)
 
diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb
index 3276566..e274c35 100755
--- a/app/views/rubriken/index.html.erb
+++ b/app/views/rubriken/index.html.erb
@@ -36,7 +36,7 @@
 
     <div class="span3">
 
-<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+params[:month].to_s+params[:year].to_s) do %>
+<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+params[:month].to_s+params[:year].to_s) do %>
 <%= render 'calendars/calentries', :object=>@calentries %>
 <% end %>
       
diff --git a/app/views/rubriken/show.html.erb b/app/views/rubriken/show.html.erb
index 4a8c7f5..3b1fd87 100755
--- a/app/views/rubriken/show.html.erb
+++ b/app/views/rubriken/show.html.erb
@@ -47,7 +47,7 @@
 </div>
 <div class="span3">
 
-<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+params[:month].to_s+params[:year].to_s) do %>
+  <% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>
 <%= render 'calendars/calentries', :object=>@calentries %>
 <% end %>
 
diff --git a/app/views/themes/blue1/home/index.html.erb b/app/views/themes/blue1/home/index.html.erb
index 669293b..9e1a460 100644
--- a/app/views/themes/blue1/home/index.html.erb
+++ b/app/views/themes/blue1/home/index.html.erb
@@ -56,7 +56,7 @@
   </ul>
 </div>
 <div class="span3">
-<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+params[:month].to_s+params[:year].to_s) do %>
+<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>
 <%= render 'calendars/calentries', :object=>@calentries %>
 <% end %>