Merged trunk r1773.

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1774 e93f8b46-1217-0410-a6f0-8f06a7374b81

groups/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -31,7 +31,7 @@ Rails::Initializer.run do |config|
   # config.log_level = :debug
 
   # Use the database for sessions instead of the file system
-  # (create the session table with 'rake create_sessions_table')
+  # (create the session table with 'rake db:sessions:create')
   # config.action_controller.session_store = :active_record_store
   config.action_controller.session_store = :PStore
 
@@ -49,54 +49,9 @@ Rails::Initializer.run do |config|
   # Use Active Record's schema dumper instead of SQL when creating the test database
   # (enables use of different database adapters for development and test environments)
   # config.active_record.schema_format = :ruby
-
-  # See Rails::Configuration for more options
   
-	# SMTP server configuration
-	config.action_mailer.smtp_settings = {
-		:address => "127.0.0.1",
-		:port => 25,
-		:domain => "somenet.foo",
-		:authentication => :login,
-		:user_name => "redmine@somenet.foo",
-		:password => "redmine",
-	}
-	
-	config.action_mailer.perform_deliveries = true
-
-	# Tell ActionMailer not to deliver emails to the real world.
-	# The :test delivery method accumulates sent emails in the
-	# ActionMailer::Base.deliveries array.
-	#config.action_mailer.delivery_method = :test
-	config.action_mailer.delivery_method = :smtp  
-
+  # Deliveries are disabled by default. Do NOT modify this section.
+  # Define your email configuration in email.yml instead.
+  # It will automatically turn deliveries on
+  config.action_mailer.perform_deliveries = false
 end
-
-ActiveRecord::Errors.default_error_messages = {
-  :inclusion => "activerecord_error_inclusion",
-  :exclusion => "activerecord_error_exclusion",
-  :invalid => "activerecord_error_invalid",
-  :confirmation => "activerecord_error_confirmation",
-  :accepted  => "activerecord_error_accepted",
-  :empty => "activerecord_error_empty",
-  :blank => "activerecord_error_blank",
-  :too_long => "activerecord_error_too_long",
-  :too_short => "activerecord_error_too_short",
-  :wrong_length => "activerecord_error_wrong_length",
-  :taken => "activerecord_error_taken",
-  :not_a_number => "activerecord_error_not_a_number"
-}
-
-ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
-
-Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
-Mime::Type.register 'application/pdf', :pdf
-
-GLoc.set_config :default_language => :en
-GLoc.clear_strings
-GLoc.set_kcode
-GLoc.load_localized_strings
-GLoc.set_config(:raise_string_not_found_errors => false)
-
-require 'redmine'
-