diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb
index d3544f267..52cc42512 100644
--- a/app/helpers/calendars_helper.rb
+++ b/app/helpers/calendars_helper.rb
@@ -1,14 +1,38 @@
 module CalendarsHelper
   def link_to_previous_month(year, month)
-     link_to_remote ('« ' + (month==1 ? "#{month_name(12)} #{year-1}" : "#{month_name(month-1)}")), 
-                        {:update => "content", :url => { :year => (month==1 ? year-1 : year), :month =>(month==1 ? 12 : month-1) }},
-                        {:href => url_for(:action => 'show', :year => (month==1 ? year-1 : year), :month =>(month==1 ? 12 : month-1))}
+    target_year, target_month = if month == 1
+                                  [year - 1, 12]
+                                else
+                                  [year, month - 1]
+                                end
+    
+    name = if target_month == 12
+             "#{month_name(target_month)} #{target_year}"
+           else
+             "#{month_name(target_month)}"
+           end
+    
+     link_to_remote ('« ' + name),
+                        {:update => "content", :url => { :year => target_year, :month => target_month }},
+                        {:href => url_for(:action => 'show', :year => target_year, :month => target_month)}
   end
 
   def link_to_next_month(year, month)
-    link_to_remote ((month==12 ? "#{month_name(1)} #{year+1}" : "#{month_name(month+1)}") + ' »'), 
-                        {:update => "content", :url => { :year => (month==12 ? year+1 : year), :month =>(month==12 ? 1 : month+1) }},
-                        {:href => url_for(:action => 'show', :year => (month==12 ? year+1 : year), :month =>(month==12 ? 1 : month+1))}
+    target_year, target_month = if month == 12
+                                  [year + 1, 1]
+                                else
+                                  [year, month + 1]
+                                end
+
+    name = if target_month == 1
+             "#{month_name(target_month)} #{target_year}"
+           else
+             "#{month_name(target_month)}"
+           end
+
+    link_to_remote (name + ' »'), 
+                        {:update => "content", :url => { :year => target_year, :month => target_month }},
+                        {:href => url_for(:action => 'show', :year => target_year, :month =>target_month)}
 
   end
 end