fix bucket

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

diff --git a/config/application.rb b/config/application.rb
index 3e3c7cc..346cb0d 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -15,9 +15,10 @@ if defined?(Bundler)
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
+require 'manifest'
 
 module Pettanr
-  VERSION = '0.4'
+  VERSION = '0.6.2'
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
@@ -39,8 +40,8 @@ config.assets.initialize_on_precompile = false
     # config.time_zone = 'Central Time (US & Canada)'
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
+    config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}').to_s]
+    config.i18n.default_locale = :ja
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
@@ -54,20 +55,13 @@ config.assets.initialize_on_precompile = false
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
     
+    #config.autoload_paths += Dir["#{config.root}/lib/validators/*", "#{config.root}/lib/editor/*", "#{config.root}/lib/manifest/*"]
     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"]
@@ -82,3 +76,11 @@ module ActiveRecord
   end
 end
 
+module Pettanr
+  TestLayout = false
+  class BadRequest < StandardError
+  end
+  class NotWork < StandardError
+  end
+end
+