Merge branch 'v04' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v04

[pettanr/pettanr.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 00a00f7..3e3c7cc 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -55,14 +55,26 @@ config.assets.initialize_on_precompile = false
     config.assets.version = '1.0'
     
     config.autoload_paths += %W(#{config.root}/lib/validators)
+    
+    def self.licenses=(ary)
+      @@licenses = ary
+    end
+    
+    def self.licenses
+      @@licenses
+    end
+  
   end
 end
+Pettanr::Application.licenses = YAML.load(open(Rails.root + 'config/license.yml').read)
+MagicNumber = YAML.load(open(Rails.root + 'config/magic_number.yml').read)
 y = YAML.load(open(Rails.root + 'config/picture_io.yml').read)
 require y[Rails.env]["adapter"]
 pio = PictureIO.const_get y[Rails.env]["io"]
 PictureIO.setup do |config|
   config.original_picture_io = pio.new y[Rails.env]["original_picture"]
   config.resource_picture_io = pio.new y[Rails.env]["resource_picture"]
+  config.picture_io = pio.new y[Rails.env]["picture"]
   config.system_picture_io = pio.new y[Rails.env]["system_picture"]
 end
 module ActiveRecord