Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81

lib/tasks/initializers.rake

@@ -0,0 +1,24 @@
+desc 'Generates a configuration file for cookie store sessions.'
+
+file 'config/initializers/session_store.rb' do
+  path = File.join(RAILS_ROOT, 'config', 'initializers', 'session_store.rb')
+  secret = ActiveSupport::SecureRandom.hex(40)
+  File.open(path, 'w') do |f|
+    f.write <<"EOF"
+# This file was generated by 'rake config/initializers/session_store.rb',
+# and should not be made visible to public.
+# If you have a load-balancing Redmine cluster, you will need to use the
+# same version of this file on each machine. And be sure to restart your
+# server when you modify this file.
+ 
+# Your secret key for verifying cookie session data integrity. If you
+# change this key, all old sessions will become invalid! Make sure the
+# secret is at least 30 characters and all random, no regular words or
+# you'll be exposed to dictionary attacks.
+ActionController::Base.session = {
+  :session_key => '_redmine_session',
+  :secret => '#{secret}'
+}
+EOF
+  end
+end

lib/tasks/load_default_data.rake

@@ -2,14 +2,14 @@ desc 'Load Redmine default configuration data'
 
 namespace :redmine do
   task :load_default_data => :environment do
-    include GLoc
+    include Redmine::I18n
     set_language_if_valid('en')
     puts
     
     while true
       print "Select language: "
-      print GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }.join(", ")
-      print " [#{GLoc.current_language}] "
+      print valid_languages.collect(&:to_s).sort.join(", ")
+      print " [#{current_language}] "
       lang = STDIN.gets.chomp!
       break if lang.empty?
       break if set_language_if_valid(lang)