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

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

diff --git a/config/application.rb b/config/application.rb
index 46b22aa..78e162f 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -17,7 +17,7 @@ if defined?(Bundler)
 end
 
 module Pettanr
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
@@ -61,12 +61,21 @@ config.assets.initialize_on_precompile = false
     end
     
     def self.licenses
-      @@licenses
+      @@licenses || {}
     end
-  end
+     
+    def self.speech_balloons=(ary)
+      @@speech_balloons = ary
+    end
+    
+    def self.speech_balloons
+      @@speech_balloons || {}
+    end
+ end
 end
   
 Pettanr::Application.licenses = YAML.load(open(Rails.root + 'config/license.yml').read)
+Pettanr::Application.speech_balloons = YAML.load(open(Rails.root + 'config/speech_balloon.yml').read)
 MagicNumber = YAML.load(open(Rails.root + 'config/magic_number.yml').read)
 MagicNumber['test_layout'] = if File.exist? Rails.root + 'config/test_layout'
   'test'