settings are now stored in the database (config_custom.rb no more used) and editable through the application in: Admin -> Settings

git-svn-id: http://redmine.rubyforge.org/svn/trunk@167 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 43 insertions, 106 deletions

diff --git a/config/config_custom.example.rb b/config/config_custom.example.rb
deleted file mode 100644
index b00e716b1..000000000
--- a/config/config_custom.example.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# redMine - project management software

-# Copyright (C) 2006  Jean-Philippe Lang

-#

-# This program is free software; you can redistribute it and/or

-# modify it under the terms of the GNU General Public License

-# as published by the Free Software Foundation; either version 2

-# of the License, or (at your option) any later version.

-# 

-# This program is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-# GNU General Public License for more details.

-# 

-# You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software

-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-

-

-# To set your own configuration, rename this file to config_custom.rb

-# and edit parameters below

-# Don't forget to restart the application after any change.

-

-

-# Application host name

-# Used to provide absolute links in mail notifications

-# $RDM_HOST_NAME = "somenet.foo"

-

-# File storage path

-# Directory used to store uploaded files

-# #{RAILS_ROOT} represents application's home directory

-# $RDM_STORAGE_PATH = "#{RAILS_ROOT}/files"

-

-# Set $RDM_LOGIN_REQUIRED to true if you want to force users to login

-# to access any page of the application

-# $RDM_LOGIN_REQUIRED = false

-

-# Uncomment to disable user self-registration

-# $RDM_SELF_REGISTRATION = false

-

-# Default langage ('en', 'es', 'de', 'fr' are available)

-# $RDM_DEFAULT_LANG = 'en'

-

-# Email adress used to send mail notifications

-# $RDM_MAIL_FROM = "redmine@somenet.foo"

-

-# Page title

-# $RDM_HEADER_TITLE = "Title"

-

-# Page sub-title

-# $RDM_HEADER_SUBTITLE = "Sub title"

-

-# Welcome page title

-# $RDM_WELCOME_TITLE = "Welcome"

-

-# Welcome page text

-# $RDM_WELCOME_TEXT = ""

-

-# Signature displayed in footer

-# Email adresses will be automatically displayed as a mailto link

-# $RDM_FOOTER_SIG = "admin@somenet.foo"

-

-# Textile formatting (only available if RedCloth is installed)

-# Textile formatting is automativaly disabled if RedCloth is not available

-# Set to true to manually disable.

-# $RDM_TEXTILE_DISABLED = true

-

-# Maximum size for attachments (in bytes)

-# Default to 5 MB

-# $RDM_ATTACHMENT_MAX_SIZE = 5*1024*1024

diff --git a/config/environment.rb b/config/environment.rb
index 201051b13..3edc93ed7 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -68,47 +68,11 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
-if File.exist? File.join(File.dirname(__FILE__), 'config_custom.rb')
-  begin
-    print "=> Loading config_custom.rb... "
-    require File.join(File.dirname(__FILE__), 'config_custom') 
-    puts "done."
-  rescue Exception => detail
-    puts
-    puts detail
-    puts detail.backtrace.join("\n")
-    puts "=> Error in config_custom.rb. Check your configuration."
-    exit
-  end
-end
-
 # IMPORTANT !!! DO NOT MODIFY PARAMETERS HERE
 # Instead, rename config_custom.example.rb to config_custom.rb 
 # and set your own configuration in that file
 # Parameters defined in config_custom.rb override those defined below
 
-# application host name

-$RDM_HOST_NAME ||= "localhost:3000"

-# file storage path

-$RDM_STORAGE_PATH ||= "#{RAILS_ROOT}/files"
-# if RDM_LOGIN_REQUIRED is set to true, login is required to access the application

-$RDM_LOGIN_REQUIRED ||= false

-# default langage

-$RDM_DEFAULT_LANG ||= 'en'

-# email sender adress
-$RDM_MAIL_FROM ||= "redmine@somenet.foo"
-
-# page title
-$RDM_HEADER_TITLE ||= "redMine"
-# page sub-title

-$RDM_HEADER_SUBTITLE ||= "Project management"
-# footer signature
-$RDM_FOOTER_SIG = "admin@somenet.foo"
-
-# textile formatting
-# automaticaly disabled if 'textile' method is not defined (RedCloth unavailable)
-$RDM_TEXTILE_DISABLED = true unless ActionView::Helpers::TextHelper.method_defined? "textilize"
-
 # application name
 RDM_APP_NAME = "redMine" 
 # application version
@@ -131,7 +95,7 @@ ActiveRecord::Errors.default_error_messages = {
 
 ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
     
-GLoc.set_config :default_language => $RDM_DEFAULT_LANG
+GLoc.set_config :default_language => :en
 GLoc.clear_strings
 GLoc.set_kcode
 GLoc.load_localized_strings
diff --git a/config/settings.yml b/config/settings.yml
new file mode 100644
index 000000000..d6b3dfc25
--- /dev/null
+++ b/config/settings.yml
@@ -0,0 +1,42 @@
+# redMine - project management software

+# Copyright (C) 2006-2007  Jean-Philippe Lang

+#

+# This program is free software; you can redistribute it and/or

+# modify it under the terms of the GNU General Public License

+# as published by the Free Software Foundation; either version 2

+# of the License, or (at your option) any later version.

+# 

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+# 

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

+

+

+# DO NOT MODIFY THIS FILE !!!

+# Settings can be defined through the application in Admin -> Settings

+

+header_title:

+  default: redMine

+header_subtitle:

+  default: Project management

+welcome_text:

+  default:

+login_required:

+  default: 0

+self_registration:

+  default: 1

+attachment_max_size:

+  format: int

+  default: 5120

+mail_from:

+  default: redmine@somenet.foo

+text_formatting:

+  default: textile

+default_language:

+  default: en

+host_name:

+  default: localhost:3000
\ No newline at end of file