always include the calendar css and js. but keep loading the correct locale file conditionally.

app/assets/javascripts/application.js

@@ -24,6 +24,7 @@
 //= require chosen
 //= require context_menu
 //= require jstoolbar
+//= require calendar
 
 //source: http://stackoverflow.com/questions/8120065/jquery-and-prototype-dont-work-together-with-array-prototype-reverse
 if (typeof []._reverse == 'undefined') {

app/assets/javascripts/calendar.js

@@ -0,0 +1,2 @@
+//= require calendar/calendar
+//= require calendar/calendar-setup

app/assets/stylesheets/application.css.erb

@@ -9,6 +9,7 @@
  *= require jstoolbar
  *= require context_menu-reset
  *= require context_menu
+ *= require calendar
  *= require print
  *= require scm
  */

app/helpers/application_helper.rb

@@ -1048,12 +1048,8 @@ module ApplicationHelper
         else
           '' # use language
         end
-
-        javascript_include_tag('calendar/calendar') +
         javascript_include_tag("calendar/lang/calendar-#{current_language.to_s.downcase}.js") +
-        javascript_tag(start_of_week) +
-        javascript_include_tag('calendar/calendar-setup') +
-        stylesheet_link_tag('calendar')
+        javascript_tag(start_of_week)
       end
     end
   end