OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
107082e
..
78e162f
100644
(file)
--- a/
config/application.rb
+++ b/
config/application.rb
@@
-17,7
+17,7
@@
if defined?(Bundler)
end
module Pettanr
end
module Pettanr
- VERSION = '0.
5.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
class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
@@
-39,7
+39,7
@@
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.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.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.i18n.default_locale = :ja
# Configure the default encoding used in templates for Ruby 1.9.
@@
-61,18
+61,28
@@
config.assets.initialize_on_precompile = false
end
def self.licenses
end
def self.licenses
- @@licenses
+ @@licenses
|| {}
end
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)
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'
else
false
end
MagicNumber = YAML.load(open(Rails.root + 'config/magic_number.yml').read)
MagicNumber['test_layout'] = if File.exist? Rails.root + 'config/test_layout'
'test'
else
false
end
+MagicNumber['profile'] = JSON.parse(open(Rails.root + 'config/profile.json').read).first[1] #strip profile body
y = YAML.load(open(Rails.root + 'config/picture_io.yml').read)
require y[Rails.env]["adapter"]
pio = PictureIO.const_get y[Rails.env]["io"]
y = YAML.load(open(Rails.root + 'config/picture_io.yml').read)
require y[Rails.env]["adapter"]
pio = PictureIO.const_get y[Rails.env]["io"]
@@
-89,5
+99,7
@@
end
module Pettanr
TestLayout = false
module Pettanr
TestLayout = false
+ class BadRequest < StandardError
+ end
end
end